Merge branch 'org.openembedded.dreambox' of git://git.openembedded.net/openembedded into org.openembedded.dreambox

30 files changed, 343 insertions, 370 deletions

diff --git a/conf/machine/dm7025.conf b/conf/machine/dm7025.conf
index 24a2c4d9f9..bffcae574b 100644..100755
--- a/conf/machine/dm7025.conf
+++ b/conf/machine/dm7025.conf
@@ -88,6 +88,7 @@ IMAGE_CMD_jffs2 = "\
 			install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
 			mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
 		done; \
+		mv usr/lib/*gst* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/usr/lib; \
 		cat ${IMAGE_ROOTFS}/etc/fstab | sed 's/^\/dev\/mtdblock\/2/\/dev\/root/;' > ${IMAGE_ROOTFS}/etc/fstab_neu; \
 		mv -f ${IMAGE_ROOTFS}/etc/fstab_neu ${IMAGE_ROOTFS}/etc/fstab; \
 		mksquashfs ${IMAGE_ROOTFS}/* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/squashfs \
diff --git a/packages/enigma2/enigma2-plugins.bb b/packages/enigma2/enigma2-plugins.bb
index 68b86dc5f7..3d2af88053 100755
--- a/packages/enigma2/enigma2-plugins.bb
+++ b/packages/enigma2/enigma2-plugins.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Additional plugins for Enigma2"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 
-SRCDATE = "20090812"
+SRCDATE = "20090902"
 
 PACKAGES_DYNAMIC = "enigma2-plugin-*"
 
diff --git a/packages/enigma2/enigma2.bb b/packages/enigma2/enigma2.bb
index 60af4ff9c6..7b013481cf 100755
--- a/packages/enigma2/enigma2.bb
+++ b/packages/enigma2/enigma2.bb
@@ -44,14 +44,15 @@ RDEPENDS_enigma2-plugin-systemplugins-softwaremanager = "twisted-web"
 RCONFLICTS_enigma2-plugin-systemplugins-softwaremanager = "enigma2-plugin-systemplugins-configurationbackup enigma2-plugin-systemplugins-softwareupdate"
 RREPLACES_enigma2-plugin-systemplugins-softwaremanager = "enigma2-plugin-systemplugins-configurationbackup enigma2-plugin-systemplugins-softwareupdate"
 DESCRIPTION_append_enigma2-plugin-systemplugins-crashlogautosubmit = "automatically send crashlogs to Dream Multimedia"
-RDEPENDS_enigma2-plugin-systemplugins-crashlogautosubmit = "twisted-mail twisted-names python-compression python-mime"
+RDEPENDS_enigma2-plugin-systemplugins-crashlogautosubmit = "twisted-mail twisted-names python-compression python-mime python-email"
+DESCRIPTION_append_enigma2-plugin-systemplugins-cleanupwizard = "informs you on low internal memory on system startup."
 
 DESCRIPTION_append_enigma2-plugin-extenstions-modem = "opens a menu to connect to internet via builtin modem."
 RDEPENDS_enigma2-plugin-extensions-modem = "dreambox-modem-ppp-scripts"
 
 PN = "enigma2"
 PR = "r0"
-SRCDATE = "20090819"
+SRCDATE = "20090902"
 
 # if you want experimental, use:
 REL_MAJOR="2"
diff --git a/packages/images/dreambox-image.bb b/packages/images/dreambox-image.bb
index d9e95e7608..1205971d76 100755
--- a/packages/images/dreambox-image.bb
+++ b/packages/images/dreambox-image.bb
@@ -16,8 +16,9 @@ OPENDREAMBOX_COMMON_R = "util-linux-sfdisk util-linux-fdisk e2fsprogs-mke2fs \
 	base-files-doc sambaserver avahi-daemon"
 
 # experimental packages
-OPENDREAMBOX_EXPERIMENTAL = "enigma2 tuxbox-tuxtxt-32bpp twisted twisted-web2 aio-grab enigma2-skins"
+OPENDREAMBOX_EXPERIMENTAL = "enigma2 tuxbox-tuxtxt-32bpp twisted aio-grab enigma2-skins"
 OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-plugin-systemplugins-frontprocessorupgrade \
+	enigma2-plugin-systemplugins-cleanupwizard \
 	enigma2-plugin-systemplugins-crashlogautosubmit \
 	enigma2-plugin-systemplugins-softwaremanager \
 	enigma2-plugin-systemplugins-positionersetup \
@@ -33,7 +34,7 @@ OPENDREAMBOX_EXPERIMENTAL_R = "enigma2-plugin-systemplugins-frontprocessorupgrad
 	enigma2-plugin-systemplugins-hotplug \
 	enigma2-streamproxy ethtool \
 	enigma2-defaultservices \
-	twisted-web2 twisted python-crypt python-crypto \
+	twisted python-crypt python-crypto \
 	python-netserver python-pickle dreambox-blindscan-utils"
 
 # legacy tuxbox stuff (enigma, plugins, ...)
diff --git a/packages/python/python-2.5.1-manifest.inc b/packages/python/python-2.5.1-manifest.inc
index 0cb505881c..1b15121a64 100755
--- a/packages/python/python-2.5.1-manifest.inc
+++ b/packages/python/python-2.5.1-manifest.inc
@@ -18,10 +18,16 @@ RDEPENDS_python-threading="python-core python-lang"
 FILES_python-threading="${pydir}/_threading_local.* ${pydir}/bisect.* ${pydyndir}/_bisect.so ${pydir}/dummy_thread.* ${pydir}/dummy_threading.* ${pydir}/mutex.* ${pydir}/threading.* ${pydir}/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml4"
+PR_python-distutils="ml5"
 RDEPENDS_python-distutils="python-core"
 FILES_python-distutils="${pydir}/config ${pydir}/distutils "
 
+PACKAGES =+ "python-distutils-tests"
+DESCRIPTION_python-distutils-tests="Python Distribution Utilities tests"
+PR_python-distutils-tests="ml5"
+RDEPENDS_python-distutils-tests="python-core python-distutils"
+FILES_python-distutils-tests +="${pydir}/distutils/tests "
+
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml4"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
@@ -78,9 +84,15 @@ RDEPENDS_python-terminal="python-core python-io"
 FILES_python-terminal="${pydir}/pty.* ${pydir}/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml4"
+PR_python-email="ml5"
 RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="${pydir}/email "
+FILES_python-email="${pydir}/email ${pydir}/email/mime "
+
+PACKAGES =+ "python-email-tests"
+DESCRIPTION_python-email-tests="Python Email Support tests"
+PR_python-email-tests="ml5"
+RDEPENDS_python-email-tests="python-core python-email"
+FILES_python-email-tests +="${pydir}/email/test ${pydir}/email/test/data "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
 PR_python-image="ml4"
@@ -218,10 +230,16 @@ RDEPENDS_python-shell="python-core python-re"
 FILES_python-shell="${pydir}/commands.* ${pydir}/dircache.* ${pydir}/fnmatch.* ${pydir}/glob.* ${pydir}/popen2.* ${pydir}/shutil.* "
 
 DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-PR_python-bsddb="ml4"
+PR_python-bsddb="ml5"
 RDEPENDS_python-bsddb="python-core"
 FILES_python-bsddb="${pydir}/bsddb "
 
+PACKAGES =+ "python-bsddb-tests"
+DESCRIPTION_python-bsddb-tests="Python Berkeley Database Bindings tests"
+PR_python-bsddb-tests="ml5"
+RDEPENDS_python-bsddb-tests="python-core python-bsddb"
+FILES_python-bsddb-tests +="${pydir}/bsddb/test "
+
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml4"
 RDEPENDS_python-mmap="python-core python-io"
@@ -263,11 +281,23 @@ RDEPENDS_python-extensions="python-core"
 FILES_python-extensions="${pydir}/contextlib.* ${pydir}/functools.* ${pydyndir}/_functools.so ${pydir}/runpy.* "
 
 DESCRIPTION_python-ctypes="Python 2.5 ctypes/dlls/sharedlib Extensions"
-PR_python-ctypes="ml4"
+PR_python-ctypes="ml5"
 RDEPENDS_python-ctypes="python-core"
 FILES_python-ctypes="${pydir}/ctypes ${pydyndir}/_ctypes.so "
 
+PACKAGES =+ "python-ctypes-tests"
+DESCRIPTION_python-ctypes-tests="Python 2.5 ctypes/dlls/sharedlib Extensions tests"
+PR_python-ctypes-tests="ml5"
+RDEPENDS_python-ctypes-tests="python-core python-ctypes"
+FILES_python-ctypes-tests +="${pydir}/ctypes/test "
+
 DESCRIPTION_python-sqlite3="Python 2.5 Sqlite Database Lib"
-PR_python-sqlite3="ml4"
+PR_python-sqlite3="ml5"
 RDEPENDS_python-sqlite3="python-core"
 FILES_python-sqlite3="${pydir}/sqlite3 ${pydyndir}/_sqlite3.so "
+
+PACKAGES =+ "python-sqlite3-tests"
+DESCRIPTION_python-sqlite3-tests="Python 2.5 Sqlite Database Lib tests"
+PR_python-sqlite3-tests="ml5"
+RDEPENDS_python-sqlite3-tests="python-core python-sqlite3"
+FILES_python-sqlite3-tests +="${pydir}/sqlite3/test "
\ No newline at end of file
diff --git a/packages/python/python-crypto_1.9a6.bb b/packages/python/python-crypto_1.9a6.bb
deleted file mode 100644
index 2bab51f582..0000000000
--- a/packages/python/python-crypto_1.9a6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "A collection of cryptographic algorithms and protocols"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "gmp"
-SRCNAME = "pycrypto"
-LICENSE = "python-crypto"
-SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-PR = "r1"
-
-inherit distutils
diff --git a/packages/python/python-crypto_2.0.1.bb b/packages/python/python-crypto_2.0.1.bb
new file mode 100755
index 0000000000..de97a5d4cf
--- /dev/null
+++ b/packages/python/python-crypto_2.0.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "A collection of cryptographic algorithms and protocols"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "gmp"
+SRCNAME = "pycrypto"
+LICENSE = "python-crypto"
+RDEPENDS_${PN}-tests = "${PN}"
+PR = "r1"
+
+SRC_URI = "http://www.amk.ca/files/python/crypto/${SRCNAME}-${PV}.tar.gz"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+# Exclude debug files from the main packages
+FILES_${PN} = " \
+	${libdir}/${PYTHON_DIR}/site-packages/*egg-info \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/*/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/*/*.so \
+"
+
+FILES_${PN}-dbg += " \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/*/.debug \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/*/*/.debug \
+"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests += " \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/test.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/Crypto/Util/test.py* \
+"
+
diff --git a/packages/python/python-imaging_1.1.5.bb b/packages/python/python-imaging_1.1.5.bb
deleted file mode 100644
index ae0024918b..0000000000
--- a/packages/python/python-imaging_1.1.5.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Python Imaging Library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "freetype jpeg"
-RDEPENDS = "python-lang python-stringold"
-SRCNAME = "Imaging"
-
-PR = "r1"
-
-SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
-file://path.patch;patch=1"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-do_compile() {
-
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    distutils_do_compile
-}
-
-do_install() {
-
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    
-    distutils_do_install
-
-    install -d ${D}${datadir}/doc/${PN}/html/
-    install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
-    install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
-
-}
diff --git a/packages/python/python-imaging_1.1.6.bb b/packages/python/python-imaging_1.1.6.bb
new file mode 100755
index 0000000000..7c8c733a5e
--- /dev/null
+++ b/packages/python/python-imaging_1.1.6.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Python Imaging Library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "freetype jpeg tiff"
+RDEPENDS = "python-lang python-stringold"
+RDEPENDS_${PN}-doc = "${PN}"
+SRCNAME = "Imaging"
+PR = "ml2"
+
+SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
+           file://path.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+# Exclude debug files from the main packages
+FILES_${PN} = " \
+	${bindir}/* \
+	${libdir}/${PYTHON_DIR}/site-packages/PIL.pth \
+	${libdir}/${PYTHON_DIR}/site-packages/PIL/*egg-info \
+	${libdir}/${PYTHON_DIR}/site-packages/PIL/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/PIL/*.so \
+"
+
+FILES_${PN}-dbg += " \
+	${libdir}/${PYTHON_DIR}/site-packages/PIL/.debug \
+"
+
+FILES_${PN}-doc += " \
+	${docdir}/* \
+"
+
+do_compile() {
+	export STAGING_LIBDIR=${STAGING_LIBDIR}
+  export STAGING_INCDIR=${STAGING_INCDIR}
+  distutils_do_compile
+}
+
+do_install() {
+  export STAGING_LIBDIR=${STAGING_LIBDIR}
+  export STAGING_INCDIR=${STAGING_INCDIR}
+  distutils_do_install
+  install -d ${D}${datadir}/doc/${PN}/html/
+  install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
+  install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
+}
diff --git a/packages/python/python-pyopenssl_0.6.bb b/packages/python/python-pyopenssl_0.6.bb
deleted file mode 100644
index f3e6835a24..0000000000
--- a/packages/python/python-pyopenssl_0.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Simple Python wrapper around the OpenSSL library"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-SRCNAME = "pyOpenSSL"
-DEPENDS = "openssl"
-RDEPENDS = "python-threading"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-pyopenssl_0.8.bb b/packages/python/python-pyopenssl_0.8.bb
new file mode 100755
index 0000000000..56247651f9
--- /dev/null
+++ b/packages/python/python-pyopenssl_0.8.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Simple Python wrapper around the OpenSSL library"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+SRCNAME = "pyOpenSSL"
+DEPENDS = "openssl"
+RDEPENDS = "python-threading"
+RDEPENDS_${PN}-tests = "${PN}"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyopenssl/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+# Exclude debug files from the main packages
+FILES_${PN} = " \
+	${libdir}/${PYTHON_DIR}/site-packages/*egg-info \
+	${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/*.so \
+"
+
+FILES_${PN}-dbg += " \
+	${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/.debug \
+"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests += " \
+	${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test \
+"
diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb
index 3f76aaba51..e9c2f8879f 100755
--- a/packages/python/python_2.5.1.bb
+++ b/packages/python/python_2.5.1.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "python-native readline zlib gdbm openssl"
-PR = "ml4"
+PR = "ml5"
 
 PYTHON_MAJMIN = "2.5"
 
