clean old impl, add pypy3, add new dep for tests, tm old

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

5 files changed, 20 insertions, 129 deletions

diff --git a/dev-python/colander/ChangeLog b/dev-python/colander/ChangeLog
index 19e2526d64ed..2fe462cb75c5 100644
--- a/dev-python/colander/ChangeLog
+++ b/dev-python/colander/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/colander
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.12 2014/08/21 01:30:14 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.13 2014/12/07 10:45:49 idella4 Exp $
+
+*colander-1.0 (07 Dec 2014)
+
+  07 Dec 2014; Ian Delaney <idella4@gentoo.org> +colander-1.0.ebuild,
+  -colander-1.0_alpha1-r1.ebuild, -colander-1.0_alpha1.ebuild,
+  -colander-1.0_beta1.ebuild:
+  clean old impl, add pypy3, add new dep for tests, tm old
 
 *colander-1.0_beta1 (21 Aug 2014)
 
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
index edcb40510e65..77f62ef8a979 100644
--- a/dev-python/colander/Manifest
+++ b/dev-python/colander/Manifest
@@ -4,20 +4,17 @@ Hash: SHA256
 DIST colander-0.9.7.tar.gz 78627 SHA256 0c696341a84476d59f554505afcc1ec3b9c428fcb78ef07ca9996588f57610f0 SHA512 c97617bc699c2add5037fae4679d93d1e950f2bd0ca62fd24ef6ce5e3200405bdf38de9d40977713f51d3790d6a35387de68c0372530ff18fb66bae2701aadcf WHIRLPOOL ef5e8edbeb99aab35e12e7877ac8697af0ad0d81eff4403f2a85269aadedc7e8c7b0171f9d28fa02581e5181d97cdc6ea2eaeededa8c7d0dfc59a90a0e2a3f20
 DIST colander-0.9.8.tar.gz 81956 SHA256 cab9bb0180a68ceffa1273d2ae98864989a0e00611c24371a5ffac8ea8a0e5ec SHA512 48dc995a336dbcb6377038dbd9d9643031315f26b8a35657c3900914813f346da2076990c6a62338bc3e86e83ed829576f3dd50e9adceabd43f7cb7537acf664 WHIRLPOOL fd20290669e09a7097bd5243b5296ff537e74149364cdca55cbc8c0ce33bb042907b98d2eb6febf7fd45f80c440a6ac3f234522e25806d9870e4023d95586bb6
 DIST colander-0.9.9.tar.gz 89432 SHA256 7802a2a73484ebb2b661491213a1ececbc4635d290be6df07879eb0a323b693a SHA512 47a0b751d14105702c65c1528492d167c2fd2b454c9d39ac2b1896e33a835fc5378a42c141cd6cca5daf401b7804117f35436e2b5fe801fa1974789b915187a2 WHIRLPOOL ceccc217f8189283925795ddb8b040a75cf8937c1d30f1fb9283462d31e64ed4c2957e81a75e0fb619f09e9cb05719870a5ebf7d73c295cd142633c1f9c175b4
