Bump version. Remove older versions.

(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

3 files changed, 20 insertions, 52 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/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
 }