diff --git a/packages/twisted/twisted-native_2.4.0.bb b/packages/twisted/twisted-native_2.4.0.bb
deleted file mode 100644
index a54359c5fe..0000000000
--- a/packages/twisted/twisted-native_2.4.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include twisted_${PV}.bb
-inherit native
-DEPENDS = "python-native zope-interface-native"
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/twisted/twisted-native_2.5.0.bb b/packages/twisted/twisted-native_2.5.0.bb
deleted file mode 100644
index a54359c5fe..0000000000
--- a/packages/twisted/twisted-native_2.5.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include twisted_${PV}.bb
-inherit native
-DEPENDS = "python-native zope-interface-native"
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/twisted/twisted-native_8.1.0.bb b/packages/twisted/twisted-native_8.1.0.bb
deleted file mode 100644
index a54359c5fe..0000000000
--- a/packages/twisted/twisted-native_8.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include twisted_${PV}.bb
-inherit native
-DEPENDS = "python-native zope-interface-native"
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/twisted/twisted-native_8.2.0.bb b/packages/twisted/twisted-native_8.2.0.bb
index a54359c5fe..a54359c5fe 100644..100755
--- a/packages/twisted/twisted-native_8.2.0.bb
+++ b/packages/twisted/twisted-native_8.2.0.bb
diff --git a/packages/twisted/twisted-web-native_0.5.0.bb b/packages/twisted/twisted-web-native_0.5.0.bb
deleted file mode 100644
index b9f1ca9bbf..0000000000
--- a/packages/twisted/twisted-web-native_0.5.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include twisted-web_${PV}.bb
-inherit native
-DEPENDS = "twisted-native"
-
-do_stage() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/twisted/twisted-web2_0.1.bb b/packages/twisted/twisted-web2_0.1.bb
deleted file mode 100644
index 98dff43b13..0000000000
--- a/packages/twisted/twisted-web2_0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted.Web2 is the next generation Web Server Framework \
-built with Twisted. Web2 is under active development and it's APIs should \
-not be considered stable at this point. It is not a version of Twisted.Web \
-and with that in mind compatibility is not of the highest concern, though \
-the compatibility layer does support many but not all twisted.web resources."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted twisted-native"
-RDEPENDS = "twisted python-netserver"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-${PV}.tar.bz2"
-S = "${WORKDIR}/TwistedWeb2-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted-web2_0.2.0.bb b/packages/twisted/twisted-web2_0.2.0.bb
deleted file mode 100644
index 98dff43b13..0000000000
--- a/packages/twisted/twisted-web2_0.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted.Web2 is the next generation Web Server Framework \
-built with Twisted. Web2 is under active development and it's APIs should \
-not be considered stable at this point. It is not a version of Twisted.Web \
-and with that in mind compatibility is not of the highest concern, though \
-the compatibility layer does support many but not all twisted.web resources."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted twisted-native"
-RDEPENDS = "twisted python-netserver"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web2/TwistedWeb2-${PV}.tar.bz2"
-S = "${WORKDIR}/TwistedWeb2-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted-web2_0.2.0svn.bb b/packages/twisted/twisted-web2_0.2.0svn.bb
deleted file mode 100644
index a211fa4f23..0000000000
--- a/packages/twisted/twisted-web2_0.2.0svn.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Twisted.Web2 is the next generation Web Server Framework \
-built with Twisted. Web2 is under active development and it's APIs should \
-not be considered stable at this point. It is not a version of Twisted.Web \
-and with that in mind compatibility is not of the highest concern, though \
-the compatibility layer does support many but not all twisted.web resources."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted twisted-native"
-RDEPENDS = "twisted python-netserver"
-
-SRCDATE = "20070620"
-PR = "r1"
-PV = "0.2.0svn${SRCDATE}"
-
-SRC_URI = "http://tmrc.mit.edi/mirror/twisted/Web2/TwistedWeb2-0.2.0.tar.bz2 \
-	   svn://svn.twistedmatrix.com/svn/Twisted/trunk/twisted;module=web2"
-S = "${WORKDIR}/TwistedWeb2-0.2.0"
-
-do_munge() {
-	rm -R ${S}/twisted/web2
-	mv ${WORKDIR}/web2 ${S}/twisted
-}
-
-addtask munge before do_patch after do_unpack
-
-inherit distutils
diff --git a/packages/twisted/twisted-web_0.5.0.bb b/packages/twisted/twisted-web_0.5.0.bb
deleted file mode 100644
index 83513b8473..0000000000
--- a/packages/twisted/twisted-web_0.5.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted web is a web server, and also provides basic HTTP \
-client support. You may want to check out Nevow, a templating toolkit \
-designed for twisted.web, and Twisted Web2, the next generation Twisted web server."
-
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted-native"
-RDEPENDS = "twisted"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web/0.5/TwistedWeb-${PV}.tar.bz2"
-
-S = "${WORKDIR}/TwistedWeb-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted-web_0.7.0.bb b/packages/twisted/twisted-web_0.7.0.bb
deleted file mode 100644
index 05f5c0473a..0000000000
--- a/packages/twisted/twisted-web_0.7.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted web is a web server, and also provides basic HTTP \
-client support. You may want to check out Nevow, a templating toolkit \
-designed for twisted.web, and Twisted Web2, the next generation Twisted web server."
-
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted-native"
-RDEPENDS = "twisted"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web/0.7/TwistedWeb-${PV}.tar.bz2"
-
-S = "${WORKDIR}/TwistedWeb-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted-web_8.1.0.bb b/packages/twisted/twisted-web_8.1.0.bb
deleted file mode 100644
index cbead2364c..0000000000
--- a/packages/twisted/twisted-web_8.1.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted web is a web server, and also provides basic HTTP \
-client support. You may want to check out Nevow, a templating toolkit \
-designed for twisted.web, and Twisted Web2, the next generation Twisted web server."
-
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted-native"
-RDEPENDS = "twisted"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web/8.1/TwistedWeb-${PV}.tar.bz2"
-
-S = "${WORKDIR}/TwistedWeb-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted-web_8.2.0.bb b/packages/twisted/twisted-web_8.2.0.bb
deleted file mode 100644
index 204d6ba234..0000000000
--- a/packages/twisted/twisted-web_8.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Twisted web is a web server, and also provides basic HTTP \
-client support. You may want to check out Nevow, a templating toolkit \
-designed for twisted.web, and Twisted Web2, the next generation Twisted web server."
-
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "twisted-native"
-RDEPENDS = "twisted"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Web/8.2/TwistedWeb-${PV}.tar.bz2"
-
-S = "${WORKDIR}/TwistedWeb-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted_1.2.0.bb b/packages/twisted/twisted_1.2.0.bb
deleted file mode 100644
index 079118f206..0000000000
--- a/packages/twisted/twisted_1.2.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "LGPL"
-RDEPENDS = "python-core"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/old/Twisted-${PV}.tar.bz2"
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
diff --git a/packages/twisted/twisted_2.4.0.bb b/packages/twisted/twisted_2.4.0.bb
deleted file mode 100644
index 50cc685d14..0000000000
--- a/packages/twisted/twisted_2.4.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "zope-interface-native zope-interface python-crypto twisted-native"
-RDEPENDS = "python-core zope-interface python-pickle python-fcntl python-crypto"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/Twisted-${PV}.tar.bz2"
-
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-SP = "${libdir}/${PYTHON_DIR}/site-packages/twisted"
-
-FILES_twisted-conch = "${SP}/conch/"
-FILES_twisted-lore = "${SP}/lore/"
-FILES_twisted-mail = "${SP}/mail/"
-FILES_twisted-names = "${SP}/names/"
-FILES_twisted-news = "${SP}/news/"
-FILES_twisted-runner = "${SP}/runner/"
-FILES_twisted-web = "${SP}/web/"
-FILES_twisted-words = "${SP}/words/"
-FILES_twisted-trial = "${SP}/trial/ ${SP}/test/"
-PACKAGES = "twisted-conch twisted-lore twisted-mail twisted-names twisted-news twisted-runner twisted-web twisted-words twisted-trial twisted"
-
-do_compile_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
-
-do_install_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
diff --git a/packages/twisted/twisted_2.5.0.bb b/packages/twisted/twisted_2.5.0.bb
deleted file mode 100644
index d22dc4d63e..0000000000
--- a/packages/twisted/twisted_2.5.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "zope-interface-native zope-interface python-crypto twisted-native"
-RDEPENDS = "python-core zope-interface python-pickle python-fcntl python-crypto"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2"
-
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-SP = "${libdir}/${PYTHON_DIR}/site-packages/twisted"
-
-FILES_twisted-conch = "${SP}/conch/"
-FILES_twisted-lore = "${SP}/lore/"
-FILES_twisted-mail = "${SP}/mail/"
-FILES_twisted-names = "${SP}/names/"
-FILES_twisted-news = "${SP}/news/"
-FILES_twisted-runner = "${SP}/runner/"
-FILES_twisted-web = "${SP}/web/"
-FILES_twisted-words = "${SP}/words/"
-FILES_twisted-trial = "${SP}/trial/ ${SP}/test/"
-PACKAGES = "twisted-conch twisted-lore twisted-mail twisted-names twisted-news twisted-runner twisted-web twisted-words twisted-trial twisted"
-
-do_compile_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
-
-do_install_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
diff --git a/packages/twisted/twisted_8.1.0.bb b/packages/twisted/twisted_8.1.0.bb
deleted file mode 100644
index b95dee6a2b..0000000000
--- a/packages/twisted/twisted_8.1.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols                   \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "zope-interface-native zope-interface python-crypto twisted-native"
-RDEPENDS = "python-core zope-interface python-pickle python-fcntl python-crypto"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-${PV}.tar.bz2"
-
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-SP = "${libdir}/${PYTHON_DIR}/site-packages/twisted"
-
-FILES_twisted-conch = "${SP}/conch/"
-FILES_twisted-lore = "${SP}/lore/"
-FILES_twisted-mail = "${SP}/mail/"
-FILES_twisted-names = "${SP}/names/"
-FILES_twisted-news = "${SP}/news/"
-FILES_twisted-runner = "${SP}/runner/"
-FILES_twisted-web = "${SP}/web/"
-FILES_twisted-words = "${SP}/words/"
-FILES_twisted-trial = "${SP}/trial/ ${SP}/test/"
-PACKAGES = "twisted-conch twisted-lore twisted-mail twisted-names twisted-news twisted-runner twisted-web twisted-words twisted-trial twisted"
-
-do_compile_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
-
-do_install_prepend() {
-	export PYTHONPATH=${S}/TwistedCore-${PV}
-}
diff --git a/packages/twisted/twisted_8.2.0.bb b/packages/twisted/twisted_8.2.0.bb
index 5661b762ee..41a5485850 100644..100755
--- a/packages/twisted/twisted_8.2.0.bb
+++ b/packages/twisted/twisted_8.2.0.bb
@@ -7,25 +7,171 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "zope-interface-native zope-interface python-crypto twisted-native"
 RDEPENDS = "python-core zope-interface python-pickle python-fcntl python-crypto"
