Bump version. Remove older versions.

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 27 insertions, 61 deletions

diff --git a/dev-python/larch/ChangeLog b/dev-python/larch/ChangeLog
index a8db93c29f56..6e9e21c4ee52 100644
--- a/dev-python/larch/ChangeLog
+++ b/dev-python/larch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/larch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/larch/ChangeLog,v 1.5 2013/03/24 12:18:50 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/larch/ChangeLog,v 1.6 2013/08/09 15:12:38 mschiff Exp $
+
+*larch-1.20130808 (09 Aug 2013)
+
+  09 Aug 2013; Marc Schiffbauer <mschiff@gentoo.org> +larch-1.20130808.ebuild,
+  -larch-1.20121006-r1.ebuild, -larch-1.20121216.ebuild:
+  Bump version. Remove older versions.
 
 *larch-1.20130316 (24 Mar 2013)
 
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
index 35493f7802e9..c16d216823c3 100644
--- a/dev-python/larch/Manifest
+++ b/dev-python/larch/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST python-larch_1.20121006.orig.tar.gz 88188 SHA256 b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa SHA512 f82c94f32cdfb434513a2ea11e55c88c6ef4dc6147efc2bc02c62ca2e75da0be8ca35d30c962a0861b0902dcd624daf42432ada4f59d098078a1768284e20dbf WHIRLPOOL b02681e3349e73441f6aeb235b1e30d1427bf8ed94165113ab57dde55ef87a943149c24074f55814c77b0901e5af25a913091fdfaf12ad16ad3f29dc095abbcb
-DIST python-larch_1.20121216.orig.tar.gz 87572 SHA256 43c7c57c6b9564d72e6c7b2b46f8cba54da832c1d5756ba284e14e8e748e9070 SHA512 8676bf38c6ed5af11e3ad4bcfa313eb53ac9b1a298fafea7086251a0da299e44f831de7d13a19ea3fb2e161c09af642b8bb6c3de5daa331a28b13242e6e4815c WHIRLPOOL abe8dbb73b19bd93e9fcfb7a2db4a4d6505bf5710ff18047baa29f0ade1e343e31ff896d60d5d67423fd0e3ff7d61ff89eaa14395d9ac63e10f2205f74ba27fd
 DIST python-larch_1.20130316.orig.tar.gz 88040 SHA256 45081f933201512e536ff631ae280b1c17b9342f4789de366da7fd2681af7bd6 SHA512 f3a962750bc1fb55af775967fd5ae5894b864de4febb749a803dbc8530a3fb053f537039f249b256e9c9eef39b780db081d3a53b5ad93669a0002274ec0cf943 WHIRLPOOL 7df88954696195e91548c9ca29f3a3ff0c6f6e2dd716eb1e29f8d56beb63fa8c9975941b316e2eeb8ae296da955877c00bfdde727dd806e89c4eabd631eb529b
-EBUILD larch-1.20121006-r1.ebuild 867 SHA256 ff6a751bf74d04f433a0508b629e9a9bcc2f08eefb807a855ffa5860e0fec918 SHA512 ffd88430016370697c4613b03aa01acc5993ba7d512e6eee87286142aeea7a422163aa92c1b29bc6a73608159241ca1ff32f27a73a8fc3b36cbb33a49383aaf1 WHIRLPOOL ae323fe6099a664baccd23ddc014fe9963e00054c5b7657ea4439cb2fe4e853f01910ea88137604c4782f1b152fcf648bd44a91e7a28b41fa213206e154e1c33
-EBUILD larch-1.20121216.ebuild 864 SHA256 dba7ed3e99fd42eb7a03c4e9cceb33415e52f7ec40c326eb0229d443630a4d52 SHA512 f02e168ea7272fac1731998d7b2a184be2b237eb112c93da70ca880df432715f011f454bf00e0d4d0e3832f78ec792bfbafadbe0dafa80b1455cef45c08bef68 WHIRLPOOL 8bd09604be07e74aad2c1b6b05bb1acf1c9f326532bffdf12043c322a1526fc611e1a0894ed58b2a2f13cc8edb9a59097cb46007794e489cb1a283cb3dec27b2
+DIST python-larch_1.20130808.orig.tar.gz 88271 SHA256 f64599ebd5247bc79ed69cdc853ae08cc3d0d8648fa7737ad2854854cc843045 SHA512 84bab884e3ff8e27cc43e2520eb10fb7a38d99eddb06b9163e174329d69552e678ef81d606fa041f894794f0ba3bdf59ace3081f71596869e1167a0e23d56c85 WHIRLPOOL ff86df6db0d0dac024ba086e2264028abd74b45f73cae773c5c8a7b91ad9df54ab8f092fa85b277f27f7d17b50391037059624c533e04ef97108751d7c2f3013
 EBUILD larch-1.20130316.ebuild 829 SHA256 b15a40f3b2a0208b11b545ba876c2067885183ff0660663f77505745c22b2f04 SHA512 803c789b451e0b3f8da26718634a2fc08f7f753f43cc8880c95b0d9a04e7c42d2427a1516bb1353d05c5302f01095e709e58ab363b7168e9f03c19b0ce34689f WHIRLPOOL 9857747b3190344fc6bce96bc3e963158d8728534cae0427d6e1ae3084002e6b7727b30481d9d8a5f1acba320df4724a09ca94ea53191e0e1a706980d991eba4
