revbump; conversion -> distutils-r1, rm old

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

diff --git a/dev-python/guppy/ChangeLog b/dev-python/guppy/ChangeLog
index 42e53ef17029307802001dea2765cb9407b1f0a5..ee0c23396c48baf5ad372d6816886b4b5aa8d85b 100644 (file)
--- 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/Manifest b/dev-python/guppy/Manifest
index 1267e1069905a2b6312183e546a82bd518e79f79..4508753150c2351a140b657659cf4aeb42adbfba 100644 (file)
--- a/dev-python/guppy/Manifest
+++ b/dev-python/guppy/Manifest
@@ -3,16 +3,13 @@ Hash: SHA256
 
 AUX guppy-0.1.9-rm_BrokenTests.patch 1643 SHA256 b03693bbb82906290213374f6dc89d40018cbac042b042ebb4f2ce71e12e177a SHA512 ad6f5b126c84062a5d29a45f23fdf5d91c63a305bb26d7ef1ac1e5034505c79498c7da393b17a04118762261c0cd74f4360e18b49cf292805896dd1f9294097d WHIRLPOOL aa6b3359beb2d8648c8b95f1f30d18f1a3e1a2dba766ba2ef02c4669e3979164008bb467e20e845ccb465b4947e8f7496967636eb791f8a78ad5b4ed41cb3cd9
 DIST guppy-0.1.10.tar.gz 484906 SHA256 00118c000e451063ea16bb6a3b52632d10960c44c0014553c287dce5c03813df SHA512 ea48fd19d7fe9a24832364599b8843304e95ccd1ccf3a9a475456ba25af2a4be94991dcb61deb854b740c2358d280579e756177236b3c73cb0de100bdf0286ce WHIRLPOOL 81b23d17f66d012865627d3f44edd89e63897d0a5e00b7e98d76d5abed3e4c296a1ab00b7dba32f02f0df7fb460c39c0672d6bc157cd74c478b39a87fb4d199c
