gentoo resync : 28.04.2019

1 files changed, 34 insertions, 50 deletions

diff --git a/sci-mathematics/p9m4/p9m4-05-r1.ebuild b/sci-mathematics/p9m4/p9m4-05-r1.ebuild
index a97703003bec..16bb1c83dee1 100644
--- a/sci-mathematics/p9m4/p9m4-05-r1.ebuild
+++ b/sci-mathematics/p9m4/p9m4-05-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
@@ -13,42 +12,42 @@ MY_P="${MY_PN}${PV}"
 
 DESCRIPTION="This is a Graphical User Interface for Prover9 and Mace4"
 HOMEPAGE="http://www.cs.unm.edu/~mccune/mace4/"
-SRC_URI="http://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz
-		https://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2"
+SRC_URI="
+	http://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz
+	https://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-RDEPEND="dev-python/wxpython:*
-		sci-mathematics/prover9"
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
+RDEPEND="
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	sci-mathematics/prover9"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-PATCHES=( "${DISTDIR}/${MY_PN}05-64bit.patch.bz2"
-		"${FILESDIR}/${MY_PN}05-use-inst-paths.patch"
-		"${FILESDIR}/${MY_PN}05-package.patch"
-		"${FILESDIR}/${MY_PN}05-python2.6.patch" )
+PATCHES=(
+	"${WORKDIR}"/${MY_PN}05-64bit.patch
+	"${FILESDIR}"/${MY_PN}05-use-inst-paths.patch
+	"${FILESDIR}"/${MY_PN}05-package.patch
+	"${FILESDIR}"/${MY_PN}05-python2.6.patch
+)
 
-S="${WORKDIR}/${MY_P}/"
-
-python_check_deps() {
-	has_version "dev-python/foo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
+S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
-	rm -f p9m4-v05/bin/prover9 \
+	distutils-r1_python_prepare_all
+
+	rm -f \
+		p9m4-v05/bin/prover9 \
 		p9m4-v05/bin/mace4 \
 		p9m4-v05/bin/interpformat \
 		p9m4-v05/bin/prooftrans \
 		p9m4-v05/bin/isofilter \
 		p9m4-v05/bin/isofilter2 || die "Could not rm old executables"
-	distutils-r1_python_prepare_all
+
 	mkdir p9m4 || die "Could not create directory p9m4"
 	mv Mac-setup.py \
 		Win32-setup.py \
@@ -67,42 +66,27 @@ python_prepare_all() {
 }
 
 python_install_all() {
-	dosym /usr/bin/prover9-mace4.py /usr/bin/prover9-mace4
-	insinto /usr/share
-	dodir /usr/share/${PN}/Images
+	distutils-r1_python_install_all
+
+	dosym prover9-mace4.py /usr/bin/prover9-mace4
+
 	insinto /usr/share/${PN}/Images
-	cd "${S}/Images" \
-		|| die "Could not cd to Images"
-	doins *.gif *.ico
+	doins Images/*.{gif,ico}
+
 	if use examples; then
-		dodir /usr/share/${PN}/Samples
 		insinto /usr/share/${PN}/Samples
-		cd "${S}/Samples" \
-			|| die "Could not cd to Samples"
-		doins *.in
+		doins Samples/*.in
 
-		dodir /usr/share/${PN}/Samples/Equality/Mace4
 		insinto /usr/share/${PN}/Samples/Equality/Mace4
-		cd "${S}/Samples/Equality/Mace4" \
-			|| die "Could not cd to Samples/Equality/Mace4"
-		doins *.in
+		doins Samples/Equality/Mace4/*.in
 
-		dodir /usr/share/${PN}/Samples/Equality/Prover9
 		insinto /usr/share/${PN}/Samples/Equality/Prover9
-		cd "${S}/Samples/Equality/Prover9" \
-			|| die "Could not cd to Samples/Equality/Prover9"
-		doins *.in
+		doins Samples/Equality/Prover9/*.in
 
-		dodir /usr/share/${PN}/Samples/Non-Equality/Mace4
 		insinto /usr/share/${PN}/Samples/Non-Equality/Mace4
-		cd "${S}/Samples/Non-Equality/Mace4" \
-			|| die "Could cd to Samples/Non-Equality/Mace4"
-		doins *.in
+		doins Samples/Non-Equality/Mace4/*.in
 
-		dodir /usr/share/${PN}/Samples/Non-Equality/Prover9
 		insinto /usr/share/${PN}/Samples/Non-Equality/Prover9
-		cd "${S}/Samples/Non-Equality/Prover9" \
-			|| die "Could not cd to Samples/Non-Equality/Prover9"
-		doins *.in
+		doins Samples/Non-Equality/Prover9/*.in
 	fi
 }