Version bump wrt #525790 by Joseph Booker <joe@neoturbine.net>, drop old

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

4 files changed, 33 insertions, 51 deletions

diff --git a/dev-python/aplpy/ChangeLog b/dev-python/aplpy/ChangeLog
index bce4d881ed87..5d9b7b318045 100644
--- a/dev-python/aplpy/ChangeLog
+++ b/dev-python/aplpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/aplpy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/ChangeLog,v 1.15 2014/01/28 17:53:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/ChangeLog,v 1.16 2014/11/27 18:24:31 xarthisius Exp $
+
+*aplpy-0.9.14 (27 Nov 2014)
+
+  27 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org> +aplpy-0.9.14.ebuild,
+  -aplpy-0.9.11.ebuild, -aplpy-0.9.9.ebuild:
+  Version bump wrt #525790 by Joseph Booker <joe@neoturbine.net>, drop old
 
 *aplpy-0.9.11 (28 Jan 2014)
 
diff --git a/dev-python/aplpy/Manifest b/dev-python/aplpy/Manifest
index f0751a2515f9..881b6d76c5cc 100644
--- a/dev-python/aplpy/Manifest
+++ b/dev-python/aplpy/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST APLpy-0.9.11.tar.gz 690515 SHA256 2be03415c8b74668a40ea44aab7a34aa54c17630e3db05d4603fb343360aeeaa SHA512 a20639d36268629cbf0e463338652f955838b3fe34be9dba86af6a684fcedad25973183b1fc7a1e4ba83c98eb1996ca18860cd0e6af25a62d927c4468f240755 WHIRLPOOL ec179b6f8b80b238f262c482271778c4e9a7f526d6c5eb9ff385acc25aa847810c66e542c63c0d53502ee3d597bfd0f285bb2c37cb0ba601fd5518f6cda3f1d3
-DIST APLpy-0.9.9.tar.gz 689446 SHA256 dc2fa0ec4d0626172df4ba9ca3b0563e11b50230e81c8a52b4d03975eb3241a7 SHA512 5480093e89c0b66ea20a1d042334fcafdedd7a03ff376a96615700c1977339bbcc8c8e68a957adb49bae373140b1ba9bb2087379a8466f676ae2771af58c6b41 WHIRLPOOL 4c6378c7578b14043f67e5d4153a0928032fb7bcea9f78df91601c2bcbb6ed21a6f913c67b752123ad65c203450b4fd0d8321762d59437587af3b22928022e04
-EBUILD aplpy-0.9.11.ebuild 986 SHA256 a0cd2729c28047cadf90757db210e4c3aec3181fd58580c7adac59c50b1a5fb2 SHA512 4dbf2b9d6af3c5853831975e18726bfc0dc87b59d8e517504510dbcdfcbd9ea3c8bb2f01679e0764618a8159ce3d364c0079faa1f132d9a7e6a0bba795ff136f WHIRLPOOL cb68046d79f9eb6a023061fe731776335abc748cc336d73bc052283d4dffc69c29f505651f887639700f9cf35cb78467805a4f7355469a94e5ef7a9dc3dafa47
-EBUILD aplpy-0.9.9.ebuild 985 SHA256 e17311f0b225832476f496e143b13d73128ea4e8f6eedb30f2c4cceaf2c21620 SHA512 6c51d89aad5ab2cc807f84298001dfda177319bb3642465e25e731d6fc8233698ed11c1fe3742683c9511ea55ce63acaf5d3e87343717efe492f286e2cbaf5a1 WHIRLPOOL a72574a315e55b0ccbbfcec40fa6573ebea878c6d7fc8fc40f6a3720123606fa625efb49d178a2b64835dda91f45fa4c37f0bf161233f26fa3392ed7b9480ffd
-MISC ChangeLog 2509 SHA256 136200672edf00eae8550b99cb892d2a3ab414afefdcc05a66212451fa4198e6 SHA512 6a3ed4ee8f663c840272d848b68206ab80faaa554116edaadf141c9a838bfb12ec75cc89508f1fc2eb3315e49f2a37d33e99681d520e7fcd539089da3f5232da WHIRLPOOL 2904a989c8a7f937fbae210726eadee4a1dd64a493afcb6b4b47e5cff5169860945196b7ea0ab7117d9a7d09391fae06483ff69b6dcb4644a28a91b2ef05e469
+DIST APLpy-0.9.14.tar.gz 1095547 SHA256 0313a91523b6a32a40e5b97da55243d5e59722cd8fa2e6642915edd26d464d69 SHA512 9cf12aa30d3c4540c2cc33907be3a12e78247a8880720e4de7e513842ef437f616b2c63a345a63e7a7081676aff56032840dc1528ed10438f7729cf2acb9da9f WHIRLPOOL 55c25aa11065b741e89b1538d96e57974bcb6b80f5708e5ee5f975742f7e04cbfe6df3da7b030c67a54bbcc929eaec46e2d2e34551d8f9e7365e2f2c4d5b3a0d
+EBUILD aplpy-0.9.14.ebuild 1126 SHA256 81a7d7a453035c9070d31115159bd3c4e10a87ba4c26fda82a102567200a0cef SHA512 6a13bd93ea3b56302a332cb2c84e339cc3aa86ec1285c242ab68607fd580fa0cfde267ab97a8a6482c88cae28d39bf2300ee797e5fade9f41ee05d8c6f984fa7 WHIRLPOOL b1ef40875a7edec0cf521f8cb61991d3efcc60c1d32540c0667ee4cd2cd82b5cb94f1b8c9d33d452dfc79e3254cb78102d82132ccfb0865461f3fe9481baecef
+MISC ChangeLog 2737 SHA256 0e9990bd7abe0384ab4026be9071ea1e24f341bb1a26ca431243ae7a99a3d81a SHA512 2b553ee5b687ae646dc476d58a83968cce5ce76cbc3f22dc38a1a5a8a49b373167f47ddd6fb6821b5471f2de6a94434d761c1ae57f96bfb1caf937b4c9a6ec74 WHIRLPOOL 29c4cb6364659df5297e52824e357180630df732a9b06edfd91f69760b375147019c4235bf4499bbb4ed22bccc8694876b10e584f1899847153a6d0eacad7877
 MISC metadata.xml 585 SHA256 179edc4f6c2a4049443f769e1d450c8b2e2200ac590ae32d932d41ad9682d70b SHA512 9459b840464ec05b2f54fd4ad0c80a81907f86ce6e16795cbe12952347a30bb228ee3c85d0185e12e6b4c668fb81dd99c8062ee6e33708a1f9eb191e6604174c WHIRLPOOL f9f2bbb18f624f86e441d801184cab1a564cd5ae8a1a95b90b47fae703b707ead1b167a127a33b959cdc9e3834f83849d2461079f1b32b501f3afe0c79e0ec32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlLn7o8ACgkQ1ycZbhPLE2DC0QCgiSclxoZzO62NEgjVh60hidhm
