[gentoo-commits] repo/gentoo:master commit in: sci-misc/vitables/

[David Seifert]

commit:     d9dfe44904c1bd250bd986aea546d0a93163f735
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Thu Sep 22 16:28:23 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 25 19:49:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9dfe449

sci-misc/vitables: Removing EAPI 4 ebuild

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2389

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-misc/vitables/vitables-2.1-r1.ebuild | 10 +++---
 sci-misc/vitables/vitables-2.1.ebuild    | 56 --------------------------------
 2 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/sci-misc/vitables/vitables-2.1-r1.ebuild b/sci-misc/vitables/vitables-2.1-r1.ebuild
index 5d9cacc..865e085 100644
--- a/sci-misc/vitables/vitables-2.1-r1.ebuild
+++ b/sci-misc/vitables/vitables-2.1-r1.ebuild
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
-	dev-python/pytables
-	dev-python/PyQt4[X]"  # FIXME: check if any other useflags are needed
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]"  # FIXME: check if any other useflags are needed
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
@@ -30,7 +30,6 @@ S=${WORKDIR}/${MY_P}
 PATCHES=( "${FILESDIR}"/${P}-no-docs.patch )
 
 python_compile_all() {
-	distutils-r1_python_compile
 	# fixme: multiple python (anyone cares?)
 	use doc && esetup.py build_sphinx
 }
@@ -38,15 +37,14 @@ python_compile_all() {
 python_install_all() {
 	dodir /usr/share/icons/hicolor/scalable/apps
 	dodir /usr/share/applications
-	distutils-r1_python_install_all
 
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
 		DOCS+=( examples )
 	fi
-	if use doc ; then
+	if use doc; then
 		HTML_DOCS+=( "${BUILD_DIR}"/sphinx/html/. )
 		DOCS+=( "${BUILD_DIR}"/sphinx/latex/*.pdf )
 	fi
-	einstalldocs
+	distutils-r1_python_install_all
 }

diff --git a/sci-misc/vitables/vitables-2.1.ebuild b/sci-misc/vitables/vitables-2.1.ebuild
deleted file mode 100644
index 7ed46d1..00000000
--- a/sci-misc/vitables/vitables-2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-MY_PN=ViTables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils eutils
-
-DESCRIPTION="A graphical tool for browsing and editing files in both PyTables and HDF5 formats"
-HOMEPAGE="http://vitables.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/pytables
-	dev-python/PyQt4[X]"  # FIXME: check if any other useflags are needed
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-docs.patch
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		# fixme: multiple python (anyone cares?)
-	   python setup.py build_sphinx || die
-	fi
-}
-
-src_install() {
-	dodir /usr/share/icons/hicolor/scalable/apps
-	dodir /usr/share/applications
-	XDG_DATA_DIRS="${ED}/usr/share" distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-	use doc && dohtml -r build/sphinx/html/* && \
-		dodoc build/sphinx/latex/*.pdf
-}