Fixes setuptools bug #177433. Thanks Santiago Gala <sgala@apache.org>

Package-Manager: portage-2.1.2.5

4 files changed, 84 insertions, 17 deletions

diff --git a/dev-python/turbogears/ChangeLog b/dev-python/turbogears/ChangeLog
index 7df2de5d1e25..0bf2d8fc0699 100644
--- a/dev-python/turbogears/ChangeLog
+++ b/dev-python/turbogears/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/turbogears
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/ChangeLog,v 1.4 2007/05/06 01:19:10 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/ChangeLog,v 1.5 2007/05/07 14:41:58 pythonhead Exp $
+
+  07 May 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +files/turbogears-1.0.2.2-gentoo-setuptools.diff,
+  turbogears-1.0.2.2.ebuild:
+  Fixes setuptools bug #177433. Thanks Santiago Gala <sgala@apache.org>
 
 *turbogears-1.0.2.2 (06 May 2007)
 
diff --git a/dev-python/turbogears/Manifest b/dev-python/turbogears/Manifest
index 0f0cbb35ca9d..10f8422ed6f9 100644
--- a/dev-python/turbogears/Manifest
+++ b/dev-python/turbogears/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX turbogears-1.0.2.2-gentoo-setuptools.diff 1796 RMD160 99b995d9ae010ceb85a83a802c0be2ed2202c125 SHA1 ed1c235837996726887acd16e563db3c5b5e160a SHA256 90287bdee042abe7885adb54bfc6c2d5f060bdc7da157dcca185d2b616a27673
+MD5 e915893ac030a1ce55d602554878e277 files/turbogears-1.0.2.2-gentoo-setuptools.diff 1796
+RMD160 99b995d9ae010ceb85a83a802c0be2ed2202c125 files/turbogears-1.0.2.2-gentoo-setuptools.diff 1796
+SHA256 90287bdee042abe7885adb54bfc6c2d5f060bdc7da157dcca185d2b616a27673 files/turbogears-1.0.2.2-gentoo-setuptools.diff 1796
 DIST TurboGears-1.0.1.tar.gz 753149 RMD160 2ed258e7a5d790fbc15395a03597c6b3b6914f1d SHA1 f3921cde12413a0637a7614e6d0484966203b340 SHA256 ed70be7ddbe503286aae01f01b2165c442feabc1f92b812356df5061da948bf7
 DIST TurboGears-1.0.2.2.tar.gz 763088 RMD160 220285387ae05ef3ebb773ed51f8f9991bb32e83 SHA1 c939b56b4118b1bf61e42a789f3f7d6660d3fa20 SHA256 311e2119f38d78d322408f7b6f106905921ce141f0e19d6ca254a6f9ee63e769
 EBUILD turbogears-1.0.1.ebuild 1471 RMD160 609ebae83bfa1f0a6a966e24dcd741b1458315de SHA1 e424521dc4a22fc85688a3a4219f295edeb18703 SHA256 2e306e45f486795673ba2334d4c882d8cee9831889de75c2d6c07c1008cdd149
 MD5 fcd1a6b98679ed10573d20a508a8b89a turbogears-1.0.1.ebuild 1471
 RMD160 609ebae83bfa1f0a6a966e24dcd741b1458315de turbogears-1.0.1.ebuild 1471
 SHA256 2e306e45f486795673ba2334d4c882d8cee9831889de75c2d6c07c1008cdd149 turbogears-1.0.1.ebuild 1471
-EBUILD turbogears-1.0.2.2.ebuild 1529 RMD160 cb7478dfd3ece46866d87c9e4f86366967fc175b SHA1 3cc8457f83188d4a66f3e92d2341ce7b80f4605f SHA256 68f2f696613341ac778252248dccfcb1b6a035af16f8c14c163360a14974300a
-MD5 2ea2ec95798c820d2fdc7c8da553f954 turbogears-1.0.2.2.ebuild 1529
-RMD160 cb7478dfd3ece46866d87c9e4f86366967fc175b turbogears-1.0.2.2.ebuild 1529
-SHA256 68f2f696613341ac778252248dccfcb1b6a035af16f8c14c163360a14974300a turbogears-1.0.2.2.ebuild 1529
-MISC ChangeLog 865 RMD160 9cc862854919c57a5ab873e6a89f17b0f93e822e SHA1 510cde30ac5207da9617bc18f5acec612c946949 SHA256 1ed26b85d4fd06522f0d9cae913e992b4f9a243095710e858005cd7c022fbfbf
-MD5 66965c00612c1cc421789b6a68fc56c9 ChangeLog 865
-RMD160 9cc862854919c57a5ab873e6a89f17b0f93e822e ChangeLog 865
-SHA256 1ed26b85d4fd06522f0d9cae913e992b4f9a243095710e858005cd7c022fbfbf ChangeLog 865
+EBUILD turbogears-1.0.2.2.ebuild 1472 RMD160 ec5cb501ab11097cebedd295030041e375c8c3d3 SHA1 cb577c24fd27334c7ecfea3ca96165f46cc34155 SHA256 a82cc89d0b8ae0483075733cc850cebb7f2bfaa51e9bc131ef15202e6c2055e6
+MD5 62e0cbdbba467b84405693c015580899 turbogears-1.0.2.2.ebuild 1472
+RMD160 ec5cb501ab11097cebedd295030041e375c8c3d3 turbogears-1.0.2.2.ebuild 1472
+SHA256 a82cc89d0b8ae0483075733cc850cebb7f2bfaa51e9bc131ef15202e6c2055e6 turbogears-1.0.2.2.ebuild 1472
+MISC ChangeLog 1072 RMD160 261372881798f91bfe18c2fe2c4e61f40229b374 SHA1 78858868233a091175707c07360de3c10a3b3ce5 SHA256 d44029d06b2fd708dd08ffc7271b32588965bb0fc7d685aa270cfee0922b88f7
+MD5 071dacb646a1f0112064e0ab76ff19aa ChangeLog 1072
+RMD160 261372881798f91bfe18c2fe2c4e61f40229b374 ChangeLog 1072
+SHA256 d44029d06b2fd708dd08ffc7271b32588965bb0fc7d685aa270cfee0922b88f7 ChangeLog 1072
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -28,7 +32,7 @@ SHA256 aaeec58297122cda70885277b742d5b38b9eed283c6fb898775ca1fa01bddf4f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGPS0b96cFzIajWwkRAiU/AJ0dnz3fecu6DDIh90r6yoQBVbqT6QCgxTN/
-Fu22WzTOQlSjh/UV9q7M0vM=
-=sla+
+iD8DBQFGPzrC96cFzIajWwkRAhVGAJwLw47Blw2r7tkdcB9otVW8RMwmQQCfaNWR
+K4OVCMwp4BzUDggs/tluBSg=
+=WCub
 -----END PGP SIGNATURE-----
