Package works with all supported versions of python.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 13 insertions, 69 deletions

diff --git a/dev-python/chameleon/ChangeLog b/dev-python/chameleon/ChangeLog
index 14938467c624..507bfe821915 100644
--- a/dev-python/chameleon/ChangeLog
+++ b/dev-python/chameleon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/chameleon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.12 2012/05/20 14:44:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.13 2012/05/20 15:20:13 floppym Exp $
+
+*chameleon-2.8.3-r1 (20 May 2012)
+
+  20 May 2012; Mike Gilbert <floppym@gentoo.org> +chameleon-2.8.3-r1.ebuild,
+  -chameleon-2.8.2.ebuild, -chameleon-2.8.3.ebuild:
+  Package works with all supported versions of python.
 
 *chameleon-2.8.3 (20 May 2012)
 
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 08c774e5da18..fc9b95f47e04 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Chameleon-2.8.2.tar.gz 148458 RMD160 b115769caf5dfc4ff1de24534dee1d390bce7c81 SHA1 f575fb7bdea24d743a2f416d9531c6ddbd8c626c SHA256 702457a9f63b6ed1f963ffc5a8f546e9303402190b560e829ded219eaef6fea4
 DIST Chameleon-2.8.3.tar.gz 148662 RMD160 b0aea80c3e3084f75bc77feef8cf07b44be5a85b SHA1 ab9b6840cc70c52c5fbec7ae32076832b7f2229b SHA256 273811890999a5fee966298192311cc57f15b594d0fe370009df5d48d3e56a2b
-EBUILD chameleon-2.8.2.ebuild 1345 RMD160 5a5744c57e265619dee9bafff45437138a406bd2 SHA1 4b1d97a6af017b83b0964660ef75b9d21efa3fa4 SHA256 4186c810fe378e87115097cf47c5485c0c13797fc0f7fe9442630e0bcdaec104
-EBUILD chameleon-2.8.3.ebuild 1345 RMD160 7cc0d694809a9c06c6eafc4cd889c9238c9b74fd SHA1 e7b18ac0ffa6d6fecf3063c0b7ea493ce2ece4ed SHA256 24951e0c3d304010ad698be2e9c7daf634dad3f20552c8307c5ae96800857e5e
-MISC ChangeLog 1963 RMD160 0f2a73de40bf41cf87eb26af9af815de0aa1681b SHA1 243304044a81a7096ce66d755ff11bdd68285adc SHA256 cf5a9e0652f5aaea4266d761d8aa90c6b45807316898a43f46a2d0a6fbc15e3a
+EBUILD chameleon-2.8.3-r1.ebuild 1293 RMD160 394a454e935e45cb09d9f88205fde7a5e2a114c6 SHA1 dfb3611b5c3c023c8d42c6fab7850f61c669d51e SHA256 e5389dfca213d6b8670b4b0f403bca77293e706830aa6a54277cdc19fdcc97e2
+MISC ChangeLog 2183 RMD160 d6eb2ea03409e8f408535dfb529fef350c41f0e8 SHA1 16d7bbf2fa41b1974b5a620f0d7bd1e5f944bfb7 SHA256 faaffd9d75eb1154fedffbd8fe7334b2339416300f62a7d6c5d92eb263cb13fd
 MISC metadata.xml 232 RMD160 245f9e5c306c41f609a2c99f30f9e788b5d21e41 SHA1 22e763c2477f160af2ed61baa728675c9ebd89e6 SHA256 c0cac02ffe32edb941fbfe04c5572a09534a29f17eefc8edb585a873eb061a86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+5A2AACgkQC77qH+pIQ6TRegD/fFCTp3KBcVWjvCIxEgmecD3C
-nWk6QpwuYTCtKiPUqxUBAIXUG6KiZP3NquqUZA8q01p45mMVrAmuEn464+8j3rKp
-=zY4L
+iF4EAREIAAYFAk+5C7MACgkQC77qH+pIQ6SLFQD9HkPB7Oq+JzPNjEVc12J+IElZ
+wZWpA/4F5P7etjAE0gABALgBFV9f81Q6kBXp8bILNWXLSBMuV1ioVhXZCk8XGQq2
+=KEGt
 -----END PGP SIGNATURE-----
diff --git a/dev-python/chameleon/chameleon-2.8.2.ebuild b/dev-python/chameleon/chameleon-2.8.3-r1.ebuild
index 5372d4b904aa..a3b9c581da31 100644
--- a/dev-python/chameleon/chameleon-2.8.2.ebuild
+++ b/dev-python/chameleon/chameleon-2.8.3-r1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.8.2.ebuild,v 1.1 2012/04/11 07:11:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.8.3-r1.ebuild,v 1.1 2012/05/20 15:20:13 floppym Exp $
 
 EAPI=3
 
 SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.7 3"
-RESTRICT_PYTHON_ABIS="2.[456]"
 DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
diff --git a/dev-python/chameleon/chameleon-2.8.3.ebuild b/dev-python/chameleon/chameleon-2.8.3.ebuild
deleted file mode 100644
index facaa10b6eb2..000000000000
--- a/dev-python/chameleon/chameleon-2.8.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.8.3.ebuild,v 1.1 2012/05/20 14:44:42 floppym Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.7 3"
-RESTRICT_PYTHON_ABIS="2.[456]"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN="Chameleon"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="http://chameleon.repoze.org http://pypi.python.org/pypi/Chameleon"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		emake html || die "make html failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_tests_and_incompatible_modules() {
-		rm -fr "${ED}$(python_get_sitedir)/chameleon/tests"
-
-		if [[ "$(python_get_version -l --major)" == "3" ]]; then
-			rm -f "${ED}$(python_get_sitedir)/chameleon/"{benchmark.py,py25.py}
-		fi
-	}
-	python_execute_function -q delete_tests_and_incompatible_modules
-
-	if use doc; then
-		pushd _build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static
-		popd > /dev/null
-	fi
-}