-DIST guppy-0.1.9.tar.gz 494828 SHA256 4d64144bbabf9f182202d363adc26c65e1ff9b5a527453c1819456b176075a76 SHA512 c22bb97404b1b704b444400db97ade5f79aebfc0d4fae68d98ff982b70b7a95953e10ccac82cac6cc6eeb3c83af1b8403114ffffcf15accd68bf64ee698a82ed WHIRLPOOL cba83512c3f803be7e7008768f96bfb34d928930c444bc36631549ccf16a816b1a2fd3b9329b3fb0a31fc44122cb73996e8e5014c28ff83363e766f03cd7c426
-EBUILD guppy-0.1.10.ebuild 1706 SHA256 a9b30e8937203060eca7929a3f7d2adbca2a296f6854b90cea6d24bbf258a5bd SHA512 dd6f1ccd20dbeb003fa1005a811e99d39738998b8a3d3368b3a99b155e12b5b9537fa3f6c1075bdf8b747b3486511af67569323966e0a26162adfb6c13b49747 WHIRLPOOL 1e818a9416ec858801e2881caca3272b312e9c7f5596d4f441f6e3e9654dbf560bdd4dedf8dc112d7255dc3315fb47006b6a7ce9fa77eb6905c85eaffe076310
-EBUILD guppy-0.1.9-r2.ebuild 1676 SHA256 03c8c3c5815d52f58574ca0d1ee053644b9e2a5a7988252552fba1521f5793ad SHA512 36b6fe8fe8ee59d6a2b19baf6db4006a861b9d0c541c8a2a8bac4945681a3e7d706a8c1b48e5f136a14bdc9698d8586de660c40b98b1d11aa6ecb62c52d6d1e8 WHIRLPOOL ee066f1c934ded7ef1af515812ff35cecf6668f9c8424d27e67c6133b1f91aa314fa02b16fe9bb13fd6e9023e67423a8a7488583aab40af3cbaedb38b96bea3e
-EBUILD guppy-0.1.9.ebuild 1309 SHA256 6561fb22a580658fa5c64b0268e620341fa4a4a558ebf19f5c6323b656749024 SHA512 bb49d7209a1a92037be78cc9f64d1189a179ca1b146a7ea2fb6bca3e82fa1130e5f234e1669bcb54ebba5e4ee13e3f5e598c45c1cfbf00634fa6bb5b92595e19 WHIRLPOOL d77d0dfb26e811636dde530442bb8e9012aa26b0f1802500f652122bd324fcc26b0d0ac61244334ea330a47350efb6958cc11dd4acc4212e17f6e03b4d00c5ef
-MISC ChangeLog 2790 SHA256 7e41ab4ab788e2dd99838d041548935d5e624409cd7b4fcdb3f4ec1413db93bf SHA512 5a1e17d1b068b6356b3f94e97240f64c8a120a3c96a05ba929abd2eff0e2271aaf22ac0f17362a0e86757aeace2b709d6ee18602e01a30d8473e0bda6abd494b WHIRLPOOL bf8b2777066c5e9efae27aea47670a4b0ea7d572ea2d2279035919f33f7ee11756b6966a8aab1b4ecfb6c125614406c6a41f648fda646ec5763d47b5f2042e8a
+EBUILD guppy-0.1.10-r1.ebuild 1396 SHA256 d63fb5b59feb98a65a293242836cf77c8f3353b73a1f3ac0ff7ff36a52514ee8 SHA512 bb3f6ce85662e554061780214f336110a81ef2b24877fffdf0deaec719d99f7de12494b2a7d4720438b1c51c9f0dd88b8355aef7806e43084af1b8b0ecd6970b WHIRLPOOL 1c735e44c8827710f98d5031425807f661cc47f3fc1723bd9409441e69557f2fe8016959d218e927650a08ae7308d2199633ae91f840bf02c1263631740c7eac
+MISC ChangeLog 3010 SHA256 f316d4e1f634809acad57c97bd3c36ddab0b42f009bf5e5a86de96a48fa27ba5 SHA512 2ae2ef35bcd7467c01bdcb9914ce730665f65287c10a389543e889357da74cffe1d388ebc8a1229a264bf1b1d0cf20b5678000a9b08b130aa62b1a5b4f6d4a87 WHIRLPOOL e8e7620944ad7960a6b3b31a5b99488dcb8767d7c77f76cc67895c31dfbb66b435c345c56f654165b764b8d9470b3fe015f074d79f8c556fd528c07b7431e0f1
 MISC metadata.xml 558 SHA256 a09b69e46d09d05bd5d309d68bdc67e4978fe3ee85e269d87f33da9eabff6350 SHA512 0d2ffbd2068b897aeb9db32ee856af0c13f98a655c19a5dd05c4b7f40b77a290e891c40c8674ffa53a101e9ff075421cdcf6e2e72f6de89930e910fc33b7c8bf WHIRLPOOL e1a0204b813d4767a2d93c01c9ba46a280b451eb338ac73ed14154970149ca1d29b502c0d2c3a0fda7fbd37e140e31d6787c1071cfa416bff9e833d468f6210a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlGsyogACgkQ1ycZbhPLE2AyugCfScALjvtbJQNTN0De/jilmeUo
-mT4AnRRWqTZuW/cGqG0hPC2Gx1CPxhIS
-=Xzg0
+iEYEAREIAAYFAlSimycACgkQso7CE7gHKw0DRgCgmvSMxM3IcLYp1cNIQb0KacB/
+2jYAn3QYIA/28cdMID2MoUWgJ2cVatEr
+=kID4
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..c7a2666
--- /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 (file)
index 2a9703b..0000000
--- 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 (file)
index 8d0c05d..0000000
--- 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 (file)
index edd663e..0000000
--- 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
-}