gentoo resync : 04.01.2018

3 files changed, 31 insertions, 27 deletions

diff --git a/sys-libs/suacomp/Manifest b/sys-libs/suacomp/Manifest
index 899526190995..5cd36a48cabd 100644
--- a/sys-libs/suacomp/Manifest
+++ b/sys-libs/suacomp/Manifest
@@ -1,5 +1,5 @@
 AUX suacomp-0.6.14-strtoll.patch 1456 BLAKE2B 745f4f8277498244d04aa979e1ec4d415854e4f9be3e66c856ad80884e48dc94ec9526ad8b72840cfaf1db46a60bca8704d35c30619832f4f34942f19396803f SHA512 603c49683d7cce6f6edc0b12a1aefddfffd0e9d3c57b34ae176fa94139d3b427bee5993f7d2cd35a575113a8c42becce8b49c4c334dc8cc8fe4902b49bf9cda3
 DIST suacomp-0.6.14.tar.gz 36712 BLAKE2B 09df68729de50753e987a958a7184125308b652dcd4483acfa89bdf454a74341398ef4e5db616b1b2d8e51025040e7e3807df9221402b17e63fb3fd862272f68 SHA512 6e559059c18c1412611d837bf2f5fad08deaf9145464347f712fdb0cd4e0dfae1b7b46253ef086bd4c98cc1555111872b6b5af5272b77a88c767e9008143b7f1
-EBUILD suacomp-0.6.14.ebuild 1319 BLAKE2B b21f1baa9db1d8adbb8ebc6146e9fcc121147638d44a1eb0699593d5d55db509973bc43329694d357cb8c0b05b8e8aeb096e0cc85fc12bf1f1a97cb23dbad126 SHA512 0371812d7a64eb176e2095a278c2b73456587f5f47abe8d7c02846c44cb1d6ffaeaf129598a9717646c474a5611b49d0f2b2d5c340997d6e48f55242c2aee054
-EBUILD suacomp-9999.ebuild 1150 BLAKE2B 56dd24e2cf662b41e91b1969f5bc827a362fdc62f051000022c2d73ad3882da542ecf1fd5d5a2d9cb1d2cdebfcf5c632ace9f1b05aa48f62691f4c2bb1a200dc SHA512 51d3774eb0fe134150ff13b82629fb9be1debef49ce870eaf329cfbde3666c4289829ff1d3703a6ce8535f659383331047e8e255b1d30747c72909d40491db4f
+EBUILD suacomp-0.6.14.ebuild 1273 BLAKE2B 579888178129a52e45a84baf215395c905da3b7073e15a1de938835b8537c3357cf28658c61e7cc2ac220823bc41d0ee06eda3203568b9f9998fa1bd1f786886 SHA512 64071d9dbd1cdea7afbde0bb79459bad3a11707d213774d667844e1435dca28e7d6329ddfa6acab78c7f9b9741e540f02dd21ecc78f6fc91e77aa8ef2de9f129
+EBUILD suacomp-9999.ebuild 1167 BLAKE2B 9af7ab58e3d0862dd74cad9d7977d9dc4f70d7cdda7f59b149dd9638b5c806970eeacb8e06f456ffb7a586c84e149100f193806c34d1668988cf6d297659e10d SHA512 b6eb9a765b6c0d69b3962c8eb2aef2b6eab0d822d83f7a5f5b10a1e578c6a9ad8587742c36ba117319d5ebe9ec4d9f613f118dd149f811b5965b11c8d976a1be
 MISC metadata.xml 548 BLAKE2B 78c65be8454a70ede5311102ca21ef76c697c7222fb053536d9cf165f252ba0891e810675e8e12930640a52038679904ff11f4ad0c8a992405f3a0be2a0433af SHA512 a7a233b0f745af85c510fa021dded0cf5d6c57845c1517451d6e939c2784453fda9413c450cb9e8160ac2cdfbb7a898f45733f6505b19102bcfe7c1d28b81b99
diff --git a/sys-libs/suacomp/suacomp-0.6.14.ebuild b/sys-libs/suacomp/suacomp-0.6.14.ebuild
index be3cecaf4bfc..be3e9886e4e5 100644
--- a/sys-libs/suacomp/suacomp-0.6.14.ebuild
+++ b/sys-libs/suacomp/suacomp-0.6.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="library wrapping the interix lib-c to make it less buggy"
 HOMEPAGE="http://suacomp.sf.net"
@@ -21,9 +21,11 @@ get_opts() {
 	local shlibc=
 	local stlibc=
 
+	local dir
 	for dir in /usr/lib /usr/lib/x86; do
 		[[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a
 
+		local name
 		for name in libc.so.5.2 libc.so.3.5; do
 			[[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; }
 		done
@@ -34,23 +36,19 @@ get_opts() {
 	echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}"
 }
 
-pkg_setup() {
+src_prepare() {
+	[[ ${CHOST} == *-interix6* ]] && eapply "${FILESDIR}"/${P}-strtoll.patch
+	eapply_user
+}
+
+src_configure() {
 	if use debug; then
 		append-flags -D_DEBUG -D_DEBUG_TRACE
 	fi
 }
 
-src_prepare() {
-	[[ ${CHOST} == *-interix6* ]] && epatch "${FILESDIR}"/${P}-strtoll.patch
-}
-
 src_compile() {
-	emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \
-		CFLAGS="${CFLAGS}" || die "emake install failed"
+	emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}"
 }
 
 src_test() {
@@ -59,5 +57,10 @@ src_test() {
 	use debug && v="TEST_VERBOSE=1"
 	use debug && export SUACOMP_DEBUG_OUT=stderr
 
-	emake check $(get_opts) ${v} || die "emake check failed"
+	emake check $(get_opts) ${v}
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \
+		CFLAGS="${CFLAGS}"
 }
diff --git a/sys-libs/suacomp/suacomp-9999.ebuild b/sys-libs/suacomp/suacomp-9999.ebuild
index c40821304da1..b356312ab407 100644
--- a/sys-libs/suacomp/suacomp-9999.ebuild
+++ b/sys-libs/suacomp/suacomp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit toolchain-funcs flag-o-matic git-2
+inherit flag-o-matic toolchain-funcs git-r3
 
 DESCRIPTION="library wrapping the interix lib-c to make it less buggy"
 HOMEPAGE="http://suacomp.sf.net"
@@ -11,7 +11,6 @@ EGIT_REPO_URI="https://git.code.sf.net/p/suacomp/git"
 
 LICENSE="BEER-WARE"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug"
 
 DEPEND=""
@@ -21,9 +20,11 @@ get_opts() {
 	local shlibc=
 	local stlibc=
 
+	local dir
 	for dir in /usr/lib /usr/lib/x86; do
 		[[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a
 
+		local name
 		for name in libc.so.5.2 libc.so.3.5; do
 			[[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; }
 		done
@@ -34,7 +35,7 @@ get_opts() {
 	echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}"
 }
 
-pkg_setup() {
+src_configure() {
 	if use debug; then
 		append-flags -D_DEBUG -D_DEBUG_TRACE
 	fi
@@ -44,11 +45,6 @@ src_compile() {
 	emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}"
 }
 
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \
-		CFLAGS="${CFLAGS}"
-}
-
 src_test() {
 	local v=
 
@@ -57,3 +53,8 @@ src_test() {
 
 	emake check $(get_opts) ${v}
 }
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \
+		CFLAGS="${CFLAGS}"
+}