Change setup.py to use setuptools setup

Package-Manager: portage-2.1.3_rc6

12 files changed, 170 insertions, 6 deletions

diff --git a/dev-python/celementtree/ChangeLog b/dev-python/celementtree/ChangeLog
index b62456f57b1f..450b91d0ad3c 100644
--- a/dev-python/celementtree/ChangeLog
+++ b/dev-python/celementtree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/celementtree
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.17 2007/07/03 07:25:16 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.18 2007/07/05 06:36:25 pythonhead Exp $
+
+  05 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +files/celementtree-1.0.5-setuptools.patch, celementtree-1.0.5-r1.ebuild:
+  Change setup.py to use setuptools setup
 
   03 Jul 2007; Ali Polatel <hawking@gentoo.org>
   -files/celementtree-1.0.2-use_system_expat.patch,
diff --git a/dev-python/celementtree/celementtree-1.0.5-r1.ebuild b/dev-python/celementtree/celementtree-1.0.5-r1.ebuild
index 6466cdf39a86..5c9fdc9ac1d3 100644
--- a/dev-python/celementtree/celementtree-1.0.5-r1.ebuild
+++ b/dev-python/celementtree/celementtree-1.0.5-r1.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/celementtree/celementtree-1.0.5-r1.ebuild,v 1.1 2007/07/03 06:41:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.5-r1.ebuild,v 1.2 2007/07/05 06:36:25 pythonhead Exp $
 
 inherit distutils eutils
 
@@ -22,8 +22,8 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	epatch "${FILESDIR}/${P}-use_system_expat.patch"
+	epatch "${FILESDIR}/${P}-setuptools.patch"
 }
 
 src_install() {
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch b/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
new file mode 100644
index 000000000000..d70dfab1a519
--- /dev/null
+++ b/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
@@ -0,0 +1,12 @@
+--- setup.py.orig	2007-07-04 23:05:19.000000000 -0700
++++ setup.py	2007-07-04 23:05:58.000000000 -0700
+@@ -6,7 +6,8 @@
+ # Usage: python setup.py install
+ #
+ 
+-from distutils.core import setup, Extension
++from setuptools import setup
++from distutils.core import Extension
+ from distutils import sysconfig
+ import sys, os
+ 
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 2eed41b188c7..9d17123bd592 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.19 2007/02/27 22:47:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.20 2007/07/05 06:40:53 pythonhead Exp $
+
+*cherrypy-2.2.1-r1 (05 Jul 2007)
+
+  05 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +cherrypy-2.2.1-r1.ebuild:
+  Change setup.py to use setuptools setup
 
   27 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> +cherrypy-2.2.1.ebuild,
   -cherrypy-3.0.0.ebuild, cherrypy-3.0.1.ebuild:
diff --git a/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild b/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..58ab83ad8a40
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild,v 1.1 2007/07/05 06:40:53 pythonhead Exp $
+
+inherit distutils
+
+MY_P=CherryPy-${PV}
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
+SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.cherrypy.org/"
+IUSE="doc"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+LICENSE="BSD"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e '/raw_input/d' \
+		cherrypy/test/test.py || die "sed failed"
+	sed -i \
+		-e 's/"cherrypy.tutorial",//' \
+		-e "/('cherrypy\/tutorial',/, /),/d" \
+		-e 's/distutils.core/setuptools/' \
+		setup.py || die "sed failed"
+
+}
+
+src_install() {
+	distutils_src_install
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r cherrypy/tutorial
+	fi
+}
+
+src_test() {
+	PYTHONPATH=. "${python}" cherrypy/test/test.py || die "test failed"
+}
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r1 b/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r1
new file mode 100644
index 000000000000..9c6163b20695
--- /dev/null
+++ b/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r1
@@ -0,0 +1,3 @@
+MD5 14bf17b0706bc480342cb8fcfaed74cd CherryPy-2.2.1.tar.gz 219932
+RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 CherryPy-2.2.1.tar.gz 219932
+SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b CherryPy-2.2.1.tar.gz 219932
diff --git a/dev-python/configobj/ChangeLog b/dev-python/configobj/ChangeLog
index f399bb629d7f..96ccede557f0 100644
--- a/dev-python/configobj/ChangeLog
+++ b/dev-python/configobj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/configobj
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/ChangeLog,v 1.2 2007/03/10 09:20:27 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/ChangeLog,v 1.3 2007/07/05 06:43:01 pythonhead Exp $
+
+*configobj-4.4.0-r1 (05 Jul 2007)
+
+  05 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +configobj-4.4.0-r1.ebuild:
+  Change setup.py to use setuptools setup
 
 *configobj-4.4.0 (10 Mar 2007)
 
