merge of 'b5c2080b62dd6480fdd3b3687e291ee915379afd'

     and 'c49f478890b0d92c1c59e4c0cf0d74b6990e6745'

13 files changed, 262 insertions, 24 deletions

diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 9c4e68dfce..c098494d17 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
-#######################################################################################################################
-### AUTO-GENERATED by './contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Mar  6 18:04:21 2008
+########################################################################################################################
+### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,9 +8,9 @@
 ########################################################################################################################
  
 
-PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
 PR_python-profile="ml0"
@@ -97,6 +97,11 @@ PR_python-image="ml0"
 RDEPENDS_python-image="python-core"
 FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
 
+DESCRIPTION_python-tests="Python Tests"
+PR_python-tests="ml0"
+RDEPENDS_python-tests="python-core"
+FILES_python-tests="${libdir}/python2.5/test "
+
 DESCRIPTION_python-core-dbg="Python core module debug information"
 PR_python-core-dbg="ml0"
 RDEPENDS_python-core-dbg="python-core"
@@ -213,14 +218,14 @@ RDEPENDS_python-mime="python-core python-io"
 FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
 
 DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
-PR_python-sqlite3="ml1"
-RDEPENDS_python-sqlite3="python-core"
-FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3 "
-
-DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml0"
-RDEPENDS_python-tests="python-core"
-FILES_python-tests="${libdir}/python2.5/test "
+PR_python-sqlite3="ml2"
+RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib"
+FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* "
+
+DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests"
+PR_python-sqlite3-tests="ml0"
+RDEPENDS_python-sqlite3-tests="python-core python-sqlite3"
+FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml0"
diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb
index 73c4b7ea00..663551f3a4 100644
--- a/packages/python/python-ecore_cvs.bb
+++ b/packages/python/python-ecore_cvs.bb
@@ -1,9 +1,9 @@
 require python-efl.inc
 DEPENDS += "python-evas ecore"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 do_stage() {
     distutils_stage_all
 }
-
diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index dc4b09cee8..75bdc7ff80 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,8 @@
 require python-efl.inc
 DEPENDS += "edbus python-dbus"
+RDEPENDS += "python-dbus"
 PV = "0.1.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb
index 3ee4b1decd..144fcfddde 100644
--- a/packages/python/python-edje_cvs.bb
+++ b/packages/python/python-edje_cvs.bb
@@ -1,5 +1,5 @@
 require python-efl.inc
 DEPENDS += "edje python-evas"
+RDEPENDS += "python-evas"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
-
+PR = "r2"
diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb
index f979159b49..55ba0c1346 100644
--- a/packages/python/python-epsilon_cvs.bb
+++ b/packages/python/python-epsilon_cvs.bb
@@ -1,4 +1,5 @@
 require python-efl.inc
 DEPENDS += "epsilon python-ecore"
+RDEPENDS += "python-ecore"
 PV = "0.2.1+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
diff --git a/packages/python/python-formencode_svn.bb b/packages/python/python-formencode_svn.bb
index 80a1ba2e5b..97dd5be64b 100644
--- a/packages/python/python-formencode_svn.bb
+++ b/packages/python/python-formencode_svn.bb
@@ -5,9 +5,9 @@ LICENSE = "LGPL"
 DEPENDS = "sqlite3"
 SRCNAME = "FormEncode"
 PV = "0.4+svnr${SRCREV}"
-PR = "ml0"
+PR = "ml1"
 
-inherit distutils
+inherit setuptools
 
 SRC_URI = "svn://svn.colorstudy.com/FormEncode;module=trunk;proto=http"
 
diff --git a/packages/python/python-pygtk/prevent_to_get_display_during_import.patch b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
new file mode 100644
index 0000000000..db3469ef57
--- /dev/null
+++ b/packages/python/python-pygtk/prevent_to_get_display_during_import.patch
@@ -0,0 +1,14 @@
+Index: pygtk-2.10.4/gtk/__init__.py
+===================================================================
+--- pygtk-2.10.4.orig/gtk/__init__.py	2007-11-27 19:27:05.000000000 -0300
++++ pygtk-2.10.4/gtk/__init__.py	2007-11-27 19:28:22.000000000 -0300
+@@ -78,7 +78,8 @@
+ 
+ keysyms = LazyModule('keysyms', locals())
+ 
+-_init()
++if not hasattr(sys.modules['__main__'], 'python_launcher_enabled'):
++    init()
+ 
+ # CAPI
+ _PyGtk_API = _gtk._PyGtk_API
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 57dc48aa77..645aad11e0 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml6"
+PR = "ml7"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
+           file://prevent_to_get_display_during_import.patch;patch=1 \
            file://nodocs.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
diff --git a/packages/python/python-pysqlite2_2.4.0.bb b/packages/python/python-pysqlite2_2.4.0.bb
index 751122e10e..50adcba006 100644
--- a/packages/python/python-pysqlite2_2.4.0.bb
+++ b/packages/python/python-pysqlite2_2.4.0.bb
@@ -4,9 +4,10 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 DEPENDS = "sqlite3"
 SRCNAME = "pysqlite"
