[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/prekin/

[David Seifert]

commit:     7c47eb5a61bc4cd600ed38c5b6c351c0c10c3aa4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 09:48:46 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 20:25:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c47eb5a

sci-chemistry/prekin: Port to EAPI 6

Package-Manager: Portage-2.3.29, Repoman-2.3.9

 sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild | 38 ++++++++++-------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild 
b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index 8bea9cc5230..db0c34eca49 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
 
 MY_P=${PN}.${PV}
 
@@ -16,37 +16,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="X"
 
-RDEPEND="x11-libs/libXext
+RDEPEND="
+       x11-libs/libXext
        x11-libs/libXmu
        x11-libs/libX11
        x11-libs/libXt
-       X? ( >=x11-libs/motif-2.3:0 )"
+       X? ( >=x11-libs/motif-2.3:0= )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
+PATCHES=(
+       "${FILESDIR}"/${PV}-Makefile.patch
+       "${FILESDIR}"/${PV}-overflow.patch
+)
 
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PV}-Makefile.patch \
-               "${FILESDIR}"/${PV}-overflow.patch
-       sed  \
+src_configure() {
+       tc-export CC
+
+       sed \
                -e 's:cc:$(CC):g' \
                -e "s:GENTOOLIBDIR:$(get_libdir):g" \
-               "${S}"/Makefile.linux > Makefile || die
+               Makefile.linux > Makefile || die
 }
 
 src_compile() {
-       local mytarget
-
-       if use X; then
-               mytarget="${PN}"
-       else
-               mytarget="nogui"
-       fi
-
-       emake CC="$(tc-getCC)" ${mytarget} || die
+       emake $(usex X ${PN} nogui)
 }
 
 src_install() {
-       dobin "${S}"/prekin || die
+       dobin prekin
 }