Version bump, make twisted dependency stricter, drop revision patched to work with python 2.5 (use the new bump instead).

Package-Manager: portage-2.1.2_rc4-r8

3 files changed, 26 insertions, 48 deletions

diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index 456677de9d55..7efb4242eac3 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX twisted-web-0.5.0-root-skip.patch 475 RMD160 5a93f37912c00bb9f8b139b54c68901b36d4093e SHA1 f06d91d40e3e85429b2a29beebb5424620431374 SHA256 619682d0267629476a7d783f7827ef1ceb56fd11a97fdbe7623ba72b33c98ecd
 MD5 8b5bd800eb0001964ddef202a539be91 files/twisted-web-0.5.0-root-skip.patch 475
 RMD160 5a93f37912c00bb9f8b139b54c68901b36d4093e files/twisted-web-0.5.0-root-skip.patch 475
@@ -8,6 +11,7 @@ RMD160 23b068ebde8fc096117b6beff15ddf2b559eb320 files/twisted-web-0.5.0-tests-2.
 SHA256 b0bd817232f37eba306a86fe0463cf509e94b8a37c7a032ebbfd0b59b8f7a24d files/twisted-web-0.5.0-tests-2.2-compat.patch 4006
 DIST TwistedWeb-0.5.0.tar.bz2 263139 RMD160 61829c8ae492c7cf3f43f45c70a5653584e50378 SHA1 144657d7e6ca6cbb2fd20b9a07e1a83544867099 SHA256 7d33de4924c0f7819b3ba9980461ca2bf7b8f5619f21f90755c29255570b599e
 DIST TwistedWeb-0.6.0.tar.bz2 263572 RMD160 3884538b3d937365acbab06dbf44a7223ba019e0 SHA1 2593bfe51939e5260671a96e396f57e701685788 SHA256 db8cb87fd65f751a807fe22893145210235ce9fbc070e10fd827495f05babca6
+DIST TwistedWeb-0.7.0.tar.bz2 263183 RMD160 7e1c2cf1a2984a298bd2af3d3d983f559ed43e00 SHA1 fefc02f5d72e5693e57f5970b6be639af5a31db1 SHA256 7b934d11d3920c18e1f85fb78352b5b232fa68c10ec218085abdedd167a380f1
 EBUILD twisted-web-0.5.0-r1.ebuild 572 RMD160 622b5ccf327b9d8ede54aed9966087670ad4226e SHA1 bec2d5eb6847b422593a59806fab7d4e4f62dc80 SHA256 b60acba764b613a8fc3aa315ad25ef211a7c29a10057b9ad5806bbc908a1d0d2
 MD5 1b52eff18502778d8f2bae11e7df4b13 twisted-web-0.5.0-r1.ebuild 572
 RMD160 622b5ccf327b9d8ede54aed9966087670ad4226e twisted-web-0.5.0-r1.ebuild 572
@@ -16,18 +20,18 @@ EBUILD twisted-web-0.5.0-r3.ebuild 904 RMD160 ab4be5eb4fdf4d8f4c274e9d48b2a52324
 MD5 e4ef206f2aec3d43b34d3fee6b85a057 twisted-web-0.5.0-r3.ebuild 904
 RMD160 ab4be5eb4fdf4d8f4c274e9d48b2a52324371f56 twisted-web-0.5.0-r3.ebuild 904
 SHA256 2cee0fd85a9a2537b8f69003148374c06f1b1e321b225f6975cfaac2303e5382 twisted-web-0.5.0-r3.ebuild 904