diff --git a/dev-python/turbogears/files/turbogears-1.0.2.2-gentoo-setuptools.diff b/dev-python/turbogears/files/turbogears-1.0.2.2-gentoo-setuptools.diff
new file mode 100644
index 000000000000..6b43b4e336ea
--- /dev/null
+++ b/dev-python/turbogears/files/turbogears-1.0.2.2-gentoo-setuptools.diff
@@ -0,0 +1,61 @@
+--- setup.py.orig	2007-05-07 07:28:49.000000000 -0700
++++ setup.py	2007-05-07 07:30:16.000000000 -0700
+@@ -10,36 +10,9 @@
+ execfile(os.path.join("turbogears", "release.py"))
+ 
+ # setup params
+-install_requires = [
+-        "TurboJson >= 0.9.9",
+-        "TurboCheetah >= 0.9.5",
+-        "TurboKid >= 1.0.1",
+-        "CherryPy >= 2.2.1,<3.0.0alpha",
+-        "simplejson >= 1.3",
+-        "elementtree >= 1.2.6",
+-        "PasteScript >= 0.9.7",
+-        "FormEncode >= 0.7.1",
+-        "setuptools >= 0.6c2",
+-        "RuleDispatch >= 0.5a0.dev-r2303",
+-        "DecoratorTools >= 1.4",
+-        "ConfigObj >= 4.3.2"]
+ tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
+ standard = ["SQLObject>=0.8,<0.10dev"]
+ 
+-# python 2.5 compatible list
+-if sys.version_info < (2, 5):
+-    install_requires.extend([
+-        "cElementTree >= 1.0.5",
+-        ])
+-    tgtesttools.extend([
+-        "pysqlite"
+-        ])
+-    standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
+-else:
+-    install_requires.extend([
+-        "Cheetah >= 2.0rc7",
+-        ])
+-
+ 
+ setup(
+     name="TurboGears",
+@@ -70,7 +43,6 @@
+ the TurboGears subversion repository</a>.""",
+     url="http://www.turbogears.org",
+     zip_safe=False,
+-    install_requires = install_requires,
+     packages=find_packages(),
+     include_package_data=True,
+     exclude_package_data={"thirdparty": ["*"]},
+@@ -117,13 +89,6 @@
+     catwalk = turbogears.toolbox.catwalk:CatWalk
+ 
+     """,
+-    extras_require = {
+-        "exp" : ["TGFastData"],
+-        "standard" : standard,
+-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
+-        "testtools" : ["nose >= 0.9.1"],
+-        "tgtesttools" : tgtesttools,
+-    },
+     classifiers = [
+         'Development Status :: 5 - Production/Stable',
+         'Environment :: Console',
diff --git a/dev-python/turbogears/turbogears-1.0.2.2.ebuild b/dev-python/turbogears/turbogears-1.0.2.2.ebuild
index c45eac054c32..f83aa6798838 100644
--- a/dev-python/turbogears/turbogears-1.0.2.2.ebuild
+++ b/dev-python/turbogears/turbogears-1.0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.2.2.ebuild,v 1.1 2007/05/06 01:19:10 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.2.2.ebuild,v 1.2 2007/05/07 14:41:58 pythonhead Exp $
 
 NEED_PYTHON=2.4
 
@@ -44,10 +44,7 @@ DOCS="CHANGELOG.txt CONTRIBUTORS.txt"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e '/install_requires = \[.*\],/d' \
-		-e '/use_setuptools/d' \
-		setup.py || die "sed failed"
+	epatch "${FILESDIR}/${P}-gentoo-setuptools.diff"
 }
 
 src_test() {