Drop old; fix eclass usage

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

5 files changed, 35 insertions, 111 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