-DIST colander-1.0a1.tar.gz 104663 SHA256 03bb46587e35bf5d352ec2e3f12b8e7bb2f5d8b1ce035773c7edab42a15843c3 SHA512 6a904b8f27100d557abeeb50a85148e84d5d6229736788e80279688928cac12e9c5a699f3d95a6a90e7251f0a385878f23426fb2469e085ce25287d159df1227 WHIRLPOOL f7aa0707dbb34f119824f2128fe48e9b9576e4434a5b2e71b8005f5b3c58c7627273e03efb8f700f7b884b98b00bf2f0ae9ddc531b962e36dda875a1226a8e7a
-DIST colander-1.0b1.tar.gz 113250 SHA256 8a342bf278227be6ac96e90befa949c235e667254db17e773e79d834459be971 SHA512 f4f0b4541d109ee196d27da73ef836ff4db42b30c9c60d7831c5a28d9d408c294ed5d239c8b98b0a3f996958dcd370f92decda179ff30d1385aeeb659baea7a0 WHIRLPOOL f4469baa1647c4f79f762318e6f93b5dd528a04d85ed9fc8bcaf999ba385eb2e9e3f7e7c7d887703adfd042e5bdd7ea37d0e961402b2aa98a5713874d8f9b275
+DIST colander-1.0.tar.gz 113800 SHA256 7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3 SHA512 f361520a12ebec4271580fe5be002bfbdd38fcd4cfb29fa41b9c37308636343dd25595f2e0bd8099bc96583d25644d2039996efefd9c0060fe39f3c46394a4f7 WHIRLPOOL c1ed492781ab276fc5c6cf7d0ce6a9393981c86ed06c9b113c2e37e01748595e8b5422fa24eaac3d3c2a68cd99f337ea9c65b8f0f536f955e2b9b621101278a5
 EBUILD colander-0.9.7.ebuild 1360 SHA256 2554e39c6c1eff3ef56f22bf85cc0951520f97ff5f4bc2307203bbe1e3ab547f SHA512 a93db6fd48d9d45013175a8b70e9ea0438cfd9353ba597f63b78527ea20dfd4801a18bebefec20fb100d40d32c4f5d66f7110c71cc8812369fc1a4297dc48600 WHIRLPOOL 53295fe787bce285eed3a1b7ffc0b167569e95d8f4fd5cd52aa892f94dd25efdb71760d55e72d6f2d37f974640fed3843a5a32ea30cbff6e515d941901468fbe
 EBUILD colander-0.9.8.ebuild 1458 SHA256 b8103bfbb8068668c6a4135eba52c1123f09e948814f1f5d81b6cfa7be7d8f50 SHA512 d9d7a3811832e0971afc1b5d778c83074e4d99712db142c57b35c9f3834a9d9adfed114e5841c069106d8c92c1cbc09db7805b86db7fea22f3e74ade31efac20 WHIRLPOOL 08dec38777d72462e4e9d877903cea09a4cb0827be4288c322f7b3f412cec5c44cd480a36b567fc90e2652c5764490858d96bc6483ed8b177643d05a0105d712
 EBUILD colander-0.9.9.ebuild 1455 SHA256 f7c63d859712ab51763c62a4e4ed8c150246a52c8546b5ef2a3a4e5653f8e381 SHA512 461b53c435416345cbcf0d9e8979cd6bb566802481ed3c0b4410b2d1f1834a7266683767be698cccda4a29d5989c1e2f74ef9d29a406d99e7311da1d869c55f2 WHIRLPOOL 231435c93589f95ba89087defaf0f23772e5f40a66991933ab34f93ebfd3750a17de619d21d9975328d0d0c951b2cb3d3ef6f9f307854abb199f78d07f47fd51
-EBUILD colander-1.0_alpha1-r1.ebuild 1572 SHA256 0b83a5ab11a2e028f94186e1b985b9118cae2d359c8bb9b347e752c299cd5162 SHA512 d36a853be63b075afb8f69f00e09db0d1e826a2b8c12999cf49350f6bc22f09818148deece3740cb8cb970288a56a81834ec46d5a12816589929a1e678e7daee WHIRLPOOL cfb0127dc8945ce141228b200fced362631a009f4bcdb5165203272b7ad85588dbc07922581259c1e8efbd17bd241d5b41424074ab16a2aa3489b8dff89cb050
-EBUILD colander-1.0_alpha1.ebuild 1508 SHA256 54083d8d3fde0cb063724a39ea101ed0f58eff348f29d53b8ac95d175b4fd74a SHA512 8f6435b8916c502734bda2c7e0811e6ee064bb24ab6a025df93b9976716234baa29b1937c6041bb1cf0e7664da97b09ab102f37291b68f1c33f9fa56c9c16e0c WHIRLPOOL d2c41e05ee5f78972cab9a4409677ed6004405488ec2b701e7e5ccf6516e0e698b43ec3ba8374ef9c22d9bdb7b589b1eeb5f0b3d92c0c782cc3890c3be073b18
-EBUILD colander-1.0_beta1.ebuild 1610 SHA256 f871850fd5bc2307f5475e6fcb55665130ab83032c1b78bc1d6ef4d6f7209660 SHA512 a58780da36ed2ff6b85e9700277003adffae3da600fd9588062210e767fda193ddb1f6fe6d525e9a85561d07583dd063baf4a0cf0b6549a7d01fd49c986b1d40 WHIRLPOOL df6b163a319ddf89643f673a777f046904896736e42926535c3f68ac33821dabe989ee99d81b10bdbd64f20a0b86c2e99a0da0484833bd043dbd26661ef7e958
-MISC ChangeLog 1909 SHA256 8851c2127a7344b494ec5f429928b3e7d66fb35f3becbae3ecd3fbac0d9984b4 SHA512 252e12e6ed183014f23a11001af1bf60bd3eb09557c00afcdf84327dd986bdeb223ccfef94f256daf65324e4b3d0d4ea9f67d3beff18243214e7df7b99448e5e WHIRLPOOL 2a1cd8686bafa3e3d63fca4b7847cc2877e1ff0588306ade73f1fe4cfe3a656d85254f5a96384bbc2b9a3de3dfe34ec594ab98a9867cff84ca1ad893c6325860
+EBUILD colander-1.0.ebuild 1645 SHA256 743452fddb5de19622ee4de45d9f7a5531230021840a18f51787c0272f138e57 SHA512 dd360bd6c59c0425bd71ff3959f24a6de2b0784263b33bf914a4c95d866f1f40ad1aef2fd2ccba139ee445fdb6fa0cf0702e927ceaba7eeafe89cec949bb4b2c WHIRLPOOL 26d706e31e45b8366e32b87c0e6430741460e7806d261e1768cd720f4370d1b111d6187866791976ae2aba09af2011da7ddb4da7079fcaf2d4d579b728d768ec
+MISC ChangeLog 2161 SHA256 b43c264fc9faf76f2620d5095583c63a9bd9f0dea541d2f6d91db2b8af06faf9 SHA512 8c2cf39f47d7c496b1388636529d7aeef88f378dd739d293c78050b4c820fc44e3d17969d8f466e147c38b4f5bbe8f12a17b06047eff2d7eb964b73939101a25 WHIRLPOOL 78981ceba8280277f4a246468271596d89f89d71081ce7e5af9c87601f54d0d1f0c5626f1ace56e792d95a1a58e61cf572507f8bc2916be6276869b72dd19c30
 MISC metadata.xml 231 SHA256 a6a4ee88a3c163358067d24563e0339eb2a3258219bbfd25cb1c5c1dd3d95ff1 SHA512 2afacceeede1f4185dfd7215c333b8ff689844074c5758fc4d97810abee723420b753bcf6f5055d62c1b27072b6397482decd6635cd13fa57cbb3b0f033a864a WHIRLPOOL 393675e93a6b6168574078b604a4b1a0f74bd343ae4ae0a51be9735224e9e5d33d8a3e73200e42fefd0c0ac77e27394919c3ea8d2796b8c82be296c7134536a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlP1SZQACgkQso7CE7gHKw1+2QCg4M/w4fey1kctNZDwUDT9XCnC