+PR = "ml1"
 
 SRC_URI = "http://initd.org/pub/software/pysqlite/releases/2.4/${PV}/${SRCNAME}-${PV}.tar.gz \
-	   file://fix-setup.patch;patch=1"
+           file://fix-setup.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
@@ -15,3 +16,17 @@ do_install_append() {
     install -d ${D}${datadir}/doc/
     mv ${D}${datadir}/pysqlite2-doc ${D}${datadir}/doc/${PN}
 }
+
+RDEPENDS = "\
+ python-datetime \
+ python-lang \
+ python-crypt \
+ python-io \
+ python-threading \
+ python-unittest \
+ python-zlib \
+"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/pysqlite2/test"
+RDEPENDS_${PN}-tests = "${PN}"
diff --git a/packages/python/python-sqlobject_0.9.1.bb b/packages/python/python-sqlobject_0.9.1.bb
index db8dfd4aff..90c88a4650 100644
--- a/packages/python/python-sqlobject_0.9.1.bb
+++ b/packages/python/python-sqlobject_0.9.1.bb
@@ -7,9 +7,9 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 RDEPENDS = "python-formencode"
 SRCNAME = "SQLObject"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit distutils
+inherit setuptools
diff --git a/packages/python/python-twisted-2.5.0/.mtn2git_empty b/packages/python/python-twisted-2.5.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-twisted-2.5.0/.mtn2git_empty
diff --git a/packages/python/python-twisted-2.5.0/remove-zope-check.patch b/packages/python/python-twisted-2.5.0/remove-zope-check.patch
new file mode 100644
index 0000000000..2bd1b191da
--- /dev/null
+++ b/packages/python/python-twisted-2.5.0/remove-zope-check.patch
@@ -0,0 +1,18 @@
+Index: Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py
+===================================================================
+--- Twisted-2.5.0.orig/TwistedCore-2.5.0/twisted/__init__.py	2007-03-05 16:30:08.117422472 +0100
++++ Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py	2007-03-05 16:30:13.810553949 +0100
+@@ -14,13 +14,6 @@
+     raise RuntimeError("Twisted requires Python 2.3 or later.")
+ del sys
+ 
+-# Ensure zope.interface is installed
+-try:
+-    from zope.interface import Interface
+-    del Interface
+-except ImportError:
+-    raise ImportError("you need zope.interface installed "
+-                      "(http://zope.org/Products/ZopeInterface/)")
+ 
+ # Ensure compat gets imported
+ from twisted.python import compat
diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb
new file mode 100644
index 0000000000..e085e81eb6
--- /dev/null
+++ b/packages/python/python-twisted_2.5.0.bb
@@ -0,0 +1,183 @@
+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"
+PR = "r7"
+
+SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
+           file://remove-zope-check.patch;patch=1"
+
+S = "${WORKDIR}/Twisted-${PV}"
+
+inherit distutils
+
+PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
+             python-twisted-runner-dbg \
+             python-twisted-bin  python-twisted-conch python-twisted-lore \
+             python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
+             python-twisted-web  python-twisted-words python-twisted python-twisted-core \
+             "
+
+RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
+                            python-twisted-lore python-twisted-mail python-twisted-names \
+                            python-twisted-news python-twisted-runner python-twisted-web \
+                            python-twisted-words"
+
+
+ALLOW_EMPTY = "1"
+FILES_${PN} = ""
+FILES_python-twisted = ""
+
+FILES_python-twisted-test = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/web/test \
+"
+
+FILES_python-twisted-protocols = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/protocols/ \
+"
+
+FILES_python-twisted-zsh = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
+"
+
+FILES_python-twisted-bin = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
+"
+
+FILES_python-twisted-conch = " \
+  ${bindir}/ckeygen \
+  ${bindir}/tkconch \
+  ${bindir}/conch \
+  ${bindir}/conchftp \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
+"
+
+FILES_python-twisted-core = " \
+${bindir}/manhole \
+${bindir}/mktap \
+${bindir}/twistd \
+${bindir}/tap2deb \
+${bindir}/tap2rpm \
+${bindir}/tapconvert \
+${bindir}/tkmktap \
+${bindir}/trial \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.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/plugins/twisted_trial.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
+${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 \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugin.py \
+"
+
+FILES_python-twisted-lore = " \
+${bindir}/bookify \
+${bindir}/lore \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \
+"
+
+FILES_python-twisted-mail = " \
+${bindir}/mailmail \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
+"
+
+FILES_python-twisted-names = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
+"
+
+FILES_python-twisted-news = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
+"
+
+FILES_python-twisted-runner = " \
+${libdir}/site-packages/twisted/runner/portmap.so \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
+"
+
+FILES_python-twisted-web = " \
+${bindir}/websetroot \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
+"
+
+FILES_python-twisted-words = " \
+${bindir}/im \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
+"
+
+FILES_python-twisted-runner-dbg += " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/.debug"
+