Version bump and minor fixes

Package-Manager: portage-2.1.4.4

10 files changed, 144 insertions, 38 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index 0f3c8ca070bb..a7cbad6c730f 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.89 2008/05/13 20:29:16 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.90 2008/05/25 20:23:51 lordvan Exp $
+
+*twisted-8.1.0 (25 May 2008)
+
+  25 May 2008; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.2.0.ebuild,
+  twisted-1.3.0.ebuild, +twisted-8.1.0.ebuild:
+  Version bump to 8.1.0 + some minor fixes to older ebuilds
 
 *twisted-8.0.1 (13 May 2008)
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 66f8b70edbe5..cce4237d735c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX twistd.conf 277 RMD160 c959b879d6f7358b647c71c3b514a4a6c8a49eef SHA1 661269a3ce6ed02f03d4fce07757e77420fd44c4 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119
 AUX twistd.init 545 RMD160 b77acc9468cd619e9af334c8a36ed3f9bb003494 SHA1 74db83050a9e3bf55823bb5790280d1ec324d760 SHA256 c0aead865bee1fa7d88f2a59f936718621a9b52b1b623ae9e599f1226d8a0dc1
 AUX twisted-2.0.1-echo-less.patch 527 RMD160 c0a4f923a4bde04a1df183878b4c1414fad98b41 SHA1 d40f15ab30c46bbc165edd229d771245e5a0e6c0 SHA256 28d3a8ede3d30744c411dc86978f17601867e6e999d79e77527981b8ddb6fa49
@@ -14,22 +11,17 @@ DIST Twisted-2.2.0.tar.bz2 1285316 RMD160 c11353da93878721c8549a0594363b9d8ee38e
 DIST TwistedCore-2.4.0.tar.bz2 1213389 RMD160 2ee341412675d2ef4582ae595adf49ce254eb88b SHA1 7e1f767999120ec65570a4e5ecd746e4de00d3ba SHA256 114f8ecf2625916f6cd65099d4321243f2b56704dddb0c96b30f6b991db484d2
 DIST TwistedCore-2.5.0.tar.bz2 2049409 RMD160 b2abe479286ef903054b182c6d408c8f3e5aad86 SHA1 23d945c2fb473008f51fbb87af5616344721afba SHA256 3404a92012734d527a7b2029ce6f588bbc02b27904760819b2ce86f81bcddaab
 DIST TwistedCore-8.0.1.tar.bz2 1180238 RMD160 06e4068469d579404bdf46647a6236afbf405148 SHA1 eebd94a52d0241d03b2b92c9f73530093072a861 SHA256 9033cd12455f4d4dd8b7542238ef42998b0bed409f1aeab4a1ad5c417744e45c
+DIST TwistedCore-8.1.0.tar.bz2 1194164 RMD160 92f28c14709f5eb307757cd993a511344109c59a SHA1 77b6ebff5c11ea6efb62e41d0b09897d37d97423 SHA256 14b8cfc8c782073b0ce046b139dac55149992087209194696d390649b62f5f32
 DIST Twisted_NoDocs-1.2.0.tar.bz2 1281868 RMD160 f64a258a5c767c288cf39554471c4f37c4bed136 SHA1 6325d162a17e4527b60e1fcdcbf1c0c5dbd076f6 SHA256 b9245d8c5d4f0df35a20bfefd01db3c9edd6dd814e4c69481a50f59907d25fe1
 DIST Twisted_NoDocs-1.3.0.tar.bz2 1545890 RMD160 9b9d8c9667ef3e68118b7509d2c5991285c3a4b9 SHA1 fb4404c588efbe3b3cee24a7fd9bf2cd875b4d2e SHA256 bef1611e10a7493647b668dfff9095754a8881b4ac9364c098ca025820b48aef
