rebvump; convert -> distutils-r1, clean old impls add py3.4 pypy3 support wrt Bug #530388, rm old

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

4 files changed, 11 insertions, 64 deletions

diff --git a/dev-python/apipkg/ChangeLog b/dev-python/apipkg/ChangeLog
index 563e2ee6a815..4527a2f08266 100644
--- a/dev-python/apipkg/ChangeLog
+++ b/dev-python/apipkg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/apipkg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/ChangeLog,v 1.7 2014/03/31 20:52:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/ChangeLog,v 1.8 2014/12/13 07:13:13 idella4 Exp $
+
+  13 Dec 2014; Ian Delaney <idella4@gentoo.org> -apipkg-1.0.ebuild,
+  -apipkg-1.2.ebuild, apipkg-1.2-r1.ebuild:
+  rebvump; convert -> distutils-r1, clean old impls add py3.4 pypy3 support wrt
+  Bug #530388, rm old
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> apipkg-1.2-r1.ebuild:
   Add support for the new PyPy slotting.
diff --git a/dev-python/apipkg/apipkg-1.0.ebuild b/dev-python/apipkg/apipkg-1.0.ebuild
deleted file mode 100644
index 00c04cd2de91..000000000000
--- a/dev-python/apipkg/apipkg-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.0.ebuild,v 1.1 2010/10/16 20:41:30 arfrever Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="py.test"
-
-inherit distutils
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="apipkg: namespace control and lazy-import mechanism"
-HOMEPAGE="http://pypi.python.org/pypi/apipkg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGELOG README.txt"
-PYTHON_MODNAME="apipkg.py"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable failing test.
-	sed -e "s/test_onfirstaccess_setsnewattr/_&/" -i test_apipkg.py
-}
diff --git a/dev-python/apipkg/apipkg-1.2-r1.ebuild b/dev-python/apipkg/apipkg-1.2-r1.ebuild
index 4c3b6a1f7ac3..1588bdfc13ad 100644
--- a/dev-python/apipkg/apipkg-1.2-r1.ebuild
+++ b/dev-python/apipkg/apipkg-1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.3 2014/03/31 20:52:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.4 2014/12/13 07:13:13 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -21,5 +21,7 @@ DEPEND="app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	# https://bitbucket.org/hpk42/apipkg/issue/5/test-failure-with-python-34
+	# Bug 530388. The test requires patching to match py3.4; trivial.
+	py.test || die "Tests fail under ${EPYTHON}"
 }
diff --git a/dev-python/apipkg/apipkg-1.2.ebuild b/dev-python/apipkg/apipkg-1.2.ebuild
deleted file mode 100644
index bafd96d186ee..000000000000
--- a/dev-python/apipkg/apipkg-1.2.ebuild
+++ /dev/null
@@ -1,25 +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/apipkg/apipkg-1.2.ebuild,v 1.2 2012/06/19 17:44:19 xarthisius Exp $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST=py.test
-
-inherit distutils
-
-DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="http://pypi.python.org/pypi/apipkg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools"
-RDEPEND=""
-
-DOCS="CHANGELOG README.txt"
-PYTHON_MODNAME=${PN}.py