-EBUILD twisted-web-0.6.0-r1.ebuild 851 RMD160 749895afc9420fb8bb3f4d98f687136ee6449ad6 SHA1 f0edb499b8262d3529e425f2bb07661e517f7b5f SHA256 06b313fd390e1485d86fafc9ae854a42ca7b8177a2ea2f383c3aa80015a06e36
-MD5 f9f7e4a720d628e44575d233d834698e twisted-web-0.6.0-r1.ebuild 851
-RMD160 749895afc9420fb8bb3f4d98f687136ee6449ad6 twisted-web-0.6.0-r1.ebuild 851
-SHA256 06b313fd390e1485d86fafc9ae854a42ca7b8177a2ea2f383c3aa80015a06e36 twisted-web-0.6.0-r1.ebuild 851
-EBUILD twisted-web-0.6.0.ebuild 522 RMD160 85db143f901f2be56459b2d34efd9ec90544132e SHA1 eff15543713f3c9c2f689c99b8fc3406d6cd8b2c SHA256 99c9b040fad87430ed89dc59f67c8fdd462a10193b9d92a742dd0ba608caf2c0
-MD5 cd47d7b755afc376070a8573febd40bf twisted-web-0.6.0.ebuild 522
-RMD160 85db143f901f2be56459b2d34efd9ec90544132e twisted-web-0.6.0.ebuild 522
-SHA256 99c9b040fad87430ed89dc59f67c8fdd462a10193b9d92a742dd0ba608caf2c0 twisted-web-0.6.0.ebuild 522
-MISC ChangeLog 4084 RMD160 4a0b0d366469d981c87f908e2d06825a0529c957 SHA1 62efe8965186f2aa69b75a394a39783684937aaf SHA256 0141f0f415d7407b4d20591d0d16558c4b952f2c6030b8d0fca7733f160bd484
-MD5 1be3123a5707b766376f9f66693efe37 ChangeLog 4084
-RMD160 4a0b0d366469d981c87f908e2d06825a0529c957 ChangeLog 4084
-SHA256 0141f0f415d7407b4d20591d0d16558c4b952f2c6030b8d0fca7733f160bd484 ChangeLog 4084
+EBUILD twisted-web-0.6.0.ebuild 523 RMD160 29c880051b25f1ff6255234c5436df6fdd20550d SHA1 bb188aa378a20a60d02f50abe793af39b0bab0c8 SHA256 b34c55c5aa4e2524caebe2358d1c3e126890eb06032e566bb6cbc5613f1129fc
+MD5 0e3793184993d8f148cea09503c5117b twisted-web-0.6.0.ebuild 523
+RMD160 29c880051b25f1ff6255234c5436df6fdd20550d twisted-web-0.6.0.ebuild 523
+SHA256 b34c55c5aa4e2524caebe2358d1c3e126890eb06032e566bb6cbc5613f1129fc twisted-web-0.6.0.ebuild 523
+EBUILD twisted-web-0.7.0.ebuild 532 RMD160 62762b40bd534b4adbc463a8a063d28b506c8301 SHA1 842d4203d3b856ddae87f04560da551347a7277c SHA256 fd6159947ec760e57e512c958fdca9f186ee7b8ec8dfa3b2570c18086bedc112
+MD5 5dbf50d9583ad4d66106abdc5e68c9fc twisted-web-0.7.0.ebuild 532
+RMD160 62762b40bd534b4adbc463a8a063d28b506c8301 twisted-web-0.7.0.ebuild 532
+SHA256 fd6159947ec760e57e512c958fdca9f186ee7b8ec8dfa3b2570c18086bedc112 twisted-web-0.7.0.ebuild 532
+MISC ChangeLog 4380 RMD160 a833a34f125fc33ef3f0ce14caa931b03f51c452 SHA1 147772a4fcbbd37aad948390ae93c66015bf47bd SHA256 f07f6e301199c48cddfa711d42043db08f2f57f544f33728b35fc8cf906b2316
+MD5 5635278d8ae4bfe229eecfce5575b91e ChangeLog 4380
+RMD160 a833a34f125fc33ef3f0ce14caa931b03f51c452 ChangeLog 4380
+SHA256 f07f6e301199c48cddfa711d42043db08f2f57f544f33728b35fc8cf906b2316 ChangeLog 4380
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -41,6 +45,13 @@ SHA256 8092e2fabf7c7a484d5a071341a19a3c523e4e534399bac66f6ab8731cd0b22a files/di
 MD5 98927af02f23b07a1abc57aad36071a5 files/digest-twisted-web-0.6.0 253
 RMD160 47a7a3d7afbf177bc91374506e1e476e72932af4 files/digest-twisted-web-0.6.0 253
 SHA256 bebcedc1248f4d85c73008ea74ca2c6174d7955ec8e1b5018da1d7fa483b44b2 files/digest-twisted-web-0.6.0 253
-MD5 98927af02f23b07a1abc57aad36071a5 files/digest-twisted-web-0.6.0-r1 253
-RMD160 47a7a3d7afbf177bc91374506e1e476e72932af4 files/digest-twisted-web-0.6.0-r1 253
-SHA256 bebcedc1248f4d85c73008ea74ca2c6174d7955ec8e1b5018da1d7fa483b44b2 files/digest-twisted-web-0.6.0-r1 253
+MD5 106f21e41a6890a4a59d3fdbdeee3da1 files/digest-twisted-web-0.7.0 253
+RMD160 0fad15af056948372b4f230b8f03d716ab67066a files/digest-twisted-web-0.7.0 253
+SHA256 7f8f8c7222c3e8c4568c490d73ea80b1626f9023466a6dd2c92bcedd0581fbae files/digest-twisted-web-0.7.0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFprakUElL7eJpfEQRAhfsAJ0W7s3IHaTjMEIBNSOD4wEFOu2ElACeOdh3
+nLplgyqGzJmykelCasEYZHw=
+=AYbS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-web/files/digest-twisted-web-0.6.0-r1 b/dev-python/twisted-web/files/digest-twisted-web-0.6.0-r1
deleted file mode 100644
index b6ef47e32fb2..000000000000
--- a/dev-python/twisted-web/files/digest-twisted-web-0.6.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a681931d2eb747ca871ef71d8d1f5ff1 TwistedWeb-0.6.0.tar.bz2 263572
-RMD160 3884538b3d937365acbab06dbf44a7223ba019e0 TwistedWeb-0.6.0.tar.bz2 263572
-SHA256 db8cb87fd65f751a807fe22893145210235ce9fbc070e10fd827495f05babca6 TwistedWeb-0.6.0.tar.bz2 263572
diff --git a/dev-python/twisted-web/twisted-web-0.6.0-r1.ebuild b/dev-python/twisted-web/twisted-web-0.6.0-r1.ebuild
deleted file mode 100644
index a495017bf7fa..000000000000
--- a/dev-python/twisted-web/twisted-web-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-0.6.0-r1.ebuild,v 1.1 2006/06/26 21:13:50 marienz Exp $
-
-MY_PACKAGE=Web
-
-inherit twisted eutils
-
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND=">=dev-python/twisted-2.4"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.5.0-root-skip.patch"
-}
-
-src_install() {
-	twisted_src_install
-
-	# Get rid of the main user-visible bits of websetroots: the
-	# wrapper script in bin and the manpage. This leaves behind the
-	# script in scripts in site-packages. websetroot is removed
-	# entirely in upstream svn and does not work in this version.
-	rm -rf "${D}"/usr/{bin,share/man}
-}