From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 8 Jan 2015 12:53:16 +0000 (+0000)
Subject: sci-libs/Shapely: Drop obsolete python ABIs
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a823a916603f7d2ba2c1a5d09f2e2b081fba580;p=gentoo.git

sci-libs/Shapely: Drop obsolete python ABIs

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---

diff --git a/sci-libs/Shapely/ChangeLog b/sci-libs/Shapely/ChangeLog
index 96135078f37f..ec065f7a331b 100644
--- a/sci-libs/Shapely/ChangeLog
+++ b/sci-libs/Shapely/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/Shapely
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/ChangeLog,v 1.4 2014/11/28 14:55:57 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/ChangeLog,v 1.5 2015/01/08 12:53:15 jlec Exp $
+
+  08 Jan 2015; Justin Lecher <jlec@gentoo.org> Shapely-1.3.0.ebuild,
+  Shapely-1.3.2.ebuild, Shapely-9999.ebuild:
+  Drop obsolete python ABIs
 
   28 Nov 2014; Pacho Ramos <pacho@gentoo.org> Shapely-1.3.2.ebuild,
   Shapely-9999.ebuild:
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 2fd56735f0f6..c9b5a1775f46 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX setup_unicode.patch 698 SHA256 507d6fb5a65ceeceb788c1a17efc96cd34fbd5912c2ddb37f606ffab2dc3d927 SHA512 f3e2766a1da5586a5c534d4e2eae1a00545d5af90e0f7ce92d2a1e38644f07b6db90c7ab20742d390e79198b6d5957900a7cd6777515a773fab2f1f98e09c8dd WHIRLPOOL fdf1f6badda690465169a9f7a660f78fec54b94ea60f36ab33bc7d529223df9f3d894607754c6659fefb1702c1bc73412c33961ccb7367782c3bd0105f4e2924
 DIST Shapely-1.3.0.tar.gz 118863 SHA256 297df004aec27e38ed93987e93ff5f8187cd0299394fe8b0b9028566015a9bb5 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82 WHIRLPOOL ddf42cab233b0950a4a955070c5a2a7791a7f259ba857778689944c7799484f7c1aa710926c37c8c66deaae5ab4f03d79fa2f407e8e6d05238217b529e7b1b15
 DIST Shapely-1.3.2.tar.gz 120179 SHA256 9f0de51c71373fcee4962f79f4813d67ea1e711f4394d7636c929a4019c5c2ff SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d WHIRLPOOL 37836bd5597e485fe4ac8bb0994724fd7cde59bc2d57becd0e89547c0b561d147ff9bea3d99b1429c8a163538a7af7deb8416a4e5dfb8c9f7dff5322e81b2fb6