-EBUILD twisted-1.2.0.ebuild 996 RMD160 5194d400fa176184e37961c54d727191c3ec08dc SHA1 25d5c4d348b8715adaaf237892a4cf0510fbb625 SHA256 800994ba7f45c4b98f248b7ccdec4b0625bfd4314c88fd8897132d8e93758d0d
-EBUILD twisted-1.3.0.ebuild 1061 RMD160 fa6ac04c275dec8e5ddf2b2e6fea7d4217d495ca SHA1 862ad879c4f439c36df6b4b430da0852a03deb99 SHA256 f597d5d3ea67e9ea8a297cb1b4b4448e18b29532ba97e3744c10bc8e897c5575
-EBUILD twisted-2.0.1.ebuild 3017 RMD160 ee6227ecc758bd274a49f32c150872d088fb34c3 SHA1 21eb4c2b2f55e1fdb0dd47964559f0d3b0b1f770 SHA256 58308ada5f3868cdb99246d94278c4bda829606fbbb12623166e1df83690af71
-EBUILD twisted-2.1.0.ebuild 3185 RMD160 42052c2d4acaae8f3b7764ac543611a6501d86ae SHA1 2f1b09f10c72f39bb9348dc2ef47c87d7e8dde19 SHA256 1a07551d087fb4e61a996b5df3ccc9a62ab46487a838c1db207f34769cfb520c
-EBUILD twisted-2.2.0.ebuild 3190 RMD160 3769541ef6c2e45e4a408c9fd0737606ccb1dd27 SHA1 def61197602465720c80df8ff2e004d2c33ed925 SHA256 8e3bf6445430a6b046350ef379971f69d7c6b0ad554fb645c6695e57a4d65bf3
-EBUILD twisted-2.4.0.ebuild 3308 RMD160 5f77c9e20c21eae5e2ebd932d0cbcf58f255b3f7 SHA1 78d2932fe306f068c63db8f6473c286223d1d957 SHA256 d92714ae8e1a66480f1c5d315337f6bb8c55004090d0ff1d727771c4c9ba5008
-EBUILD twisted-2.5.0.ebuild 3218 RMD160 2a658adf83b150d32e8b61d69b03a0ed6565eb81 SHA1 81e037487e6e6f2f5f370c15658f5f269fea51c7 SHA256 7a66f03eeb9900eaf8d659cf2a32639f18688516c95625aba9b9a9cd213b1299
+EBUILD twisted-1.2.0.ebuild 924 RMD160 ccf99a88013c996b74f49ed78ac497f87cbb8957 SHA1 878f01437805ed769bf104fd19372d1c6047807a SHA256 463e2728372db21637fc2b3c7a418bd2fc0d88f016be5c0b05a1f761abd45e91
+EBUILD twisted-1.3.0.ebuild 986 RMD160 9465be5edc1ddee561ebab38957e9c490a957e5f SHA1 8fc1eb99e3118f4b2f5ea0d7e706427d7defb04a SHA256 9e8b03baf0bba3edb5ce61298545e31ea3c02ad24644796654a5e80ab1c39161
+EBUILD twisted-2.0.1.ebuild 3019 RMD160 86651088dc4e64d6aad3fa3fc2be7e2a9f114e2b SHA1 6e583c7d79cd57c1e10a7aeca9dab48f015b077c SHA256 46d38952fb16471dcc3ef8f3083272bb580083782495021f4c004d7116d2a5c7
+EBUILD twisted-2.1.0.ebuild 3185 RMD160 81f3c8af3a06830d7779775ec3f7210f3ed6a89f SHA1 59eb89d7ee5f762f0a96838061edf751a53395e9 SHA256 00a2290e05b1ec84c7b862d54e767350d4af7ab8d1a7b59605a7969048bf9ab0
+EBUILD twisted-2.2.0.ebuild 3189 RMD160 7495210f18dc3402ddb6bfd254f426be2b481793 SHA1 c72b43a73d1ce50302c75df6bd0f18527c516efb SHA256 7d3d129e32de1dc34fdce691db7c64563975e944468d7318bbad48933d51fe3d
+EBUILD twisted-2.4.0.ebuild 3307 RMD160 8f0b3e7b0853f9fceb4a180ed1685e58548f480f SHA1 d1180118d6fd4c3b768c126006975622d502b202 SHA256 9226b9f12a06ca11a54f76c222a5d744b8168d520d6d2d4daaca0c25ec84a9e0
+EBUILD twisted-2.5.0.ebuild 3219 RMD160 e215fc02bfae25cf99f112019abb9405b599861a SHA1 8ddd6643b22ec23d3718fad6fbb98a53a1e2acbb SHA256 67c52e8f0c312aff253b45edbab7b173544f60e4b33ce688d98d1dd58fd8e255
 EBUILD twisted-8.0.1.ebuild 3205 RMD160 e022a058306c732e073cc7ec0619b00d07d9ea39 SHA1 02e40bb680a472b86011435b373ff5ce92a2fcd4 SHA256 b4d265b39c5358990176ff3ec4dcb7869cfbf89ff23979d6bb3121e5e1b7a7b4