-MISC ChangeLog 999 SHA256 edb46173d939611b0eb547098f4daf1939b2392aef79bfcd28dae8541e228d30 SHA512 495319f6fc02652c85eb7ddcd3caa7f961754435bf696bae43024d9e6e84fe6d62e0f5acad9cb0ef8b2934614bf262e2ab97c776d408f7c4918f5202defdd55a WHIRLPOOL 4b4d4ecf23336d2cd3919cea1f79d7cdc7dbe6265693a1c0bc57df45c55d4e31ec4bc1fb4bd83441d66a97704c5bbad68545a48716afae933b47059ab0df6c4c
+EBUILD larch-1.20130808.ebuild 829 SHA256 f3823213242365e18c11739b762e7b1e80d778b4e348fc6ec710d7e75cfb3e31 SHA512 3ade640a7657c203d92f4b587f65759409d33913e7916f63231eafaa9b9b927ca7be6b4695a7b51bffd43803a7c045fd55465ed71ecb0ab234a7db590079042e WHIRLPOOL 35da53a0ea97025f544958279704dcd411563dd3f808f47d246a901071e3c529b956f908a1e9d878b1f7ac3ef3cce483cb5b8001765fef7312807c6378ae3fdc
+MISC ChangeLog 1208 SHA256 08fcf2f80d78efc7ae033cc6e22851408a95f37ef2aef818edd2edd4302c552f SHA512 d0066b9dc3ef98fa506456f6e6d415a0ef3b91ec35459a091bfaf64f7bdfd09b45a1e108a846eaa082a3e29a4fd17dceca4f08da4db619465b95ca7298a22e9c WHIRLPOOL f0e76c270492f8452d98918dda914bd913fcb31eb368cc34df6700c503bf07100d80e1de6ac621c5e8816000250f1f84cc562b0459f66312156f82321016b4b6
 MISC metadata.xml 236 SHA256 f55443c9b3d97fcc9437b9aeba1b3beae39e38599620bd520d0693bb8948b531 SHA512 842ec0962624e280c2c3909e6da541cdaf35532f0f00d76cc9ca0e03dfb8c3dc83a426ae370bc37d73d0c4b1fdd4983171a0586220546b967afe3a3f5dd78ce4 WHIRLPOOL 8ee0a6397a1bae24973eba9b31e1ac64bac9726ca45e5f2127a3ffc991627479030060c605c7cf0957891c184f5e5d01fb2387f94c3a68693c988e4a180c7260
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iD8DBQFRTu8rKWxsyjWmQTQRCKeHAKCxTauGS8Bt5ns2197dmGsLpjtQYACdHeFY
-vKgLAEJWTIafzRNgOL8wGNY=
-=bzoI
+iD8DBQFSBQbqKWxsyjWmQTQRCFfxAJ0Rj//mp6lQneNh4QkiGlfZ/PKPowCgl8FU
+O7h2cUPLVkRE1SM3ZAzvEdo=
+=Recz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/larch/larch-1.20121006-r1.ebuild b/dev-python/larch/larch-1.20121006-r1.ebuild
deleted file mode 100644
index eef4163eec02..000000000000
--- a/dev-python/larch/larch-1.20121006-r1.ebuild
+++ /dev/null
@@ -1,37 +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/larch/larch-1.20121006-r1.ebuild,v 1.1 2012/10/07 00:40:09 mschiff Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6:2.7"
-
-inherit distutils python
-
-DESCRIPTION="Copy-on-write B-tree data structure"
-HOMEPAGE="http://liw.fi/larch/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-#RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
-
-RDEPEND="dev-python/cliapp
-	dev-python/tracing
-	dev-python/ttystatus"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_test() {
-	# remove build directory so tests will not fail
-	# due to tests defined twice
-	rm -rf "${S}"/build
-	default
-}
diff --git a/dev-python/larch/larch-1.20121216.ebuild b/dev-python/larch/larch-1.20130808.ebuild
index 99866e202cc8..9486ebe23ea7 100644
--- a/dev-python/larch/larch-1.20121216.ebuild
+++ b/dev-python/larch/larch-1.20130808.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/larch/larch-1.20121216.ebuild,v 1.1 2012/12/18 15:40:27 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/larch/larch-1.20130808.ebuild,v 1.1 2013/08/09 15:12:38 mschiff Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2:2.6:2.7"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils python
+inherit distutils-r1
 
 DESCRIPTION="Copy-on-write B-tree data structure"
 HOMEPAGE="http://liw.fi/larch/"
@@ -20,18 +20,17 @@ IUSE="test"
 
 DEPEND="test? ( dev-python/CoverageTestRunner dev-util/cmdtest )"
 
-RDEPEND="dev-python/cliapp
+RDEPEND="${PYTHON_DEPS}
+	dev-python/cliapp
 	dev-python/tracing
 	dev-python/ttystatus"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+src_test() {
+	addwrite /proc/self/comm
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
 }
 
-src_test() {
-	# remove build directory so tests will not fail
-	# due to tests defined twice
-	rm -rf "${S}"/build
-	default
+python_test() {
+	emake check
 }