Removed use_setuptools sed. Dropped old version.

(Portage version: 2.1.3_rc6)

5 files changed, 8 insertions, 136 deletions

diff --git a/dev-python/turbogears/ChangeLog b/dev-python/turbogears/ChangeLog
index 43223f31331e..ff9295a495f9 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.7 2007/07/04 19:39:14 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/ChangeLog,v 1.8 2007/07/04 20:34:56 lucass Exp $
+
+  04 Jul 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/turbogears-1.0.2.2-gentoo-setuptools.diff,
+  -turbogears-1.0.1.ebuild, turbogears-1.0.2.2.ebuild:
+  Removed use_setuptools sed. Dropped old version.
 
   04 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
   turbogears-1.0.1.ebuild, turbogears-1.0.2.2.ebuild:
diff --git a/dev-python/turbogears/files/digest-turbogears-1.0.1 b/dev-python/turbogears/files/digest-turbogears-1.0.1
deleted file mode 100644
index c803a9bc8f3c..000000000000
--- a/dev-python/turbogears/files/digest-turbogears-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 57580dce73ab2fc5c7f72e3e3cd804b1 TurboGears-1.0.1.tar.gz 753149
-RMD160 2ed258e7a5d790fbc15395a03597c6b3b6914f1d TurboGears-1.0.1.tar.gz 753149
-SHA256 ed70be7ddbe503286aae01f01b2165c442feabc1f92b812356df5061da948bf7 TurboGears-1.0.1.tar.gz 753149
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
deleted file mode 100644
index 0edecadcaecc..000000000000
--- a/dev-python/turbogears/files/turbogears-1.0.2.2-gentoo-setuptools.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- setup.py.orig	2007-07-02 17:36:43.000000000 -0700
-+++ setup.py	2007-07-02 17:38:39.000000000 -0700
-@@ -1,5 +1,3 @@
--from ez_setup import use_setuptools
--use_setuptools()
- from setuptools import setup, find_packages
- from pkg_resources import DistributionNotFound
- 
-@@ -11,37 +9,6 @@
- 
- 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",
-@@ -72,7 +39,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": ["*"]},
-@@ -119,13 +85,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.1.ebuild b/dev-python/turbogears/turbogears-1.0.1.ebuild
deleted file mode 100644
index 22f92786fe4e..000000000000
--- a/dev-python/turbogears/turbogears-1.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.5 2007/07/04 19:39:14 pythonhead Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=TurboGears
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="the rapid web development megaframework 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/turbokid-0.9.8
-	=dev-python/cherrypy-2.2*
-	>=dev-python/simplejson-1.3
-	>=dev-python/elementtree-1.2.6
-	>=dev-python/pastescript-0.9.7
-	>=dev-python/celementtree-1.0.5
-	>=dev-python/formencode-0.5.1
-	dev-python/ruledispatch
-	>=dev-python/configobj-4.3.2
-	|| ( =dev-python/sqlobject-0.7* >=dev-python/sqlalchemy-0.3.3 )
-	>=dev-python/genshi-0.3.6
-	test? ( >=dev-python/nose-0.9 >=dev-python/sqlalchemy-0.3.3 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="CHANGELOG.txt CONTRIBUTORS.txt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-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"
-}
diff --git a/dev-python/turbogears/turbogears-1.0.2.2.ebuild b/dev-python/turbogears/turbogears-1.0.2.2.ebuild
index 9e77bb1a63b7..e5175df7eb8b 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.3 2007/07/04 19:39:14 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbogears/turbogears-1.0.2.2.ebuild,v 1.4 2007/07/04 20:34:56 lucass Exp $
 
 NEED_PYTHON=2.4
 
@@ -37,20 +37,11 @@ RDEPEND=">=dev-python/turbojson-1.0
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-0.6_rc5"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGELOG.txt CONTRIBUTORS.txt"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-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"
 }
-