Version bump. Removed unsupported python2.5 patch from 1.0.1

Package-Manager: portage-2.1.2.5

6 files changed, 88 insertions, 30 deletions

diff --git a/dev-python/turbogears/ChangeLog b/dev-python/turbogears/ChangeLog
index f4517baa50cf..7df2de5d1e25 100644
--- a/dev-python/turbogears/ChangeLog
+++ b/dev-python/turbogears/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2007/05/02 16:49:00 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/ChangeLog,v 1.4 2007/05/06 01:19:10 pythonhead Exp $
+
+*turbogears-1.0.2.2 (06 May 2007)
+
+  06 May 2007; Rob Cakebread <pythonhead@gentoo.org>
+  -files/turbogears-1.0.1-py25.diff, turbogears-1.0.1.ebuild,
+  +turbogears-1.0.2.2.ebuild:
+  Version bump. Removed unsupported python2.5 patch from 1.0.1
 
   02 May 2007; Rob Cakebread <pythonhead@gentoo.org>
   turbogears-1.0.1.ebuild:
diff --git a/dev-python/turbogears/Manifest b/dev-python/turbogears/Manifest
index e11373a6f8f0..0f0cbb35ca9d 100644
--- a/dev-python/turbogears/Manifest
+++ b/dev-python/turbogears/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX turbogears-1.0.1-py25.diff 569 RMD160 bbeae480de3b061a514df63e485ec1828195018b SHA1 13e753b55108633ca31dbf0ac2e6d41f75b94d69 SHA256 e7aa9cbf9f2ccf282a676f7ce572453662ba0e53e0a7fadabd08e904ccd945e2
-MD5 d5bf6345bc71f57b7fcc922232488db2 files/turbogears-1.0.1-py25.diff 569
-RMD160 bbeae480de3b061a514df63e485ec1828195018b files/turbogears-1.0.1-py25.diff 569
-SHA256 e7aa9cbf9f2ccf282a676f7ce572453662ba0e53e0a7fadabd08e904ccd945e2 files/turbogears-1.0.1-py25.diff 569
 DIST TurboGears-1.0.1.tar.gz 753149 RMD160 2ed258e7a5d790fbc15395a03597c6b3b6914f1d SHA1 f3921cde12413a0637a7614e6d0484966203b340 SHA256 ed70be7ddbe503286aae01f01b2165c442feabc1f92b812356df5061da948bf7
-EBUILD turbogears-1.0.1.ebuild 1545 RMD160 a34d5f25a228010a27aa3ea60b1e4a48aae7ad3a SHA1 fe1243b2361fd79da27c94561225e839bcbf2009 SHA256 d2a3015d9309406fa718e8e8060728153e6d93281ca3f2829026a60b04625e0b
-MD5 25165fd9bf01ae1c1af6a4c91b752b29 turbogears-1.0.1.ebuild 1545
-RMD160 a34d5f25a228010a27aa3ea60b1e4a48aae7ad3a turbogears-1.0.1.ebuild 1545
-SHA256 d2a3015d9309406fa718e8e8060728153e6d93281ca3f2829026a60b04625e0b turbogears-1.0.1.ebuild 1545
-MISC ChangeLog 621 RMD160 f8fe78102ecd07b63d400e71182393a5439c8404 SHA1 f06157c1e636e229b46a6af2aa3b2d4a4f4988a3 SHA256 38d3d9408c08cdf77963f7db1b4e1b5b6d2de1df9e2f4f64c8e8bbf07fe6da10
-MD5 5e955bc19cff89bb60b2c82ffb4f2d12 ChangeLog 621
-RMD160 f8fe78102ecd07b63d400e71182393a5439c8404 ChangeLog 621
-SHA256 38d3d9408c08cdf77963f7db1b4e1b5b6d2de1df9e2f4f64c8e8bbf07fe6da10 ChangeLog 621
+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
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -21,10 +22,13 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 7e34e4b96d48c54d4b8cf33a91a27edf files/digest-turbogears-1.0.1 250
 RMD160 44d0a06e46cd1566616249626550a03099140ef5 files/digest-turbogears-1.0.1 250
 SHA256 ef653568836b74c23911e6d6bcfd2ce3b562054212c6632b2a0383879c9f1806 files/digest-turbogears-1.0.1 250
