Drop old; fix eclass usage

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

6 files changed, 52 insertions, 132 deletions

diff --git a/sci-libs/Fiona/ChangeLog b/sci-libs/Fiona/ChangeLog
index a75d26afee13..c3d6af257edc 100644
--- a/sci-libs/Fiona/ChangeLog
+++ b/sci-libs/Fiona/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/Fiona
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/ChangeLog,v 1.12 2015/06/04 10:57:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/ChangeLog,v 1.13 2015/06/04 11:05:28 jlec Exp $
+
+  04 Jun 2015; Justin Lecher <jlec@gentoo.org> -Fiona-1.1.6.ebuild,
+  -Fiona-1.4.1.ebuild, Fiona-1.5.1.ebuild, Fiona-9999.ebuild:
+  Drop old; fix eclass usage
 
   04 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/sci-libs/Fiona/Fiona-1.1.6.ebuild b/sci-libs/Fiona/Fiona-1.1.6.ebuild
deleted file mode 100644
index 9c840193b9c6..000000000000
--- a/sci-libs/Fiona/Fiona-1.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.1.6.ebuild,v 1.4 2015/04/03 12:41:25 jlec Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=sci-libs/gdal-1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		)
-	"
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Fiona/Fiona-1.4.1.ebuild b/sci-libs/Fiona/Fiona-1.4.1.ebuild
deleted file mode 100644
index 4ec3962bdd8f..000000000000
--- a/sci-libs/Fiona/Fiona-1.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.4.1.ebuild,v 1.4 2015/04/03 12:41:25 jlec Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=sci-libs/gdal-1.8[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/scriptname.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/Fiona/Fiona-1.5.1.ebuild b/sci-libs/Fiona/Fiona-1.5.1.ebuild
index 7e491ca337e7..a918118ae785 100644
--- a/sci-libs/Fiona/Fiona-1.5.1.ebuild
+++ b/sci-libs/Fiona/Fiona-1.5.1.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.5.1.ebuild,v 1.2 2015/04/30 15:00:24 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-1.5.1.ebuild,v 1.3 2015/06/04 11:05:28 jlec Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit distutils-r1
 
-DESCRIPTION="Fiona is OGR's neat, nimble, no-nonsense API"
+DESCRIPTION="OGR's neat, nimble, no-nonsense API"
 HOMEPAGE="https://pypi.python.org/pypi/Fiona"
-
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="BSD"
-SLOT=0
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND=">=sci-libs/gdal-1.8
-	dev-python/click"
+RDEPEND="
+	>=sci-libs/gdal-1.8
+	dev-python/click[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
 
-src_prepare() {
-	epatch "${FILESDIR}/scriptname.patch"
-}
-
-pkg_postinst() {
-	einfo "Fiona script is installed as /usr/bin/Fiona"
-}
+PATCHES=( "${FILESDIR}"/scriptname.patch )
 
 python_test() {
 	esetup.py test
diff --git a/sci-libs/Fiona/Fiona-9999.ebuild b/sci-libs/Fiona/Fiona-9999.ebuild
index 0c24bcfb3fbc..c5f416fe166f 100644
--- a/sci-libs/Fiona/Fiona-9999.ebuild
+++ b/sci-libs/Fiona/Fiona-9999.ebuild
@@ -1,44 +1,35 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-9999.ebuild,v 1.6 2015/04/30 15:13:16 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Fiona/Fiona-9999.ebuild,v 1.7 2015/06/04 11:05:28 jlec Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
 
-inherit distutils-r1
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
-DESCRIPTION="Fiona is OGR's neat, nimble, no-nonsense API"
-HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+inherit distutils-r1 git-r3
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="http://github.com/Toblerity/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+DESCRIPTION="OGR's neat, nimble, no-nonsense API"
+HOMEPAGE="https://pypi.python.org/pypi/Fiona"
+SRC_URI=""
+EGIT_REPO_URI="http://github.com/Toblerity/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS=""
 IUSE="test"
 
-RDEPEND=">=sci-libs/gdal-1.8
-	dev-python/click"
+RDEPEND="
+	>=sci-libs/gdal-1.8
+	dev-python/click[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
 
-src_prepare() {
-	epatch "${FILESDIR}/scriptname.patch"
-}
-
-pkg_postinst() {
-	einfo "Fiona script is installed as /usr/bin/Fiona"
-}
+PATCHES=( "${FILESDIR}"/scriptname.patch )
 
 python_test() {
 	esetup.py test
diff --git a/sci-libs/Fiona/Manifest b/sci-libs/Fiona/Manifest
index 9e9acffd423a..aba38be32f57 100644
--- a/sci-libs/Fiona/Manifest
+++ b/sci-libs/Fiona/Manifest
@@ -2,31 +2,27 @@
 Hash: SHA512
 
 AUX scriptname.patch 353 SHA256 d68af1bca4a036c54016028e25c507857815ef557d5a099d0fef6515ecde640e SHA512 f9a0c51fbdc5bf99eb9a2b94c0f27f7f6fef7ebab94d9e575f34594e31dcb624e4c327e147e5b4955b5434b54cd2179b985bc64a9410bdb792b93f45375838c9 WHIRLPOOL 0432177f8585292af401811a09fda058f49fef4a0cae2d0c14c74ffd691e60d99ee5be0054d0999c3fe4df3ece45455b47bc956f473b8f26539c9b7c277a29aa
-DIST Fiona-1.1.6.tar.gz 261413 SHA256 9ba0d66ce0e30783904bea629a647a56cc8c47f146ec789aa6b1df1b6827156e SHA512 1976bfb951d5ccd684732357209a269bc359ab3a8118d820098be9228dd5c4c6d234ec8b6cb448ad771d50522b1f1ade782cdadacd092f108a257c16570b9a8f WHIRLPOOL b1fbdbb7a4a11389ae159ab7d517ca59f61243ec20e5e6a3997e4e541e10754ab7632b86dbfb98c8d3ff04193d6031225e845cae665e06a825a14921f2f6252c
-DIST Fiona-1.4.1.tar.gz 280799 SHA256 ca70e563c2eadf791d744084cb38d57ba6f6ece00b62857d3b1dca3f63d1fd29 SHA512 456f875b9bf0f2db7c6f6a34e33ac95ed3031d38f50d04f9af2e02282ba1e3c142a05c6af5be8097b9897083a5fcb74a9184831cb9cf755ee7700451eb005b38 WHIRLPOOL 18fd26d77132609612ba13ad8df8c90b0ff72918aad3464aeaae713b174b0cddcd6106b7d66949fd4a2e819b8157150035783d707e38a73cb81de41959913c22
 DIST Fiona-1.5.1.tar.gz 1117361 SHA256 2e2469190107dc671b4aa05d5b8bed5c01ffeb9de79525c91129bad76915e095 SHA512 06a2f091138b455355aa24bdd3cace48a3ccbbcb8b680f8009862a9ef3bdc217b68ba4596c51caaa9d09d2fad606a581d50f2fc9f2d0636bfec459e2022546a7 WHIRLPOOL 47d274f1755aa875273f1c8b4ce8949fe9a22b237fff90bdf71aa3ff7a6a4a18ff9016ebe3cdf8b323a2d67fa45b6cb8c8e8bfc20c2c57e01df0aa7cf8733330
-EBUILD Fiona-1.1.6.ebuild 764 SHA256 01918027b5d51fef58f420b53fab0da5d62f12d2aa79c7b28e642c310eaaa80e SHA512 e90c6127701604bea9f6d5d0dea96b2150bc61c31b203d07d7a9f69d3b94ec46b99232d8e4cb69179d88026749a97ade24ad16a8fb6ae2963c6f3a27fe91f261 WHIRLPOOL 067c0745e96ab1df6bc190e9f3dd35b1dfa9577ffc47a857da64ff153b549ba815c6969200e52e2bafa27e91b8200a2d8f9642137808372c2bb255bd4ffdad4c
-EBUILD Fiona-1.4.1.ebuild 843 SHA256 26baf50ab331907f1e2d52fdc6641aa5c58315d7b1d0612becb01fe45cd41239 SHA512 c19690788db099661c28b3c5b9f13e5d3e03bc87feeaceb3aa8ff4b271a2cc27d9883a9756bcacc8b0c3f77a87bbe687746d99055d79c6d6b396994b0ca332af WHIRLPOOL 8227116661dba63012633b493e6aa943ea0ab6ca334cbb7d03831f07e446c0cc1740440a43f80cea938f0964b8e53541ac008b6c53168d4bb9e65a98555ea15f
-EBUILD Fiona-1.5.1.ebuild 903 SHA256 461eae4111ab97cbff59f78798587b389a5a8f470a88ce992646a4a08bcb85ce SHA512 7df944329be6a4c935685dfbaaa4a5a572c0154b7a47640e0a045e7308eb3f58038b379597c697736b16ec2da44127168ffcea75746561b0c6884e25026d883c WHIRLPOOL 837ab23c0f4a93d5e9247ceff51115dc563ab5a4a710e1f17fa4c29f81cd358b036840debd4d13cf2563bcd94bbed4d9821fae89edf818f64103b3d199403c33
-EBUILD Fiona-9999.ebuild 1029 SHA256 65f90a03ca8ac2d8a6970ad1b4a44680c010595a0c00f923b98c81837e88fe14 SHA512 a4b0ae7b98e9ebbfd74cf7b923e2433fa0c49b28540e366cc9c03b9fc09647d9430f150cb048389e390b481fc8f3ff5bdd164820be6129f1667dc6f47ac71d0e WHIRLPOOL 699ed209d71b3250a9b6e9886a438192b1ffae5a1ced4a4078ab59ca0c53ae8e5ece2ca4811e1db8390a66a8a4aaf6b17aceb401f29e84c4214fdadfe83dfdc4
-MISC ChangeLog 1833 SHA256 10f9be48475394196470e29827e84805cefc5ef99cb3e253aea8b467f54c46b2 SHA512 dfff0d8fbe4b5becc66c249a2bd1e01be089a224ca3e2166e3096287132176b98a6ce2ca65f4139bd5852d16d1be941979c30f29aa511220ca5a5a56e794c0c9 WHIRLPOOL 8d5fd9dcac14ef52feeba9c67f58f632e5c397fce172c2c0c45bfc35183ec871239af66df23b8b7e9e1fbbf79594d23b27f9d2a2ac7c632621c7ab1c5a5cbd68
+EBUILD Fiona-1.5.1.ebuild 825 SHA256 9f17be6f9b47b77b125b573c058e5a849d1e1f51a43ff1447e0fa4cdbd7edd57 SHA512 9fd92afefdf359c9b562e281512d28dce9b009223a22a284b5002bcc6e20e1ade12964c9dde74355f3bcfe0c0012bf821d0616aa360c83e8c9cfd0f3b0864c18 WHIRLPOOL 4ee710b58900e26e9a20bece54570da4525d910cbdd5fe3b8071308802fe412395a739b0d78519abba76ff365c7a486a48cce3c1295c22437f3c7b2fc2e5c535
+EBUILD Fiona-9999.ebuild 833 SHA256 a2e66fa42b7a06f8c64ae4fbd00b7dd2795ae6ea080c0ef20bef27e1f1ae4ca4 SHA512 e21b64004ac8ebd61363f3f9aa3973a7e780016bff85564d4b357c2bec7fd33f599af0fd94ccdef5d0d791248159a842a5cb39198c32ffae622647d8134248fc WHIRLPOOL 36352a80260d3861e3e8f736081e629e4ffb9d9709ebb6550e23dbd54d5bf66be05e5d4db4bede3de67c5fab1f6cb70fadb5d5fe2d8cef02bb7367f514aee4a1
+MISC ChangeLog 1993 SHA256 c9838273351400edadad5a37b83807bbc61d9a5290c071b8bb4fde80eda10e94 SHA512 8b4527c5eeab815c2d2f9c167a4b0718b71c0031ee689b974a243cddbab0057c620fd235c12991078773dabac08f2c0d400852939a17315cc086468e3fcbef81 WHIRLPOOL ada49c26781d1517a12852b295cec63479a80942666d222f7c93ec402f6cb6199fc1464f46c6e243216c4b984ef2e8fae556c49a953c09002e4f3f7715aaf643
 MISC metadata.xml 277 SHA256 96c32b76b510a84ecb6965bced03ac6608135325a2d9db432a36952acbf0fed7 SHA512 09a192ecb8dcbc08b6a3882de746efaf61daadcec0f4a92bf092353f991590ed1627daf67bfaabef1bc09959147b4a9e82156066e9d4918ea2bfb376b3c69e61 WHIRLPOOL daf54550d9db52352481fc54e3b48c86be9f5df3756af127bc0f02d94ddba40f3810fbc0f21ba2578819b2ecd7934de4a4b0b0cedcda84cc285aa617c021dea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcC80XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVcDD8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi68EQAKw9icX4BkCRpg0xfFLE77Zo
-NxJluLE+zkQS0uKMQEJXozsvx0st6ZKyoKRgQzeGSXVR5GYj+t02Tp2TnoBBvwyS
-saMMYLKjE8yEvByvJ5ixWe3S/O0u/+WFlIyLoJ+SZ6abN7rgrPVwIZkWVTND8iCB
-NcvkRkPggmBUlYaIwQyHwq0xU4xwcGKyX2ov9i5lNqcbVM2Y4Ahu5PrNOl8A6ONB
-oRZHXABaQydXsI9Dsm1xWk1eSp9BZ6gdhFxjFqoy/53U7OPm8IalPmTKIXp6OrWD
-OWox/rBoOehC6oz0V3W2JzZz9zHwF+kUNZm0oqCmjjESB8DRienGl3goP82ZgZQC
-iznR2KvoymhzJ495MeuKG7zm7c0wWPXhulLNakBvMGgnB5l+hG2KuUnr+DEx5E1r
-p06iyd36ojkct1XvPvq7jYtwfrfJAnSTl4T+8gOyLkIgEqVPEDUtcdIX8CyBpRU2
-Ela4CP7TAnBwtZCnGtT2o/SkKKLeuly/ZvKz/abAx24K+JcVVYmVIZ/0iNZQwlRg
-ssAhBwkNpnoymp72WYp5po2ZNXoPE65jMojjRSjtDqxqivZYVnOJMymf35MomGyJ
-uQwyO+B8rhgUzwitY52OBs1cTXI8T5WUAwmYGeWWV3yK5VW9LSTYphQeYtgkVYxD
-znEW0kp3PNgL27sOEME5
-=iqTK
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiASAQAJkvgkXJ8NSUXtzJKakRVNcu
+d59BmSGsFaoXl172pLMBEMjEGvw4lQbgNllIxKBcbedtSAunt9k7UoWbjb6FnjVB
+ZXXWpI92qEDLPQPDO5w75qIOBaL5zVbuHutUCoH1wkU0WDwkkNTdERMet+EadM5O
+8GEXiZXvQt6fVmA9Cm64fNNorajb4SdoU58nMLt+HoX4GT5gqOSmix4SER+xiTl0
+/pG+DPWr67ipzoAlp7tprkgQNKXa+aBGNh/W84Vb96nnaMFuY+YAUQDngC7P1w5n
+ZDrGoGfAcnkrzZVUr0qkyVLAyP8mAWlFJ84LtpvRtbaBgXgHDL/TIg3OxvuHdwhL
+zql67M3f3x3vz+vyK9ZOUgnwMzj5vOWiPaQLa2vlNXCPwkw8xp65eDlMJlgFgbvr
+s7kGgZyER/OI1yjSwkXGBjaeYSijq8JgscjEJpp0NYcNc2LyrmVGYBxoRc3JTKrd
+TS4J6UxUZhLq4/55pE1Hbs+Afu4zs8QzdJiDYE0A3+KnkJR41iELhlrzMn9yvqjg
+/7Ye+Iz9UAJJBerBodxhdXGQs/mLc0VMkIN+4R9un7vz9KL00FzZtranT9joEsyD
+jwPc+KWbG4QJxT6dZ1up8CQgEv6ZCFNi6HpGPg1eEwTK3uMpHvbcr/R5Fnb8gwZn
+6tToILH1LJ3i/MEWEQbC
+=zVEP
 -----END PGP SIGNATURE-----