-EBUILD Shapely-1.3.0.ebuild 877 SHA256 e884d1e084ecca3c8f536045f52099ae5e8dba12874b3055ffd56cd570132094 SHA512 28c538d4a2696f2dda6c3264f455345d1ee9238d8137fba0e05f458fd7f19cb56a515369acb5b6e32463531a1256bda5545ea4e845578bbac98ad4766ee6125e WHIRLPOOL f7c612baf7e88482dce9caf00c73dbe1d472d0a864c744cdb9308a21f142ed04fb96d36398bbd8ab73cf8c78001f8e6a0408e9bb1dc501011953cc6b76ba4f33
-EBUILD Shapely-1.3.2.ebuild 882 SHA256 33fdf9272d01f971ec410d4f098d1b6c555a6fd7f8cf4a16c2068b6be16af8ee SHA512 d7fb1ca38554831c38a8129a29f6ebfcc176194a886166bbd22c98127675f8e089fd389db5e9f16867692bc88fde8f96931443b0855a9c9c76f22a21efe47d43 WHIRLPOOL 558d388c6313679d14b290dee46d6ac93a61d9f2093082cb02923f596b49323889c96eab7e713484acdbbe7db6ad51e7f767543d9447404f64595f99f6a1c263
-EBUILD Shapely-9999.ebuild 819 SHA256 07a58e0fbbc8db19675d3e46d2b4422b59a39d36180a4d2963e44acaa22a81c4 SHA512 28ba7c4918e585c75a45e36cacc9892f0dd0848ea67597bb036cbf23dd4d3f23cd879b6674ed8d425fa3a1d7c97e8feb6a0c77d293a6bbacca87409655a85bff WHIRLPOOL 2624b81eba6bd41fd433c561ba4e6beb71fcbea1bfcef630c0f6b5856d8e203e149dfa91cdfce299c8f413e34272b17bab370efdbe77e37b66fe2a2c07f06f2d
-MISC ChangeLog 733 SHA256 d18894cd73ac3d033e7ca45b8e379cad0ef84dcfd7c28507841ba6965c729e5f SHA512 6b05636f7df47495cedce5440d571b9ccc6a8cc9f599d350d278a4efe58cbb46aee672d885461965ac7ed6267e1d2b4416e0381cc1e31ba9a1c8943cec358fc2 WHIRLPOOL 32e925db1035375563683ab283c0796846ba3acc7182499dd48b19d9b9df608cfce9838cb64a35d13cbde22d02787da8ec317279bb13b4990bdbb524cf6098e5
+EBUILD Shapely-1.3.0.ebuild 747 SHA256 92df6f6c93e98d6ec0b488515663e05b92572e9ac24932d6d2a920ec8ac21676 SHA512 ddd5b5887f5a55d3a7181df4d218b961e8490eab29cba12e37f8aaccff28bd26b675f14dd34c44650b1f664ecf9999788ffb613e19d1b30d9f22249f6d0aa79a WHIRLPOOL 6f761dc58be17e07fe56df94f36480324024b11573d249bedcd50671749f979a7e094df797ba25070de21041a158a91060a42dcd3c16f99f434ded0ab965ed91
+EBUILD Shapely-1.3.2.ebuild 748 SHA256 82283e7e81c2cc294bb43864f6b975ef91650cddb742a4230314f0e39cf52c27 SHA512 973a1a7daeaf5c2002d7276aece03b3e35bfe0d51610952b441c8bfe2eab3e1557c0747bf05394b13eefe0a09295f11e36e5da4bf078d82e662510e96ff76f0b WHIRLPOOL 70b06444316a7b934e97497061ce37bda3b5c597f5b9d5eafe2f342192efbc0174875b541ee6f52291a56859b127828b7a118eb113c52952cdf8fde56c2d7cdd
+EBUILD Shapely-9999.ebuild 695 SHA256 08a52fcefe2eaffba0ce73d22e37e1b0628fc855e785d15f75317a7b04000f26 SHA512 8bb13d913c2ed3db95d8bff4458818bf71238d6918dc645d93a4bb741021389ea945e478bd6291204d46b01808dd52cc8f97cd19ce8dc7d46083e79d929a8811 WHIRLPOOL c06daeca038a51e9096b5a73bec69be7216617fb92157ce59048154f1462d995f98985437126c0bda592ed392dfa00939d4aa36b9d37be1dd27e6e995a198282
+MISC ChangeLog 875 SHA256 1c7b50c72b439d589ae114fc7c6e0565e4d37ee4da126799bb52eade7ce35829 SHA512 c1b8ac91072b4a5d4877ddb9d23a9004cce320acc9dc581c539505c9b2ccf61c3df62932d0227f922384543006e3c63e57a08bf5be8907275846f7539d956036 WHIRLPOOL 6954b3493a85c0082dd331617601076ce9191f42132d66a9ccd1769e9fc2e597cb3bc7e6bce56329f2e1ee48f4fa5207f3957711deca1f83872ed91161474c14
 MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlR4jP4ACgkQCaWpQKGI+9SkpwCggwkyCZKzVZo2bAkvdtiLY8y5