+MD5 8513968a5df4516ef0c931206c610293 files/digest-turbogears-1.0.2.2 256
+RMD160 5b5086c4bc7b82e8787370233a7a11e1d7ed2a22 files/digest-turbogears-1.0.2.2 256
+SHA256 aaeec58297122cda70885277b742d5b38b9eed283c6fb898775ca1fa01bddf4f files/digest-turbogears-1.0.2.2 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGOMGi96cFzIajWwkRAgvSAKDOBKH1HHF9Ml0xyWpe/TiHgyKW4ACgwJRX
-V91ouebhC588Xzpjzu8XUiI=
-=V+Q8
+iD8DBQFGPS0b96cFzIajWwkRAiU/AJ0dnz3fecu6DDIh90r6yoQBVbqT6QCgxTN/
+Fu22WzTOQlSjh/UV9q7M0vM=
+=sla+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/turbogears/files/digest-turbogears-1.0.2.2 b/dev-python/turbogears/files/digest-turbogears-1.0.2.2
new file mode 100644
index 000000000000..b4d04a06e03a
--- /dev/null
+++ b/dev-python/turbogears/files/digest-turbogears-1.0.2.2
@@ -0,0 +1,3 @@
+MD5 a8d79645b4ce67409026838ca360addc TurboGears-1.0.2.2.tar.gz 763088
+RMD160 220285387ae05ef3ebb773ed51f8f9991bb32e83 TurboGears-1.0.2.2.tar.gz 763088
+SHA256 311e2119f38d78d322408f7b6f106905921ce141f0e19d6ca254a6f9ee63e769 TurboGears-1.0.2.2.tar.gz 763088
diff --git a/dev-python/turbogears/files/turbogears-1.0.1-py25.diff b/dev-python/turbogears/files/turbogears-1.0.1-py25.diff
deleted file mode 100644
index 2dc5b8997167..000000000000
--- a/dev-python/turbogears/files/turbogears-1.0.1-py25.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- turbogears/widgets/meta.py.OLD	2007-02-06 21:39:39.500000000 +0100
-+++ turbogears/widgets/meta.py	2007-02-06 21:34:29.421875000 +0100
-@@ -70,7 +70,7 @@
-             dct["__init__"] = _decorate_widget_init(dct["__init__"])
-             cls.__init__ = dct["__init__"]
-         super(MetaWidget, cls).__init__(name, bases, dct)
--        modname = "%s.%s.Template" % (cls.__module__, name)
-+        modname = "%s.%s" % (cls.__module__, name)
-         if cls.template:
-             (cls.template_c,
-              cls.template) = load_kid_template(cls.template, modname)
diff --git a/dev-python/turbogears/turbogears-1.0.1.ebuild b/dev-python/turbogears/turbogears-1.0.1.ebuild
index 9e39c1bbac72..a6d649bde95e 100644
--- a/dev-python/turbogears/turbogears-1.0.1.ebuild
+++ b/dev-python/turbogears/turbogears-1.0.1.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.1.ebuild,v 1.3 2007/05/02 16:49:00 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.1.ebuild,v 1.4 2007/05/06 01:19:10 pythonhead Exp $
 
 NEED_PYTHON=2.4
 
@@ -42,8 +42,6 @@ DOCS="CHANGELOG.txt CONTRIBUTORS.txt"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#Make Turbogears work with Python 2.5
-	epatch ${FILESDIR}/${P}-py25.diff
 	sed -i \
 		-e '/install_requires = \[.*\],/d' \
 		-e '/install_requires/, /],/d' \
diff --git a/dev-python/turbogears/turbogears-1.0.2.2.ebuild b/dev-python/turbogears/turbogears-1.0.2.2.ebuild
new file mode 100644
index 000000000000..c45eac054c32
--- /dev/null
+++ b/dev-python/turbogears/turbogears-1.0.2.2.ebuild
@@ -0,0 +1,57 @@
+# 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 $
+
+NEED_PYTHON=2.4
+
+inherit distutils
+
+KEYWORDS="~amd64 ~x86"
+
+MY_PN=TurboGears
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The rapid web development meta-framework you've been looking for."
+HOMEPAGE="http://www.turbogears.org/"
+SRC_URI="http://files.turbogears.org/eggs/${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/turbojson-1.0
+	>=dev-python/turbocheetah-0.9.5
+	>=dev-python/cheetah-2.0_rc7
+	>=dev-python/turbokid-1.0.1
+	=dev-python/cherrypy-2.2*
+	>=dev-python/simplejson-1.3
+	>=dev-python/elementtree-1.2.6
+	>=dev-python/pastescript-0.9.7
+	>=dev-python/formencode-0.7.1
+	>=dev-python/ruledispatch-0.5_pre2306
+	>=dev-python/decoratortools-1.4
+	>=dev-python/configobj-4.3.2
+	>=dev-python/celementtree-1.0.5
+	|| ( >=dev-python/sqlobject-0.7 >=dev-python/sqlalchemy-0.3.3 )
+	>=dev-python/genshi-0.3.6
+	test? ( >=dev-python/nose-0.9.1 >=dev-python/sqlalchemy-0.3.3 )"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.6_rc5"
+
+S=${WORKDIR}/${MY_P}
+
+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"
+}
+
+src_test() {
+	PYTHONPATH=. "${python}" setup.py test || die "tests failed"
+	PYTHONPATH=. "${python}" setup.py nosetests || die "nosetests failed"
+}
+