diff --git a/dev-python/configobj/configobj-4.4.0-r1.ebuild b/dev-python/configobj/configobj-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..fde402c0e21e
--- /dev/null
+++ b/dev-python/configobj/configobj-4.4.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.4.0-r1.ebuild,v 1.1 2007/07/05 06:43:01 pythonhead Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Simple but powerful config file reader and writer: an ini file round tripper."
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's/distutils.core/setuptools/' setup.py || die 'sed failed'
+}
+
+src_test() {
+	sed -i \
+		-e 's/ \(doctest\.testmod(.*\)/ sys.exit(\1[0] != 0)/' \
+		configobj_test.py
+	${python} configobj_test.py -v || die "configobj_test.py failed"
+}
+
+src_install() {
+	DOCS="CONFIGOBJ_CHANGELOG_TODO.txt docs/configobj.txt docs/validate.txt"
+	distutils_src_install
+
+	if use doc ; then
+		dohtml -r docs/*
+	fi
+}
diff --git a/dev-python/configobj/files/digest-configobj-4.4.0-r1 b/dev-python/configobj/files/digest-configobj-4.4.0-r1
new file mode 100644
index 000000000000..0246f593a50f
--- /dev/null
+++ b/dev-python/configobj/files/digest-configobj-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 9d222d8d583b9bdc5b5ecbae1be5177a configobj-4.4.0.zip 171350
+RMD160 bc1f4edceef66322ddfc460f8e47a2d12431d813 configobj-4.4.0.zip 171350
+SHA256 ca09e5a308eaec07749eb74d772f6263dc9d7b7e76787b8c1fb986d34d323803 configobj-4.4.0.zip 171350
diff --git a/dev-python/elementtree/ChangeLog b/dev-python/elementtree/ChangeLog
index a12b326cdbaa..1564809daaaf 100644
--- a/dev-python/elementtree/ChangeLog
+++ b/dev-python/elementtree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/elementtree
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/ChangeLog,v 1.24 2007/03/12 17:27:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/ChangeLog,v 1.25 2007/07/05 06:45:42 pythonhead Exp $
+
+*elementtree-1.2.6-r1 (05 Jul 2007)
+
+  05 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +elementtree-1.2.6-r1.ebuild:
+  Change setup.py to use setuptools setup
 
   12 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   elementtree-1.2.6.ebuild:
diff --git a/dev-python/elementtree/elementtree-1.2.6-r1.ebuild b/dev-python/elementtree/elementtree-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..4d60ba185003
--- /dev/null
+++ b/dev-python/elementtree/elementtree-1.2.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.6-r1.ebuild,v 1.1 2007/07/05 06:45:42 pythonhead Exp $
+
+inherit distutils
+
+MY_P="${PN}-${PV}-20050316"
+DESCRIPTION="A light-weight XML object model for Python"
+HOMEPAGE="http://effbot.org/zone/element-index.htm"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="ElementTree"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's/distutils.core/setuptools/' setup.py || die 'sed failed'
+}
+
+src_test() {
+	python selftest.py || die "selftest.py failed"
+}
+
+src_install() {
+	distutils_src_install
+	dodoc CHANGES
+	dohtml docs/*
+}
diff --git a/dev-python/elementtree/files/digest-elementtree-1.2.6-r1 b/dev-python/elementtree/files/digest-elementtree-1.2.6-r1
new file mode 100644
index 000000000000..5f5974d53077
--- /dev/null
+++ b/dev-python/elementtree/files/digest-elementtree-1.2.6-r1
@@ -0,0 +1,3 @@
+MD5 e1b21716be8bfff8bf192fc3880ad008 elementtree-1.2.6-20050316.tar.gz 41752
+RMD160 887cb1c4a3b62874b76841ae5109d0153d61a548 elementtree-1.2.6-20050316.tar.gz 41752
+SHA256 b29d5f2417cb331562c8c5f8ebef2a895ba540261c4245f526143c6a31bccb04 elementtree-1.2.6-20050316.tar.gz 41752