revbump; conversion -> distutils-r1, rm old

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

5 files changed, 57 insertions, 164 deletions

diff --git a/dev-python/guppy/ChangeLog b/dev-python/guppy/ChangeLog
index 42e53ef17029..ee0c23396c48 100644
--- a/dev-python/guppy/ChangeLog
+++ b/dev-python/guppy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/guppy
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/ChangeLog,v 1.19 2013/06/03 16:55:35 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/ChangeLog,v 1.20 2014/12/30 12:31:18 idella4 Exp $
+
+*guppy-0.1.10-r1 (30 Dec 2014)
+
+  30 Dec 2014; Ian Delaney <idella4@gentoo.org> +guppy-0.1.10-r1.ebuild,
+  -guppy-0.1.10.ebuild, -guppy-0.1.9-r2.ebuild, -guppy-0.1.9.ebuild:
+  revbump; conversion -> distutils-r1, rm old
 
   03 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> guppy-0.1.10.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..c7a266644fac
--- /dev/null
+++ b/dev-python/guppy/guppy-0.1.10-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.10-r1.ebuild,v 1.1 2014/12/30 12:31:18 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Guppy-PE -- A Python Programming Environment"
+HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.9-rm_BrokenTests.patch )
+
+python_prepare_all() {
+	sed -e 's:_PyLong_AsScaledDouble:_PyLong_Frexp:' -i src/sets/bitset.c || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	"${PYTHON}" setup.py build install --home="${T}/test-${EPYTHON}" \
+		|| die "Installation of tests failed"
+	pushd "${T}/test-${EPYTHON}/lib/python" > /dev/null
+	"${PYTHON}" guppy/heapy/test/test_all.py ||  die "tests failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	# leave the html docs for install as the setup.py dictates but rm if set by IUSE doc
+	if use doc; then
+		local HTML_DOCS=( guppy/doc/. )
+		find "${D}$(python_get_sitedir)" -name doc | xargs rm -rf
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/guppy/guppy-0.1.10.ebuild b/dev-python/guppy/guppy-0.1.10.ebuild
deleted file mode 100644
index 2a9703b8b005..000000000000
--- a/dev-python/guppy/guppy-0.1.10.ebuild
+++ /dev/null
@@ -1,58 +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/guppy/guppy-0.1.10.ebuild,v 1.2 2013/06/03 16:55:35 bicatali Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.[56]"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="ANNOUNCE ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1.9-rm_BrokenTests.patch
-	distutils_src_prepare
-	preparation() {
-		if [[ ${PYTHON_ABI} == "2.7" ]]; then
-			sed -e 's:_PyLong_AsScaledDouble:_PyLong_Frexp:' -i src/sets/bitset.c || die
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --home="${T}/test-${PYTHON_ABI}" || die "Installation of tests failed with Python ${PYTHON_ABI}"
-		cd "${T}/test-${PYTHON_ABI}/lib/python"
-		PYTHONPATH="$(ls -d "${BUILDDIR}/build-${PYTHON_ABI}/"lib*):." "$(PYTHON)" guppy/heapy/test/test_all.py || return 1
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	distutils_src_install
-	dohtml guppy/doc/*
-
-	delete_duplicated_documentation() {
-		find "${D}$(python_get_sitedir)" -name '*.html' -o -name '*.jpg' | xargs rm -f
-	}
-	python_execute_function -q delete_duplicated_documentation
-}
diff --git a/dev-python/guppy/guppy-0.1.9-r2.ebuild b/dev-python/guppy/guppy-0.1.9-r2.ebuild
deleted file mode 100644
index 8d0c05d54e22..000000000000
--- a/dev-python/guppy/guppy-0.1.9-r2.ebuild
+++ /dev/null
@@ -1,58 +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/guppy/guppy-0.1.9-r2.ebuild,v 1.3 2012/11/07 12:23:30 idella4 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.[56]"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="ANNOUNCE ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rm_BrokenTests.patch
-	distutils_src_prepare
-	preparation() {
-		if [[ ${PYTHON_ABI} == "2.7" ]]; then
-			sed -e 's:_PyLong_AsScaledDouble:_PyLong_Frexp:' -i src/sets/bitset.c || die
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --home="${T}/test-${PYTHON_ABI}" || die "Installation of tests failed with Python ${PYTHON_ABI}"
-		cd "${T}/test-${PYTHON_ABI}/lib/python"
-		PYTHONPATH="$(ls -d "${BUILDDIR}/build-${PYTHON_ABI}/"lib*):." "$(PYTHON)" guppy/heapy/test/test_all.py || return 1
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	distutils_src_install
-	dohtml guppy/doc/*
-
-	delete_duplicated_documentation() {
-		find "${D}$(python_get_sitedir)" -name '*.html' -o -name '*.jpg' | xargs rm -f
-	}
-	python_execute_function -q delete_duplicated_documentation
-}
diff --git a/dev-python/guppy/guppy-0.1.9.ebuild b/dev-python/guppy/guppy-0.1.9.ebuild
deleted file mode 100644
index edd663e3b76c..000000000000
--- a/dev-python/guppy/guppy-0.1.9.ebuild
+++ /dev/null
@@ -1,46 +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/guppy/guppy-0.1.9.ebuild,v 1.6 2012/02/20 15:18:59 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="ANNOUNCE ChangeLog"
-
-src_test() {
-	testing() {
-		cd "${S}"
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --home="${T}/test-${PYTHON_ABI}" || die "Installation of tests failed with Python ${PYTHON_ABI}"
-		cd "${T}/test-${PYTHON_ABI}/lib/python"
-		PYTHONPATH="$(ls -d "${S}/build-${PYTHON_ABI}/"lib*):." "$(PYTHON)" guppy/heapy/test/test_all.py || return 1
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	dohtml guppy/doc/*
-
-	delete_duplicated_documentation() {
-		find "${D}$(python_get_sitedir)" -name '*.html' -o -name '*.jpg' | xargs rm -f
-	}
-	python_execute_function -q delete_duplicated_documentation
-}