-
+PR = "r1"
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-${PV}.tar.bz2"
 
 S = "${WORKDIR}/Twisted-${PV}"
 
 inherit distutils
 
-SP = "${libdir}/${PYTHON_DIR}/site-packages/twisted"
+PACKAGES += "\
+  ${PN}-conch \
+  ${PN}-flow \
+  ${PN}-lore \
+  ${PN}-mail \
+  ${PN}-mail-scripts \
+  ${PN}-names \
+  ${PN}-news \
+  ${PN}-pair \
+  ${PN}-runner \
+  ${PN}-scripts \
+  ${PN}-trial \
+  ${PN}-web \
+  ${PN}-words \
+  ${PN}-words-scripts \
+  ${PN}-zsh \
+  ${PN}-dbg \
+  ${PN}-test \
+"
+
+FILES_${PN} = " \
+	${bindir}/manhole \
+	${bindir}/mktap \
+	${bindir}/pyhtmlizer \
+	${bindir}/tap2deb \
+	${bindir}/tap2rpm \
+	${bindir}/tapconvert \
+	${bindir}/trial \
+	${bindir}/twistd \
+	${libdir}/${PYTHON_DIR}/site-packages/*egg-info \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/internet/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/internet/cfsupport/*.p* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/internet/iocpreactor/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/internet/iocpreactor/iocpsupport/*.p* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/cred_*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/spread \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/tap \
+"
+
+FILES_${PN}-conch = " \
+  ${bindir}/cftp \
+  ${bindir}/ckeygen \
+  ${bindir}/conch \
+  ${bindir}/tkconch \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/*.py* \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/client \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/insults \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/openssh_compat \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/ssh \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch/ui \
+"
+
+FILES_${PN}-flow = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/flow/*.* \
+"
+
+FILES_${PN}-lore = " \
+	${bindir}/lore \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/lore/*.* \
+"
+
+FILES_${PN}-mail = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/mail/*.py* \
+"
+
+FILES_${PN}-mail-scripts += " \
+	${bindir}/mailmail \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/mail/scripts \
+"
+
+FILES_${PN}-names = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/names/*.py* \
+"
+
+FILES_${PN}-news = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/news/*.py* \
+"
+
+FILES_${PN}-pair = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/pair/*.py* \
+"
+
+FILES_${PN}-runner = " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/portmap.so \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/*.py* \
+"
+
+FILES_${PN}-scripts = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/scripts \
+"
+
+FILES_${PN}-trial = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
+"
+
+FILES_${PN}-web = " \
+	${bindir}/websetroot \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/web/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/web/_auth/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/web/woven/*.* \
+"
+
+FILES_${PN}-words = " \
+	${bindir}/im \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/words/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/words/im \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/words/protocols \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/words/xish \
+"
+
+FILES_${PN}-words-scripts = " \
+	${bindir}/im \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/words/scripts \
+"
+
+FILES_${PN}-zsh = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
+"
+FILES_${PN}-dbg += " \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
+	${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
+"
+
+FILES_${PN}-test = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
+"
 
-FILES_twisted-conch = "${SP}/conch/"
-FILES_twisted-lore = "${SP}/lore/"
-FILES_twisted-mail = "${SP}/mail/"
-FILES_twisted-names = "${SP}/names/"
-FILES_twisted-news = "${SP}/news/"
-FILES_twisted-runner = "${SP}/runner/"
-FILES_twisted-web = "${SP}/web/"
-FILES_twisted-words = "${SP}/words/"
-FILES_twisted-trial = "${SP}/trial/ ${SP}/test/"
-PACKAGES = "twisted-conch twisted-lore twisted-mail twisted-names twisted-news twisted-runner twisted-web twisted-words twisted-trial twisted"
 
 do_compile_prepend() {
 	export PYTHONPATH=${S}/TwistedCore-${PV}
@@ -34,3 +180,4 @@ do_compile_prepend() {
 do_install_prepend() {
 	export PYTHONPATH=${S}/TwistedCore-${PV}
 }
+
diff --git a/packages/zope/zope-interface_3.3.0.bb b/packages/zope/zope-interface_3.3.0.bb
index e856863ff7..06ae5e8c5a 100644..100755
--- a/packages/zope/zope-interface_3.3.0.bb
+++ b/packages/zope/zope-interface_3.3.0.bb
@@ -5,9 +5,35 @@ PRIORITY = "optional"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 LICENSE = "ZPL"
 SRCNAME = "zope.interface"
-
+PR = "r1"
 SRC_URI = "http://www.zope.org/Products/ZopeInterface/${PV}/${SRCNAME}-${PV}.tar.gz"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
+
+PACKAGES += "\
+  ${PN}-dbg \
+  ${PN}-test \
+  ${PN}-doc \
+"
+
+FILES_${PN} = " \
+	${libdir}/${PYTHON_DIR}/site-packages/*egg-info \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/*.py* \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/*.so \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/common/*.py* \
+"
+
+FILES_${PN}-dbg += " \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/.debug \
+"
+
+FILES_${PN}-test = " \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/tests \
+"
+
+FILES_${PN}-doc = " \
+	${libdir}/${PYTHON_DIR}/site-packages/zope/interface/*.txt \
+"
\ No newline at end of file