-uvAAnj66d5B4JxzwzJrYuEk1G19ORbSD
-=EdmP
+iQIcBAEBCAAGBQJUd2xtAAoJEF0huFKJUZL5Vh0P/1YkijVsozVzLrF9jQ+vMMsj
+xsb7DzL+9KlUQijL5IEeWRawkF86OCJ2xF5haK9lFcB8dFwr/QzPvfjcF5YxjFyk
+lvqGSneLiiswoKkL/sJ9AY0nldpa9AFy4IxSNTFleKV/sG8oEwwejenTHZI5+X9t
+kD6h2lUBRvwjZeJcLAa/HDED/2SG4Bmcz4SKOPXBoJkGmKY2ty0/QhgHIxWpyaMM
+1aOawaICrFauvbi/SA4i8Va9tG9g0QQlh6iJ3g9/tAHCyxx6+mKHl1O+S8SeygPT
+fjbI8+4lgzbt/zRSjaWa7TZUwVj8XdO0Ltw+kJ8et/ZN3Y/HSA3mFv8+0CY+3l/0
+oDbrEVjw0Zzg5n+LmZ0j+ItcU3ggrjTs0FKoJhMizSZjirUsxtv6ogwEY/k0Segn
+NBn5bU6TT3vNTgK1bhgW9xt+OIwShHTKSbp942F4Y1hHI3xlKjEvfYNr49Gu/upq
+J4eWAELxRQWgsIfL+sgq9RmOMHq3EG1AtZ0E8nHgiFW8RYE9x0OIs5jmb03y1ogR
+/qn+0lj66nIMCOiXFDEYIxqZHqpK1WJ0jJEXr8xbqx14jkjmpzi0DuuOiro43SHo
+9NSCWwaxbFDrE/wR0/7uPM3t5ME3d1Z4M74yR1Rp5LZJ5oC3aGUwpsnqNAByKwN3
+b/ha/kT5Nk04mjxtNPbF
+=Eg9I
 -----END PGP SIGNATURE-----
diff --git a/dev-python/aplpy/aplpy-0.9.11.ebuild b/dev-python/aplpy/aplpy-0.9.14.ebuild
index b97ac9acb4bd..666a4d27d208 100644
--- a/dev-python/aplpy/aplpy-0.9.11.ebuild
+++ b/dev-python/aplpy/aplpy-0.9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.11.ebuild,v 1.1 2014/01/28 17:53:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/aplpy/aplpy-0.9.14.ebuild,v 1.1 2014/11/27 18:24:31 xarthisius Exp $
 
 EAPI=5
 
@@ -21,14 +21,20 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/astropy-0.2[${PYTHON_USEDEP}]
+	dev-python/astropy[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/pyavm[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MYP}"
+S=${WORKDIR}/${MYP}
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' \
+		-i setup.py || die "Removing ah_bootstrap failed"
+	distutils-r1_python_prepare_all
+}
 
 python_test() {
 	distutils_install_for_testing
diff --git a/dev-python/aplpy/aplpy-0.9.9.ebuild b/dev-python/aplpy/aplpy-0.9.9.ebuild
deleted file mode 100644
index c60c62bac7a6..000000000000
--- a/dev-python/aplpy/aplpy-0.9.9.ebuild
+++ /dev/null
@@ -1,38 +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/aplpy/aplpy-0.9.9.ebuild,v 1.2 2013/06/18 16:13:56 bicatali Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MYPN=APLpy
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Astronomical Plotting Library in Python"
-HOMEPAGE="http://aplpy.github.com/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/astropy-0.2[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyavm[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die
-	"${EPYTHON}" -c "import aplpy, sys;r = aplpy.test();sys.exit(r)" \
-		|| die "tests fail with ${EPYTHON}"
-}