-MISC ChangeLog 15678 RMD160 01cb53e9dee0e3d64ba370dd15d634c8bed89424 SHA1 e59d39583b8d5dabf04e2d86d645f3a21ce0562d SHA256 04af55b22b624165b683b976819c2766ab90d638038ceb1bacdda9b99bec8b19
+EBUILD twisted-8.1.0.ebuild 3206 RMD160 d7a647684ac41e7f21186e9dfde70beeae5aabba SHA1 995263d26147f5f922cfe43788e3db0ad43f08e3 SHA256 84c3b3e2b9dce0b395815c763688d8b4dad342e37301fc8edfb0b070508b4fdf
+MISC ChangeLog 15893 RMD160 e5df4e7adfc7d14fdaed0b1f6060f50aa8b212a6 SHA1 1a306d754eb2a3fdace70401c15828aeac24d6d0 SHA256 a7df3bfa452ef46a44ddc95d1843d39549a39f7bb1d03686fca2e8044f2505d2
 MISC metadata.xml 444 RMD160 0c3efd5527a47e660adfbb5aa7c9e4b3cf407eb6 SHA1 a891b253b5f761194bd82e9f6c086ef05c7af0e4 SHA256 17e24b80f75c35c6e1bba827d2b7816f2507b413f6506709a0579d283570cc04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgzEBgACgkQoeSe8B0zEfxFjwCeLp90WNdt1JGS6tGbD9pf0M2M
-+gMAn0MpyTf8UAEy7UDHn3y3GzNFOw5w
-=zV6v
------END PGP SIGNATURE-----
diff --git a/dev-python/twisted/twisted-1.2.0.ebuild b/dev-python/twisted/twisted-1.2.0.ebuild
index a024e8b59900..22778e7bb62c 100644
--- a/dev-python/twisted/twisted-1.2.0.ebuild
+++ b/dev-python/twisted/twisted-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.2.0.ebuild,v 1.14 2005/11/03 21:04:25 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.2.0.ebuild,v 1.15 2008/05/25 20:23:51 lordvan Exp $
 
 inherit distutils
 
-DESCRIPTION="collection of servers and clients, which can be used either by developers of new applications or directly. Documentation included."
+DESCRIPTION="An asynchronous networking framework written in Python"
 HOMEPAGE="http://www.twistedmatrix.com/"
 SRC_URI="http://twisted.sourceforge.net/Twisted_NoDocs-${PV}.tar.bz2"
 
@@ -20,7 +20,7 @@ DEPEND=">=dev-lang/python-2.2
 	gtk? ( >=dev-python/pygtk-1.99 )
 	doc? ( =dev-python/twisted-docs-${PV} )"
 