-+lQAniVtAlR7a5bdzxOCxOovN7Fzhfls
-=9NBE
+iEYEAREIAAYFAlSEL+wACgkQso7CE7gHKw2bYgCgh0trLk4+huh39or6K/6E2y8M
+NaAAn0h2Ul2oBIW/G1GJ2IM2vl8IMvji
+=nf46
 -----END PGP SIGNATURE-----
diff --git a/dev-python/colander/colander-1.0_beta1.ebuild b/dev-python/colander/colander-1.0.ebuild
index 42b4a9577e9e..db5d9ad2bbf8 100644
--- a/dev-python/colander/colander-1.0_beta1.ebuild
+++ b/dev-python/colander/colander-1.0.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/colander/colander-1.0_beta1.ebuild,v 1.1 2014/08/21 01:30:14 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-1.0.ebuild,v 1.1 2014/12/07 10:45:49 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
 
@@ -27,10 +27,11 @@ RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}] )"
 
 # Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
+DOCS=( CHANGES.rst COPYRIGHT.txt README.rst )
 
 python_prepare_all() {
 	# Remove pylons theme since it's not included in source
diff --git a/dev-python/colander/colander-1.0_alpha1-r1.ebuild b/dev-python/colander/colander-1.0_alpha1-r1.ebuild
deleted file mode 100644
index be045d486686..000000000000
--- a/dev-python/colander/colander-1.0_alpha1-r1.ebuild
+++ /dev/null
@@ -1,55 +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/colander/colander-1.0_alpha1-r1.ebuild,v 1.2 2014/03/31 20:50:55 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander"
-MY_P=${P/_alpha1/a1}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
-
-python_prepare_all() {
-	# Remove pylons theme since it's not included in source
-	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		# https://github.com/Pylons/colander/issues/38
-		emake -C docs html SPHINXOPTS=""
-	fi
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/colander/colander-1.0_alpha1.ebuild b/dev-python/colander/colander-1.0_alpha1.ebuild
deleted file mode 100644
index 9e6fa105fa0e..000000000000
--- a/dev-python/colander/colander-1.0_alpha1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-1.0_alpha1.ebuild,v 1.1 2013/01/22 07:01:30 patrick Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander"
-MY_P=${P/_alpha1/a1}
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Remove pylons theme since it's not included in source
-	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		# https://github.com/Pylons/colander/issues/38
-		PYTHONPATH="." emake -C docs html SPHINXOPTS=""
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}