bump; clean old python impl, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

12 files changed, 28 insertions, 436 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/Manifest b/dev-python/chameleon/Manifest
index 32e4759ef672..d990d4c09f2b 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,21 +1,16 @@
-DIST Chameleon-2.10.tar.gz 156547 SHA256 3a9ea188a0acfab469152834fe909ef8691f2fe65950cd6d3c8d09be31f8b44d SHA512 9233041b602ed03cc579a87c1f8e0ffe297e27b8c4c7915b056eed97806f11f647137c0ee0e3979a9e8b2e21de25a637da5e72639dff03537507bf0f7a1f712c WHIRLPOOL 0ad0a03fbdb17f6dfc9ee89c12de4d99b51f97e3c0c29030fe95825a97d23442a6624b462de4b505726bec0fc5a63ca1ff097784b6903fc3fe9b39117077c35b
-DIST Chameleon-2.11.tar.gz 157097 SHA256 4bebbc129c84344fff58ad032130ab85f1891b1f06f6da0b6623aab527f34bb8 SHA512 3c30af9e79fa2101fa5a4504a0b793a834169d3a4b90b7199754129ca0ae02faae6ec2cb77ef9e48f03a1d9ec4a3936e2385c06ff8e7ab098aeaa678833f7a26 WHIRLPOOL 29794244d3fb07aa2b98e1109c6e7d3e379c5f73e430f488beeef2af9a79d79ee8e1138210f6321d77bd6cbb850d8ac58816319153e9cc7627f8bf1fa6e069ea
-DIST Chameleon-2.12.tar.gz 107565 SHA256 8bb5c412b55cafc4e4ecc85ccdafb1858fdd2f2b9425a5eead8ce19d5183fa2a SHA512 ee28fe2617d42e9e5b31d89ff6002d1d274bec5de61395abe3cd3c5e64c8297d67a56efeb75d21b3b506fe5f44c45a7584b22ee149ede70a1c9d2d2df8f8a14c WHIRLPOOL 848ad56daea7134253266a7d7aa1155228513bb0c9def64709a8daab5e59116c18530500384317f3cf75c453e4d27e4d84e6e9a154149d04820972b8f766dacf
-DIST Chameleon-2.13.tar.gz 206575 SHA256 dd9311c14ef1fe7149c5123d5eb1691ac7fb5564f216d65fd2243d7349c687c4 SHA512 4ae9df93704bc87a76397aa876d1cd3ce33958b5ec6fa45bf9b73ac976cda83c91dcc3b7c7a88a791912af6d6d14f896657bcd7f879c49c749ee66eaabed3f68 WHIRLPOOL 7ecac9dbaa0de854e4736549f51832a4ff981d804dfc0331177fe0b299f75c9a9fa7f66bea5e9a4009588e72d5f5ba8e618c8495454e3f2ea711cc9d1ba9a5fc
-DIST Chameleon-2.14.tar.gz 200001 SHA256 47c35aed92f03a998587dd3131dcfc7d5b3da5d2ca12b88055a430c210aa53f8 SHA512 5de6d69285c7176611ad683b9e3210faed6fe7e035ca637e6f4de0b85fdf5afde3799f6bac67e13af1bae9ca13d024e4fe532e1d104d225874ebce486187f197 WHIRLPOOL 0b28c3ccedff2fb9da3a1b5a26c2f6a1902e14bd593327e4ef614084f4ce7ff4bad3dd1aaf6d114370fffbc8eae90ec3db794f70428971c4f48aba402b286a8d
-DIST Chameleon-2.15.tar.gz 200261 SHA256 bd1dfc96742c2a5b0b2adcab823bdd848e70c45a994dc4e51dd2cc31e2bae3be SHA512 2ee8c721632b5666c72a70c542a160ede841ca4af7163e99f865fc35dfa368055b8f7ab88da6128c1e737866da9a9b78f60d0c93f828125c6bf4e04377f2af26 WHIRLPOOL bd19d0a8e4144c2fbb862087c07a72b69b3264f3478bba8515ee18439cc2e51327035778362373f49a90cf62dfb09385f1bab927d12e6e212bed92a5ca9e0592
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Chameleon-2.16.tar.gz 200838 SHA256 87c82d657fbc1b47decbe605a6f6105d9190cb19e924b59262cfdfa03e7a512d SHA512 a6f1491a11e55231ed5304b297d749dd590f1d0340732e00d20e4af1b311df297df2a72cc79f0e4949e5ac00acb9dec29dcb50423facb2b3bcff6ad3d1d75350 WHIRLPOOL 7ed76fbb05f3c413d86f42b45ef73d5b333718031434273e512db43eae69900abfee7b10deff78f360131d50a1093e22786ca01b8eb5984ac5ac5330ba1f7eb1
-DIST Chameleon-2.8.3.tar.gz 148662 SHA256 273811890999a5fee966298192311cc57f15b594d0fe370009df5d48d3e56a2b SHA512 627470f93c7be844f4dacebf2213cb27c9d5deba1dd49cc244b4df6c0118d2604b395f1b040352de90169841cff862c22b4ae31dd835537906e4a30ad4543b09 WHIRLPOOL 875267f4763e3cdfdb79a11fb045591d88e0453af944ce6b48a9c7573a9697d1b5bf22440612bc93475dc5e0f7ee4f29fa674defa99ead0abb04ffff2db4e7bb
-DIST Chameleon-2.9.2.tar.gz 151036 SHA256 92ff7b6bef0655033005257200d05dfa35a124c5b0b8e0a1ddde339d84668be0 SHA512 120486f72cf3b363fe7fdacd059e969604bb7fe6854ad786aa67afcc5934e86f7fb02259fa4af39f35f305f2259fe575361b9a92791bf2e6952954f0799d1ea8 WHIRLPOOL 891c9b1c64f502b92778e93eb68c7a009b2709aba3e2a00cf52f02b39f99bb4c58c51f27d7f9b538303f1fc19944de591309821a485756c32db67c48ee08a6be
-EBUILD chameleon-2.10.ebuild 1432 SHA256 5576fddbd472f01aae7659767e4f40ab87c6858057dcf506488f2d97d346de63 SHA512 838119d6a42a1d4adaf39e4d53eb54f27f86d68c098062b5db495744fadcdd9efc2a3711f3dfaede156bac90362ef1ca75aabf0da747a922f4f063b529980904 WHIRLPOOL d542cb514f340311195504aa627370c78e0aeb31d63f74609a23cce1063b183e6a856b1cfb2d46d513710301105d60a26a0a813e3d67ab48ffaffaab03ce43cb
-EBUILD chameleon-2.11-r1.ebuild 1008 SHA256 58d99d5c6dd28b4dac75e4368fc5c640f76bddc41a462660b5e90728b6f8fed3 SHA512 4d79367c8b7e5378b5efbe061a9a5984bf61f0579a5f8e16b20acc128074f9c3815c9543dbe27f7bdadb2509d162194850a81e490b79fef99146c5acaa3ad6ed WHIRLPOOL 0ad52b824e7d11a1baf0e0c6330cdf8a29550101cbea904f18690a9ef208b19dd7bc60bee29654e03cd5d40a3c01db9a2c1175cdafea3235e02b2add9eddd3ea
-EBUILD chameleon-2.11.ebuild 1432 SHA256 802471f27149406b1a7e9e4e8f5760402f55509fb5d0c738e3654ab16b51db74 SHA512 3e8b2a342aa4626aa482ae7008283053a2a319c8a958e22c371a19e595bfeac9ba0d441eb62b6850eb378cf69e6e3ecab2baa1957c6219148c6aaf234c4167bc WHIRLPOOL 44345551b93c38182f7a0c1dfb7b0a6838f37d56655c6a4ff94dad7b51f29522ca2b6cdc95af00db396c914855add8e9b605f57c4b662140816344bbeca4e35c
-EBUILD chameleon-2.12.ebuild 1005 SHA256 c5bbce7bd7b81d169a2822253a0f4c3b41a5e1ac4b5cce002736c25b83060cab SHA512 8705b279437cebe81d077b4f7deccc6d9b94aff4d6cac0de20ad071551e1ebaef4191e0c59a9ae38f4148b95bc3e35aa51d81c303487322ddc950cf85af22c7f WHIRLPOOL 56ec64526c3766ec41a533605043a915f5fb059464b51efd6277c86065264a7ad3e42441d1c9f0675cc5e2a48ed86b4f0c82d8af886d8cf74c977936be016b22
-EBUILD chameleon-2.13.ebuild 1005 SHA256 6c71f46d959faf59903cb77621211442b3cf6d2dd58ab3b9f352a89bb54ef673 SHA512 152d02f729e7a78cc72d2d23259c77590ba4bef75049d37e7b9d57d451d01d4aa6d47ba717e3c6f1f73d22660ee331fe1eed9bd156d23ad47dc55f54c56639b3 WHIRLPOOL 119650433d42d7ee45c50caaf55acebb355d5517e343b185784f155a3b3accdadd4b77f5394c399e3214622eb6f669b5c294eafaefb5914a07a31c379c0148e4
-EBUILD chameleon-2.14.ebuild 1005 SHA256 95bd3c2f3e8b5032e665e5ac1cd45aa26707dd3a225ff242346357a3204f8bd2 SHA512 cf5d2c04b8bda8c518199699e36e14496ebf5d1ca499d3f3053b6a5716373f671ee99e0d19086f2c2efd6724d46c84945e2d990550cf90c3d9bc34bf01ec7922 WHIRLPOOL 63e08d4499c7b57fbafa021ec0fa1928fbdc5fc689573dd50b8ba4e012e3f3e5f869241d3f33cdd5b8c48671816a116610857b00bb9d04dcd3e97edf7410b25e
-EBUILD chameleon-2.15.ebuild 942 SHA256 f458e05dc2b681dab33777a441b4c53d80c781811452b0433917f64db631826d SHA512 9611ff1d11765a52d014587298cfb9429ae0263f5727893c2c2d04826f91ec5d6c4501b848e414f5842aec2b18c51e400ccd64c10ea30ae1a5f457dfb121b7df WHIRLPOOL cfbcae5885e44eebe4bf64f40d6aa3cbcc0048470b1bd17bd72d3cefbe4130cfb01188100123c61319992e9973483d41c6305d5006af3f379f5a2f799267f389
-EBUILD chameleon-2.16.ebuild 942 SHA256 55089b02d1648c26d3527eda4e7ecd54e05056699e602049a21a4d2edcb183f4 SHA512 af8ce786c1af7e91f1e535427a170cc08de93a4b42e882dd6fcaf11a76a0e9f923e1c04d763e4b3bf7fa47e5a129654d3351d3d4fab9788c113ddec9ef49076d WHIRLPOOL 07373b4d425d440b4205ed9d40dd4530cf98439f174f8c0d100f44b702e2a60c6be395bb30fdf88966a5c2656af1ffa6f27938caa27f42afea674ad91552cb19
-EBUILD chameleon-2.8.3-r1.ebuild 1436 SHA256 dc1054b421019db7af9d270a4e97a33e1422cd76b3a5a8e3fb515394066cd3d8 SHA512 a84877bb4553c24964bd9388f1fbea0e777c56538e660e93d88396479da7a93a833c5a2f44c0059b2d126f11dd4861c42eb1d549d2d3b1f6a7d41c4dd81e188b WHIRLPOOL 0ac22300d0a7bbf0168affb3da0d78710f608d76a3f33b2f3c75d59acdabb15fcf2cdc921422dff32da04331b22e14e8b218ea2064c306eb776f11e79fa41243
-EBUILD chameleon-2.9.2.ebuild 1433 SHA256 0eb6b4d2696bf4802dca92ee0449496c5e1a431eb65d4cd0f1d299aa9dbd7a46 SHA512 05c5f8c82d20b441c1c7f9ce44c43e00eb5a6235dbdcb4bb5423d06e92285626080b0b3c79b199c51e2c79b4cdfeb8dacf6f54ed6e172d4c59034a3193d2f2b4 WHIRLPOOL fdf03ea64a22842df7fcd2c65412727ff7306d53913bfd610f23584ff654c21268c9cbdbc1d771c854e1fcef28a9f09cd04c7dc14cb43d51b5994794ea8cb9a4
-MISC ChangeLog 3748 SHA256 6ba154413db20d38fafebf9209e4658bed9c093b9f7940e1bc67183fdd7aeb55 SHA512 4f9ab30db5d93f196d5638c02bc9f98095cf24642b51153920811675d83b58bbdee3742d5bbcf154758b81c2af7b6a6a1ddcc7d33c3aa43000c9c7cffcc430bb WHIRLPOOL 15c6960a4df3f6cdf05f3981033723cdc8da9d76b11094063db4680b529503fe41f122993082afaa15e54e15be70f1b9e1eefe7cba3877d1c75305fa5dfc8de6
+DIST Chameleon-2.18.tar.gz 201784 SHA256 b1dddb4d6c19c3464dafdc157ce50b7bdc172c9a1a04b8a5d8173d615f2b6885 SHA512 f58a8610f10902082950e35a260f44ea5bdb89c58a1812a411b87379c430efac66b44cb681abf980044494421d35d97865a9b16448b34c3813faaa3b25e348ea WHIRLPOOL e0bba8f3a8d9f826c53dd62b613ae926fc98185b00c32d37a3327c8f4383e3323d1a1cbebc4ac22098618a4ea653f78b6cdfe299e82a21471680ba46bdb24f1d
+EBUILD chameleon-2.16.ebuild 938 SHA256 c6d646de98f589c2d0c6c87b2aadbe00a5c8b5153a23d545d0e326ee4b92daed SHA512 ba0676209bb7f91180c19814b9e12e2c827dccb874d561fe888ab4dd441a76ff43c619ea07b63862ce31b9ae97c584470f2f1735857a926adce08455b08efadf WHIRLPOOL f5ffee4db43bea175ee9e55aa767202b46a37999cfabc2676f3a43b878fec2ead660b71746e5a5846accfd77369bb2e271b71964947f9f01a5620b7e94aa331b
+EBUILD chameleon-2.18.ebuild 944 SHA256 652ccdffd5d8881695635110dbbd8a63ce33e4ed6da3287bad3452b9b0285be9 SHA512 dfee1562fd3623a946d3e60d79541b1c088d1f7af70cc849f4f3e1775e664133b7f35a828bab22530110860d5bfdd8568d4ce29c95e9d29a3d37801b6b1caeb1 WHIRLPOOL 93bc61bd3abf7337235104d170f59c1c92add3dd5fbceb17e68b0dcfad7900907f45df7ac7017571954bd5cf07524241659a7a832289a984707ea3bb898b007c
+MISC ChangeLog 4145 SHA256 123280f22c4db31b13698a35d1eb41f1abdb23c99fbdf7b21671cb8596aa5fa0 SHA512 681efed8b2f4eda85715085a21a03c2968b4a83e22d5d305aa53270dc05a6c4b5d025657567f4492ff39d20858d1934b3827093921d6503917cc49a12629534a WHIRLPOOL 73d3d73a7af2ec2784a1e4ff6da7529e2c2734c72e680e1934f50dc40ec5202dbbdde8fea91e636613279187ab73567700addc6b582e623f4af4acbe154bd7df
 MISC metadata.xml 232 SHA256 c0cac02ffe32edb941fbfe04c5572a09534a29f17eefc8edb585a873eb061a86 SHA512 04c8fe97873a13e1adbb87e0a45fbbed06fc62a4ed817472da405d146e5302d2c5960ad1ea1d127f5938d552a506452a882fe2e54c6a99f8252caf2e18f1a48a WHIRLPOOL 8d6a77e092bcaac34f13e6a160cd065d78c240a9e22b7e10c5240da869e5580ae625327fa1e40b325a4ff5b073e186a77a878d26097712b636b268e1cc9f4ab4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSEERsACgkQso7CE7gHKw3aPgCgqBbqAMtLhAQAz2kF7pXdNPrO
+sccAnR3UTQqxSV2r1/rhtxCW6isXCoSV
+=zKux
+-----END PGP SIGNATURE-----
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
-}