-S=${WORKDIR}/Twisted-${PV}
+S="${WORKDIR}/Twisted-${PV}"
 
 src_install() {
 	distutils_src_install
@@ -29,6 +29,6 @@ src_install() {
 	if use gtk; then
 		sed -e 's/import manhole/import manhole2/' \
 			-e 's/manhole\.run()/manhole2.run()/' \
-			-i ${D}/usr/bin/manhole
+			-i '${D}/usr/bin/manhole'
 	fi
 }
diff --git a/dev-python/twisted/twisted-1.3.0.ebuild b/dev-python/twisted/twisted-1.3.0.ebuild
index 10c692df6bd0..31ed8b33399e 100644
--- a/dev-python/twisted/twisted-1.3.0.ebuild
+++ b/dev-python/twisted/twisted-1.3.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.3.0.ebuild,v 1.11 2006/02/06 03:04:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.3.0.ebuild,v 1.12 2008/05/25 20:23:51 lordvan Exp $
 
 inherit distutils
 
 # for alphas,..
 MY_PV="${PV/_alpha/alpha}"
-DESCRIPTION="collection of servers and clients, which can be used either by developers of new applications or directly. Documentation included."
+DESCRIPTION="An asynchronous networking framework written in Python"
 HOMEPAGE="http://www.twistedmatrix.com/"
 SRC_URI="http://twisted.sourceforge.net/Twisted_NoDocs-${MY_PV}.tar.bz2"
 
@@ -31,6 +31,6 @@ src_install() {
 	if use gtk; then
 		sed -e 's/import manhole/import manhole2/' \
 			-e 's/manhole\.run()/manhole2.run()/' \
-			-i ${D}/usr/bin/manhole
+			-i '${D}/usr/bin/manhole'
 	fi
 }
diff --git a/dev-python/twisted/twisted-2.0.1.ebuild b/dev-python/twisted/twisted-2.0.1.ebuild
index 7e7b65871576..137102a85c10 100644
--- a/dev-python/twisted/twisted-2.0.1.ebuild
+++ b/dev-python/twisted/twisted-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.11 2006/06/30 23:01:56 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.12 2008/05/25 20:23:51 lordvan Exp $
 
 inherit eutils distutils versionator
 
diff --git a/dev-python/twisted/twisted-2.1.0.ebuild b/dev-python/twisted/twisted-2.1.0.ebuild
index 4ea8db86d353..9f8420796d46 100644
--- a/dev-python/twisted/twisted-2.1.0.ebuild
+++ b/dev-python/twisted/twisted-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.8 2006/06/22 19:18:10 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.9 2008/05/25 20:23:51 lordvan Exp $
 
 inherit eutils distutils versionator
 
diff --git a/dev-python/twisted/twisted-2.2.0.ebuild b/dev-python/twisted/twisted-2.2.0.ebuild
index 0fec25f3577c..86597e200be7 100644
--- a/dev-python/twisted/twisted-2.2.0.ebuild
+++ b/dev-python/twisted/twisted-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.8 2006/07/13 02:24:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.9 2008/05/25 20:23:51 lordvan Exp $
 
 inherit eutils distutils versionator
 
diff --git a/dev-python/twisted/twisted-2.4.0.ebuild b/dev-python/twisted/twisted-2.4.0.ebuild
index beb2ea6eee86..54b974c18cfb 100644
--- a/dev-python/twisted/twisted-2.4.0.ebuild
+++ b/dev-python/twisted/twisted-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.4.0.ebuild,v 1.11 2007/03/12 18:57:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.4.0.ebuild,v 1.12 2008/05/25 20:23:51 lordvan Exp $
 
 inherit eutils distutils versionator
 
diff --git a/dev-python/twisted/twisted-2.5.0.ebuild b/dev-python/twisted/twisted-2.5.0.ebuild
index 964e97c7265f..a5108f60043d 100644
--- a/dev-python/twisted/twisted-2.5.0.ebuild
+++ b/dev-python/twisted/twisted-2.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.5.0.ebuild,v 1.2 2007/02/13 13:24:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.5.0.ebuild,v 1.3 2008/05/25 20:23:51 lordvan Exp $
 
 inherit eutils distutils versionator
 
diff --git a/dev-python/twisted/twisted-8.1.0.ebuild b/dev-python/twisted/twisted-8.1.0.ebuild
new file mode 100644
index 000000000000..b79b28626c19
--- /dev/null
+++ b/dev-python/twisted/twisted-8.1.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-8.1.0.ebuild,v 1.1 2008/05/25 20:23:51 lordvan Exp $
+
+inherit eutils distutils versionator
+
+MY_P=TwistedCore-${PV}
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="http://www.twistedmatrix.com/"
+SRC_URI="http://tmrc.mit.edu/mirror/${PN}/Core/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk serial crypt"
+
+DEPEND=">=dev-lang/python-2.3
+	>=net-zope/zopeinterface-3.0.1
+	serial? ( dev-python/pyserial )
+	crypt? ( >=dev-python/pyopenssl-0.5.1 )
+	gtk? ( >=dev-python/pygtk-1.99 )
+	!dev-python/twisted-docs"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="CREDITS NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Give a load-sensitive test a better chance of succeeding.
+	epatch "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Pass valid arguments to "head" in the zsh completion function.
+	epatch "${FILESDIR}/${PN}-2.1.0-zsh-head.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	# get rid of this to prevent collision-protect from killing us. it
+	# is regenerated in pkg_postinst.
+	rm "${D}/usr/$(get_libdir)"/python*/site-packages/twisted/plugins/dropin.cache
+
+	# weird pattern to avoid installing the index.xhtml page
+	doman doc/man/*.?
+	insinto /usr/share/doc/${PF}
+	doins -r $(find doc -mindepth 1 -maxdepth 1 -not -name man)
+
+	# workaround for a possible portage bug
+	mkdir -p "${D}/etc/conf.d/"
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+
+	# zsh completion
+	insinto /usr/share/zsh/site-functions/
+	doins twisted/python/_twisted_zsh_stub
+}
+
+update_plugin_cache() {
+	python_version
+	local tpath="${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/twisted"
+	# we have to remove the cache or removed plugins won't be removed
+	# from the cache (http://twistedmatrix.com/bugs/issue926)
+	[[ -e "${tpath}/plugins/dropin.cache" ]] && rm -f "${tpath}/plugins/dropin.cache"
+	if [[ -e "${tpath}/plugin.py" ]]; then
+		# twisted is still installed, update.
+	    # we have to use getPlugIns here for <=twisted-2.0.1 compatibility
+		einfo "Regenerating plugin cache"
+		python -c "from twisted.plugin import IPlugin, getPlugIns;list(getPlugIns(IPlugin))"
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	update_plugin_cache
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	update_plugin_cache
+}
+
+src_test() {
+	python_version
+
+	if has_version ">=dev-lang/python-2.3"; then
+		"${python}" setup.py install --root="${T}/tests" --no-compile || die
+	else
+		"${python}" setup.py install --root="${T}/tests" || die
+	fi
+
+	cd "${T}/tests/usr/$(get_libdir)/python${PYVER}/site-packages/" || die
+
+	# prevent it from pulling in plugins from already installed
+	# twisted packages
+	rm twisted/plugins/__init__.py || die
+
+	# an empty file doesn't work because the tests check for
+	# docstrings in all packages
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	PYTHONPATH=. "${T}"/tests/usr/bin/trial twisted || die "trial failed"
+	cd "${S}"
+	rm -rf "${T}/tests"
+}