gentoo Easter resync : 12.04.2020

5 files changed, 72 insertions, 40 deletions

diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index 7dabcb4b6f75..f7572c3709d7 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,6 +1,7 @@
 DIST libfaketime-0.9.6.tar.gz 51333 BLAKE2B b9aab3da744e250f43eca4f837322932c3260d35550171d34da851740a415bf3d2c3bfe02cdf37782058d8524008743838757ed8326384ecb36d0d9839cadd1a SHA512 ab2e9c53f4ca2b9dcd2bbcd8de3ab9e27be57547ed9b52a17f07a6fe880fd3a283a6f10018736be2a6ba4e150f54e92161959ccb887be1f78ddfc96058729860
 DIST libfaketime-0.9.7.tar.gz 56277 BLAKE2B 62e10c4b3c33c203cde023cbc4e114c2ee1ad87298b1840bb2f7ea3610fdfd81c12a60c1c00a44409ca322e96408427fcad32f202737b75d28c5d69b85b579d6 SHA512 593e14e96dc0a49f65e93d25b7aace6e78fd2b4251f692c14bd6c6a2ac6360d997573aeac9005388bc49276078075c23a39fdaee912c2469acb8014127625537
-EBUILD libfaketime-0.9.6-r1.ebuild 776 BLAKE2B a0cc1cd2cf56b38077a667e9fe04f523207906f3e8d878f6e6b7bdd02a1a78428cc3da28809dcb329ccda1af1a8d92276224b69b1532e54a8cea977878fb7f94 SHA512 d15ae0475d7da5e11fd8da5c43a5eee289bae97ed33f2278f8d44699c167df79b30336abc014f6c79af103b79d86ef736e7faa2bb86c70d1749ac56daf0d99aa
-EBUILD libfaketime-0.9.6-r2.ebuild 1290 BLAKE2B 748bff57db9d51c1b618dcf9dae30a74e6095324fcdda90f40ec2ec9d1f75f9011672135847523a0198439e39b43e0334d8fd4c19139f4667fb2ea0cbc13a1e0 SHA512 4f37893874a197b01c2ee23ae6160eaccbe1446d0bed956e1147cf556e6fd6c8c9ca06c4514a7799681919a685deb83ff8ed1194bf92c399074cfc6f440b8584
-EBUILD libfaketime-0.9.7.ebuild 1310 BLAKE2B 14e846b26ce86d7ec95dc8c87376e1959dca136c139f064f147fbeeb01b9471ca3201ef8d7b2a7829b1563ef62f6542c7a6218a4be361e3156f227de0928e113 SHA512 76f4541b5e31d6f09cf45f518f4bb72bf85a344d2d9ad62a127e45be33fb6b442109d6d4899a11e046dc86194ffa78de61e9d18c5e0b2c7c046077d759fb56fe
+DIST libfaketime-0.9.8.tar.gz 70614 BLAKE2B a10a8859c216ce4c2edae3324515507f4c2b8a284d80da5a83d1b8046262ae5e624e358c809c2d473fdc21caa0d89f675beb3adfdb401411356145fdb9a1bac3 SHA512 87081024cab10462d4ed4d4ad9c3c56ab40fee3300d3a9ff180a4d96d418b3f25d80d7d5ad0a1af2fb87204f01a506d9fa273def7a8f9cc3be4cc0e9fef42aed
+EBUILD libfaketime-0.9.6-r2.ebuild 1356 BLAKE2B 3c5366d5812d8cc439972e58260db320fe3d690d309b6725e36e4f1197ee165ad7803dee4e49365b2ac0de8f72d2f70a02b6bd551250efbc0bbbf3a41fdaba2b SHA512 7b479da51c27fd659afc7d6c9c1b4c67b5f38537cad62e66d37107b0f1cf5c3c8a28668eea688fe1b9744beb4a84b71e0bf5f18c80b61338124b44e3a618f44e
+EBUILD libfaketime-0.9.7.ebuild 1383 BLAKE2B 7a61df366d1d8c8f5df3798f87d47c524a8eb5e02b90454d9b15b583d1af72a790c3e99251200f9ff854d90310f5b2cbb95b082860f18269dbf5b38e5f8f8e74 SHA512 8db6ca7f9e66b49ce4ef116ff8be3e2debc8ec1f9b31503ddd8f1a5cf785029ed4b10a7bddc7e026d548a3c00d6b7baf28ffe93dcfaac16e8d15758c5e7f955f
+EBUILD libfaketime-0.9.8.ebuild 1593 BLAKE2B d593905570cb43387ac2d5069d8fed299a89602ce193108ed313c75ecf78ce5c5e2bf0103d57113c1768e22b5f09311c4213eba9810bda46e047596cbf2320bc SHA512 146bc9957a5335980f263e54cf2cdf01fe88b13a35d81cb81f74477c5809ae97f2cf6332174a03b1a83d8e26deb355e94a4cb10eb48bc4657fa9610f9ea5ce2a
 MISC metadata.xml 844 BLAKE2B 55b522c415ccd092c6f940fafffe6d3ef871259265d125844b179f00c3fce55fd4b359c1b535a0ace47722938d2d2b744cf9062e1ff3e32bbea89b9b7a200691 SHA512 77924230fc18b29ee6c5891a73acde9158dabdec2d3f892ceeb84bc6e1b6f2b977dba05382a1da67fa8db6e57ca3be2161f6218e2f52feaefef690a0e1989893
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild
deleted file mode 100644
index 33655f66e02d..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Report faked system time to programs"
-HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime/"
-SRC_URI="http://www.code-wizards.com/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa x86"
-
-src_prepare() {
-	tc-export CC
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIRNAME="/$(get_libdir)" PREFIX=/usr
-}
-
-src_install() {
-	dobin src/faketime
-	doman man/faketime.1
-	exeinto /usr/$(get_libdir)
-	doexe src/${PN}*.so.*
-	dosym ${PN}.so.1 /usr/$(get_libdir)/${PN}.so
-	dosym ${PN}MT.so.1 /usr/$(get_libdir)/${PN}MT.so
-	dodoc NEWS README TODO
-}
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
index da55fc5ae41c..538aad5ced37 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,6 +16,8 @@ KEYWORDS="amd64 arm arm64 hppa sparc x86"
 src_prepare() {
 	sed -i 's/-Werror //' "${S}/src/Makefile" || die
 
+	sed -i 's/-Werror //' "${S}/test/Makefile" || die
+
 	# Bug #617624 (GCC-6 compatibility)
 	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
 
@@ -35,7 +37,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && emake test
+	multilib_is_native_abi && emake CC="$(tc-getCC)" test
 }
 
 multilib_src_install() {
diff --git a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild b/sys-libs/libfaketime/libfaketime-0.9.7.ebuild
index 16245df161cd..ce73633752da 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 
 src_prepare() {
 	sed -i 's/-Werror //' "${S}/src/Makefile" || die
 
+	sed -i 's/-Werror //' "${S}/test/Makefile" || die
+
 	# Bug #617624 (GCC-6 compatibility)
 	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
 
@@ -35,7 +37,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && emake test
+	multilib_is_native_abi && emake CC="$(tc-getCC)" test
 }
 
 multilib_src_install() {
diff --git a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
new file mode 100644
index 000000000000..16e5456199a4
--- /dev/null
+++ b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Report faked system time to programs"
+HOMEPAGE="http://www.code-wizards.com/projects/libfaketime/ https://github.com/wolfcw/libfaketime"
+SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror //' "${S}/src/Makefile" || die
+
+	sed -i 's/-Werror //' "${S}/test/Makefile" || die
+
+	# Bug #617624 (GCC-6 compatibility)
+	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
+
+	# upstream doesn't want that we set this by default but
+	# I didn't find a single system where libfaketime passed
+	# CLOCK_MONOTONIC test without that
+	append-cflags -DFORCE_MONOTONIC_FIX
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local target=all
+
+	pushd src > /dev/null || die
+	multilib_is_native_abi || target="${PN}.so.1 ${PN}MT.so.1"
+	# ${target} is intentionally not quoted
+	emake CC="$(tc-getCC)" LIBDIRNAME="/$(get_libdir)" PREFIX=/usr ${target}
+	popd > /dev/null || die
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake CC="$(tc-getCC)" test
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && dobin src/faketime
+	exeinto /usr/$(get_libdir)
+	doexe src/${PN}*.so.*
+	dosym ${PN}.so.1 /usr/$(get_libdir)/${PN}.so
+	dosym ${PN}MT.so.1 /usr/$(get_libdir)/${PN}MT.so
+}
+
+multilib_src_install_all() {
+	doman man/faketime.1
+	dodoc NEWS README TODO
+}