Version bump including some cleanups and fixes. Dropped old versions.

Package-Manager: portage-2.1.2-r5

11 files changed, 75 insertions, 181 deletions

diff --git a/dev-python/kid/ChangeLog b/dev-python/kid/ChangeLog
index 1824f3e9660b..b8452b0e65bb 100644
--- a/dev-python/kid/ChangeLog
+++ b/dev-python/kid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/kid
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/ChangeLog,v 1.10 2006/12/24 09:28:20 lucass Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/ChangeLog,v 1.11 2007/02/03 22:43:14 dev-zero Exp $
+
+*kid-0.9.5 (03 Feb 2007)
+
+  03 Feb 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/kid-0.9.4-ezsetup-gentoo.patch,
+  -files/kid-0.9-ezsetup-gentoo.patch, -kid-0.9.1.ebuild, -kid-0.9.3.ebuild,
+  -kid-0.9.4.ebuild, +kid-0.9.5.ebuild:
+  Version bump including some cleanups and fixes. Dropped old versions.
 
   24 Dec 2006; Lukasz Strzygowski <lucass@gentoo.org> kid-0.9.4.ebuild:
   Fixed deps, bug #158870.
diff --git a/dev-python/kid/files/digest-kid-0.9.1 b/dev-python/kid/files/digest-kid-0.9.1
deleted file mode 100644
index dd8da51f2a66..000000000000
--- a/dev-python/kid/files/digest-kid-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 886c71036525891c3c7a9df5137eaaac kid-0.9.1.tar.gz 40257
-RMD160 ad03927c731065662f6a34cb5c4877711b0273e3 kid-0.9.1.tar.gz 40257
-SHA256 01589cbb18ea4522108d9abb637bf89494529db9a5be0630023c7d713d3af687 kid-0.9.1.tar.gz 40257
diff --git a/dev-python/kid/files/digest-kid-0.9.3 b/dev-python/kid/files/digest-kid-0.9.3
deleted file mode 100644
index a908f197d44c..000000000000
--- a/dev-python/kid/files/digest-kid-0.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a2fa657183b01ab8f4fb5f79704a013 kid-0.9.3.tar.gz 234467
-RMD160 d1cda6c9590b9e87faa2671903bcbf8e8dd6f5c0 kid-0.9.3.tar.gz 234467
-SHA256 ef62231786f0daa1efc19519ec3c825300e06add9499b74170cfeb1b39d16215 kid-0.9.3.tar.gz 234467
diff --git a/dev-python/kid/files/digest-kid-0.9.4 b/dev-python/kid/files/digest-kid-0.9.4
deleted file mode 100644
index c67ad287ffbf..000000000000
--- a/dev-python/kid/files/digest-kid-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2122ee32062079418db34cfd5fc15c37 kid-0.9.4.tar.gz 122800
-RMD160 2a32af5e0053f5b9fce992f87da1a028f0d869ac kid-0.9.4.tar.gz 122800
-SHA256 5099b81f6023d3666f17781758c9417ef27b000befeef5b358f839ccdd6938ee kid-0.9.4.tar.gz 122800
diff --git a/dev-python/kid/files/digest-kid-0.9.5 b/dev-python/kid/files/digest-kid-0.9.5
new file mode 100644
index 000000000000..d5fbe0177d6b
--- /dev/null
+++ b/dev-python/kid/files/digest-kid-0.9.5
@@ -0,0 +1,3 @@
+MD5 61545377ea95704852bf5a894f7cae26 kid-0.9.5.tar.gz 129708
+RMD160 c4d8dfe88bf02311000364dc0e41140721ff3006 kid-0.9.5.tar.gz 129708
+SHA256 4e5634dbda4ed3fc3d083a1d02910ddc106e511dfe66922615db975f5076595f kid-0.9.5.tar.gz 129708
diff --git a/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch b/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch
deleted file mode 100644
index 837077f1a7ca..000000000000
--- a/dev-python/kid/files/kid-0.9-ezsetup-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kid-0.9/setup.py	2005-12-02 07:46:12.000000000 +0000
-+++ kid-0.9-patched/setup.py	2006-01-03 08:49:19.000000000 +0000
-@@ -1,6 +1,4 @@
- # bootstrap setuptools if necessary
--from ez_setup import use_setuptools
--use_setuptools()
- 
- import os
-
-@@ -8,7 +6,7 @@
- 
- doc_parts = long_description.strip().splitlines()
-
--from setuptools import setup, find_packages
-+from distutils.core import setup
- setup(
-     name="kid",
-     version=version,
diff --git a/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch b/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch
deleted file mode 100644
index 313c12fe21e7..000000000000
--- a/dev-python/kid/files/kid-0.9.4-ezsetup-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- setup.orig	2006-12-23 11:53:52.000000000 +0100
-+++ setup.py	2006-12-23 11:54:43.000000000 +0100
-@@ -1,12 +1,8 @@
--# bootstrap setuptools if necessary
--from ez_setup import use_setuptools
--use_setuptools()
--
- import os
- 
- execfile(os.path.join("kid", "release.py"))
- 
--from setuptools import setup, find_packages
-+from distutils.core import setup
- 
- install_requires = []
- try:
diff --git a/dev-python/kid/kid-0.9.1.ebuild b/dev-python/kid/kid-0.9.1.ebuild
deleted file mode 100644
index 37f57dc36834..000000000000
--- a/dev-python/kid/kid-0.9.1.ebuild
+++ /dev/null
@@ -1,42 +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/kid/kid-0.9.1.ebuild,v 1.2 2006/07/21 12:35:44 lucass Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A simple and Pythonic XML template language"
-SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.kid-templating.org/"
-
-KEYWORDS="~amd64 ~ia64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	>=dev-python/elementtree-1.2.6"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# use distutils instead of egg
-	epatch ${FILESDIR}/kid-0.9-ezsetup-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	dobin bin/*
-
-	dohtml -r doc/html/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
-
-pkg_postinst() {
-	einfo "Installing dev-python/celementtree may enhance performance."
-}
-
diff --git a/dev-python/kid/kid-0.9.3.ebuild b/dev-python/kid/kid-0.9.3.ebuild
deleted file mode 100644
index 8fe964dd15f6..000000000000
--- a/dev-python/kid/kid-0.9.3.ebuild
+++ /dev/null
@@ -1,47 +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/kid/kid-0.9.3.ebuild,v 1.1 2006/07/21 12:35:44 lucass Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A simple and Pythonic XML template language"
-SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.kid-templating.org/"
-
-KEYWORDS="~amd64 ~ia64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	>=dev-python/elementtree-1.2.6"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# use distutils instead of egg
-	epatch ${FILESDIR}/kid-0.9-ezsetup-gentoo.patch
-}
-
-src_test() {
-	${python} test_kid.py || die "test_kid.py failed"
-}
-
-src_install() {
-	distutils_src_install
-
-	dobin bin/*
-
-	dodoc doc/*.txt COPYING HISTORY RELEASING
-	dohtml -r doc/html/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
-
-pkg_postinst() {
-	einfo "Installing dev-python/celementtree may enhance performance."
-}
-
diff --git a/dev-python/kid/kid-0.9.4.ebuild b/dev-python/kid/kid-0.9.4.ebuild
deleted file mode 100644
index 3afc27f3bc49..000000000000
--- a/dev-python/kid/kid-0.9.4.ebuild
+++ /dev/null
@@ -1,47 +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/kid/kid-0.9.4.ebuild,v 1.2 2006/12/24 09:28:20 lucass Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A simple and Pythonic XML template language"
-SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.kid-templating.org/"
-
-KEYWORDS="~amd64 ~ia64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3
-	|| ( >=dev-lang/python-2.5 dev-python/elementtree )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# use distutils instead of egg
-	epatch ${FILESDIR}/kid-0.9.4-ezsetup-gentoo.patch
-}
-
-src_test() {
-	${python} run_tests.py -x || die "run_tests.py failed"
-}
-
-src_install() {
-	distutils_src_install
-
-	dobin bin/*
-
-	dodoc doc/*.txt COPYING HISTORY RELEASING
-	dohtml -r doc/html/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
-
-pkg_postinst() {
-	einfo "Installing dev-python/celementtree may enhance performance."
-}
-
diff --git a/dev-python/kid/kid-0.9.5.ebuild b/dev-python/kid/kid-0.9.5.ebuild
new file mode 100644
index 000000000000..0df116f1537f
--- /dev/null
+++ b/dev-python/kid/kid-0.9.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kid/kid-0.9.5.ebuild,v 1.1 2007/02/03 22:43:15 dev-zero Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils
+
+DESCRIPTION="A simple and Pythonic XML template language"
+SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.kid-templating.org/"
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/elementtree )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/docutils )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e '/use_setuptools/d' \
+		setup.py || die "sed failed"
+}
+
+src_test() {
+	# We have to move the build folder out of the way to make the tests work
+	mv build build.bak
+	PYTHONPATH="." "${python}" run_tests.py -x || die "tests failed"
+	mv build.bak build
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C doc
+}
+
+src_install() {
+	DOCS="HISTORY RELEASING"
+	distutils_src_install
+
+	dobin bin/*
+
+	dodoc doc/*.txt
+	use doc && dohtml doc/*.{html,css}
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	elog "Installing dev-python/celementtree may enhance performance."
+}