gentoo resync : 28.04.2021

4 files changed, 8 insertions, 125 deletions

diff --git a/sys-libs/libfaketime/Manifest b/sys-libs/libfaketime/Manifest
index c499658c6fca..b3a7b72c1f2e 100644
--- a/sys-libs/libfaketime/Manifest
+++ b/sys-libs/libfaketime/Manifest
@@ -1,9 +1,5 @@
-DIST libfaketime-0.9.6.tar.gz 51333 BLAKE2B b9aab3da744e250f43eca4f837322932c3260d35550171d34da851740a415bf3d2c3bfe02cdf37782058d8524008743838757ed8326384ecb36d0d9839cadd1a SHA512 ab2e9c53f4ca2b9dcd2bbcd8de3ab9e27be57547ed9b52a17f07a6fe880fd3a283a6f10018736be2a6ba4e150f54e92161959ccb887be1f78ddfc96058729860
-DIST libfaketime-0.9.7.tar.gz 56277 BLAKE2B 62e10c4b3c33c203cde023cbc4e114c2ee1ad87298b1840bb2f7ea3610fdfd81c12a60c1c00a44409ca322e96408427fcad32f202737b75d28c5d69b85b579d6 SHA512 593e14e96dc0a49f65e93d25b7aace6e78fd2b4251f692c14bd6c6a2ac6360d997573aeac9005388bc49276078075c23a39fdaee912c2469acb8014127625537
-DIST libfaketime-0.9.8.tar.gz 70614 BLAKE2B a10a8859c216ce4c2edae3324515507f4c2b8a284d80da5a83d1b8046262ae5e624e358c809c2d473fdc21caa0d89f675beb3adfdb401411356145fdb9a1bac3 SHA512 87081024cab10462d4ed4d4ad9c3c56ab40fee3300d3a9ff180a4d96d418b3f25d80d7d5ad0a1af2fb87204f01a506d9fa273def7a8f9cc3be4cc0e9fef42aed
+DIST libfaketime-0.9.6.tar.gz 53540 BLAKE2B 5559e683d9d513fe60fe4b7f22a2ee794bccd8b1fe2a58735876fb9a0f05e1157d20485cfc2f0bcefa0b1f642f3b981de00471a36998867b0024dd8ac5a77466 SHA512 22cd796d4c6f7b327c664895df5b93b72a7243d886bf5241f932cc23fd54049c5fb6a8351078d036d78d12cb6f530ff66b98ef75df6eba5339ebfef1e7561225
 DIST libfaketime-0.9.9.tar.gz 78610 BLAKE2B 863e3aaf5f26a7b4d6104bdf5dd8fc0ac70547770d01cad302e476a7eeee63f0900ddc825aa75f6db7be08155d7ceb05f3b730fffb9e4928147fbdc097ee0df8 SHA512 b1aecf456753ccf771f0f80c92d57ffcd2c8349dde93a575862b4570a06812d4bce104f2efbcfd627a85a80fed99dbc37cb156dda0389892bfb4e71df816191f
-EBUILD libfaketime-0.9.6-r2.ebuild 1357 BLAKE2B d10887ac8b725f24397ccfcd398b972008ca208e42e0631f2aa33a71461f8b32186bad3e371ae4fb42d25f91e2e4ece6e5b208c416df3ad05e219aaedbda84a5 SHA512 98f40738a63b3190203b1bb01ac52b3633229cdc61db1ddea75cfe7c195b3a28fb64a572dbe9e0ae8ad298104c4329a9465f0e1dc3c3881a3edc610d80b6c794
-EBUILD libfaketime-0.9.7.ebuild 1383 BLAKE2B 7a61df366d1d8c8f5df3798f87d47c524a8eb5e02b90454d9b15b583d1af72a790c3e99251200f9ff854d90310f5b2cbb95b082860f18269dbf5b38e5f8f8e74 SHA512 8db6ca7f9e66b49ce4ef116ff8be3e2debc8ec1f9b31503ddd8f1a5cf785029ed4b10a7bddc7e026d548a3c00d6b7baf28ffe93dcfaac16e8d15758c5e7f955f
-EBUILD libfaketime-0.9.8.ebuild 1599 BLAKE2B d6d5c3ee1214ce58a1c324dabaa42465b61c75a850fc555d806f117dd5f12c71cb5ce421f8f571d80bd95a7e5228cf5ce1587ee3503a88708bc727ab8a350b41 SHA512 3c86330a7e4452da518afd79f641eeca175451eb40881f147946a1140e78fd647c5b3b92dd397956c2135c493bdb568472be349a34e19d079620abd3849364ee
+EBUILD libfaketime-0.9.6-r3.ebuild 1405 BLAKE2B 999273c6ac101056ad34a6f44b0400f96c1e878cd07d685efd5811672a4675bb8fa404086e7cefbb6b92ef909a11db9bf6ad69ff6d5a725fac125f6bc088a041 SHA512 8bae6e88b782a616c114a87be7255918f03e94c69f32244fca36d0b209c179067c6cd71023005f27b9cb1d237e009835ec50236f9301733d86dfd687e613db35
 EBUILD libfaketime-0.9.9.ebuild 1775 BLAKE2B dc603ba42319e8d6359805baabedbbf547feb4a80012d67e0513d857b26b013f59ebc64b977a49058693b855d1a220fd7be4f349a4933c6316addfcfeb970885 SHA512 fec54ad27961e625d2bec81056131cde46f8a14747302e5c151130df788df1a6fd154e0867555904e749e0deca44881ee0323df1d8c14fab4a27dd15a3250bd5
 MISC metadata.xml 844 BLAKE2B 55b522c415ccd092c6f940fafffe6d3ef871259265d125844b179f00c3fce55fd4b359c1b535a0ace47722938d2d2b744cf9062e1ff3e32bbea89b9b7a200691 SHA512 77924230fc18b29ee6c5891a73acde9158dabdec2d3f892ceeb84bc6e1b6f2b977dba05382a1da67fa8db6e57ca3be2161f6218e2f52feaefef690a0e1989893
diff --git a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
deleted file mode 100644
index e416acd33536..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.6-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit 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="http://www.code-wizards.com/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-
-	eapply_user
-
-	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
-}
diff --git a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild b/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild
index ce73633752da..abb0ce44c96d 100644
--- a/sys-libs/libfaketime/libfaketime-0.9.7.ebuild
+++ b/sys-libs/libfaketime/libfaketime-0.9.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit toolchain-funcs multilib-minimal
+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"
@@ -11,9 +11,11 @@ SRC_URI="https://github.com/wolfcw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha 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
@@ -21,8 +23,6 @@ src_prepare() {
 	# Bug #617624 (GCC-6 compatibility)
 	sed -i 's/-Wno-nonnull-compare //' "${S}/src/Makefile" || die
 
-	eapply_user
-
 	multilib_copy_sources
 }
 
diff --git a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild b/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
deleted file mode 100644
index 88426ac5327e..000000000000
--- a/sys-libs/libfaketime/libfaketime-0.9.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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="~alpha ~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
-}