bump; clean old python impl, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

11 files changed, 14 insertions, 417 deletions

diff --git a/dev-python/chameleon/ChangeLog b/dev-python/chameleon/ChangeLog
index c0cc62427213..05a630e54e3b 100644
--- a/dev-python/chameleon/ChangeLog
+++ b/dev-python/chameleon/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/chameleon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.25 2014/05/26 08:22:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/ChangeLog,v 1.26 2014/12/07 08:34:09 idella4 Exp $
+
+*chameleon-2.18 (07 Dec 2014)
+
+  07 Dec 2014; Ian Delaney <idella4@gentoo.org> +chameleon-2.18.ebuild,
+  -chameleon-2.10.ebuild, -chameleon-2.11-r1.ebuild, -chameleon-2.11.ebuild,
+  -chameleon-2.12.ebuild, -chameleon-2.13.ebuild, -chameleon-2.14.ebuild,
+  -chameleon-2.15.ebuild, -chameleon-2.8.3-r1.ebuild, -chameleon-2.9.2.ebuild,
+  chameleon-2.16.ebuild:
+  bump; clean old python impl, rm old
 
 *chameleon-2.16 (26 May 2014)
 
diff --git a/dev-python/chameleon/chameleon-2.10.ebuild b/dev-python/chameleon/chameleon-2.10.ebuild
deleted file mode 100644
index 63aa5d958b9e..000000000000
--- a/dev-python/chameleon/chameleon-2.10.ebuild
+++ /dev/null
@@ -1,61 +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.10.ebuild,v 1.1 2012/10/29 08:50:39 patrick Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-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
-
-		if [[ $(python_get_version -l) == "2.5" ]]; then
-			echo "raise SyntaxError" > \
-				"${ED}$(python_get_sitedir -b)/chameleon/py26.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
-}
diff --git a/dev-python/chameleon/chameleon-2.11-r1.ebuild b/dev-python/chameleon/chameleon-2.11-r1.ebuild
deleted file mode 100644
index 1e0f6fae8652..000000000000
--- a/dev-python/chameleon/chameleon-2.11-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.11-r1.ebuild,v 1.3 2014/03/31 20:42:27 mgorny Exp $
-
-EAPI=5
-
-# py2.6 requires ordereddict that's not packaged for Gentoo
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-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[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/chameleon-2.11.ebuild b/dev-python/chameleon/chameleon-2.11.ebuild
deleted file mode 100644
index ba09de204cb7..000000000000
--- a/dev-python/chameleon/chameleon-2.11.ebuild
+++ /dev/null
@@ -1,61 +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.11.ebuild,v 1.1 2012/11/29 08:40:57 patrick Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-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
-
-		if [[ $(python_get_version -l) == "2.5" ]]; then
-			echo "raise SyntaxError" > \
-				"${ED}$(python_get_sitedir -b)/chameleon/py26.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
-}
diff --git a/dev-python/chameleon/chameleon-2.12.ebuild b/dev-python/chameleon/chameleon-2.12.ebuild
deleted file mode 100644
index 26c533f6fa03..000000000000
--- a/dev-python/chameleon/chameleon-2.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.12.ebuild,v 1.2 2014/03/31 20:42:27 mgorny Exp $
-
-EAPI=5
-
-# py2.6 requires ordereddict that's not packaged for Gentoo
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-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[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/chameleon-2.13.ebuild b/dev-python/chameleon/chameleon-2.13.ebuild
deleted file mode 100644
index 446342f3c754..000000000000
--- a/dev-python/chameleon/chameleon-2.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.13.ebuild,v 1.2 2014/03/31 20:42:27 mgorny Exp $
-
-EAPI=5
-
-# py2.6 requires ordereddict that's not packaged for Gentoo
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-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[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/chameleon-2.14.ebuild b/dev-python/chameleon/chameleon-2.14.ebuild
deleted file mode 100644
index 185cc64da8ad..000000000000
--- a/dev-python/chameleon/chameleon-2.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.14.ebuild,v 1.2 2014/03/31 20:42:27 mgorny Exp $
-
-EAPI=5
-
-# py2.6 requires ordereddict that's not packaged for Gentoo
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-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[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/chameleon-2.16.ebuild b/dev-python/chameleon/chameleon-2.16.ebuild
index cd2a35d93cf7..25bebc8d756f 100644
--- a/dev-python/chameleon/chameleon-2.16.ebuild
+++ b/dev-python/chameleon/chameleon-2.16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.16.ebuild,v 1.1 2014/05/26 08:22:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.16.ebuild,v 1.2 2014/12/07 08:34:09 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/chameleon/chameleon-2.15.ebuild b/dev-python/chameleon/chameleon-2.18.ebuild
index 76d60175cbf0..971960f1e8ad 100644
--- a/dev-python/chameleon/chameleon-2.15.ebuild
+++ b/dev-python/chameleon/chameleon-2.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.15.ebuild,v 1.1 2014/05/02 09:49:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chameleon/chameleon-2.18.ebuild,v 1.1 2014/12/07 08:34:09 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/chameleon/chameleon-2.8.3-r1.ebuild b/dev-python/chameleon/chameleon-2.8.3-r1.ebuild
deleted file mode 100644
index 4e19692f12b0..000000000000
--- a/dev-python/chameleon/chameleon-2.8.3-r1.ebuild
+++ /dev/null
@@ -1,61 +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-r1.ebuild,v 1.2 2012/05/20 15:39:02 floppym Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-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
-
-		if [[ $(python_get_version -l) == "2.5" ]]; then
-			echo "raise SyntaxError" > \
-				"${ED}$(python_get_sitedir -b)/chameleon/py26.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
-}
diff --git a/dev-python/chameleon/chameleon-2.9.2.ebuild b/dev-python/chameleon/chameleon-2.9.2.ebuild
deleted file mode 100644
index 517e9ab1035b..000000000000
--- a/dev-python/chameleon/chameleon-2.9.2.ebuild
+++ /dev/null
@@ -1,61 +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.9.2.ebuild,v 1.1 2012/06/28 06:14:35 patrick Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-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
-
-		if [[ $(python_get_version -l) == "2.5" ]]; then
-			echo "raise SyntaxError" > \
-				"${ED}$(python_get_sitedir -b)/chameleon/py26.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
-}