-TX0AmweQArxMOFWbxGHYT52/EPri/Ha0
-=oVeP
+iQJ8BAEBCgBmBQJUrn28XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirvj4P/io6+iNo2SbPBvq/TzX+2qCQ
+FfgDTQAJhsBqrP3k+Mtz7pukS7kVBlNp+IU1vhst0AiGrxjKiMD/gXHKCDb8lLHG
+JOCTKwiKYPDRvunkV35pP16DnRtY1Sfe9CzSzz/wCCd++ixZy+FqobTE5LoKuABN
+hhW8PFCbvVyFNiZVbNIyuNpxyunTPnzFsxenyYHlitQgSrMtNFyMlX3Hl/3Eh0TD
+/8brgiiQaS6Yb7MxeiWdwoJtOm6EsLacAuPg9kQiQk6NHWBRYcqDkx7dcdtqSxIU
+UwKFlZfRO0TMYPLwVuFx5WRLixJ3pYd2I1oETqm+iiU4gRadQEim1PyOCTBoyqar
+jsxeiJgnyZY/Sn+y8rcogvzbVFPJAMjN0HqPltMhdXJGd6SU/Ll7zwcYm9UpKwTx
+6WRsMIs+urCtawcbJreH93W7yGjdp3xfeMTUFi5CdzDlVovMes1cRog4/ogeVr70
+LgwGFa8QLpbIUdHMEf8lDsx4fS5iyOryG8RIJdJgCnnWviQD87sEBg+D30h1JzSn
+Dr9+kv5qgDt6oeEuBZx9d749pym8cbvR1X6mX0+lGWshrzJdODO3ElckY0tLRzjV
+SnKfVSu/XchjkjOzaKP0J97XhwobR255arGxTJ48COtsHaGeGgJm9630tDvgFM2U
+dIK6ueuj6MxRQm6PQ2JT
+=Ol0k
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
index 6f3eb5bd6350..ef950a23dead 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-1.3.0.ebuild,v 1.2 2014/06/20 09:29:34 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-1.3.0.ebuild,v 1.3 2015/01/08 12:53:15 jlec Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
 HOMEPAGE="https://pypi.python.org/pypi/Shapely"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND=">=sci-libs/geos-3.1"
@@ -29,7 +23,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 src_prepare() {
-	epatch "${FILESDIR}/setup_unicode.patch"
+	epatch "${FILESDIR}"/setup_unicode.patch
 }
 
 python_test() {
diff --git a/sci-libs/Shapely/Shapely-1.3.2.ebuild b/sci-libs/Shapely/Shapely-1.3.2.ebuild
index daba7d0480de..bf9abdc46512 100644
--- a/sci-libs/Shapely/Shapely-1.3.2.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.2.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-1.3.2.ebuild,v 1.2 2014/11/28 14:55:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-1.3.2.ebuild,v 1.3 2015/01/08 12:53:15 jlec Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
 HOMEPAGE="https://pypi.python.org/pypi/Shapely"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND=">=sci-libs/geos-3.1"
diff --git a/sci-libs/Shapely/Shapely-9999.ebuild b/sci-libs/Shapely/Shapely-9999.ebuild
index 77199b85b37d..b9cbee9a338d 100644
--- a/sci-libs/Shapely/Shapely-9999.ebuild
+++ b/sci-libs/Shapely/Shapely-9999.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-9999.ebuild,v 1.2 2014/11/28 14:55:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-9999.ebuild,v 1.3 2015/01/08 12:53:15 jlec Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} )
 
-inherit distutils-r1
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Geometric objects, predicates, and operations"
 HOMEPAGE="https://pypi.python.org/pypi/Shapely"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS=""
 IUSE="test"
 
 RDEPEND=">=sci-libs/geos-3.1"
@@ -30,4 +25,4 @@ DEPEND="${RDEPEND}
 
 python_test() {
 	esetup.py test
-}
\ No newline at end of file
+}