gentoo Easter resync : 12.04.2020

5 files changed, 22 insertions, 186 deletions

diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 58eecd233669..495ad1c9c588 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -3,11 +3,8 @@ AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296
 AUX prelink-armhf-dynamic-linker.patch 519 BLAKE2B 1cc1790256e9c9cfedccb200dbcfcacd61e6dfe5165c9703a1ccd098c0e5b07c4053b9da6a46a309242347e27478ab47b12c95bf3b9e83e6e6f19e118b97669b SHA512 af898440f11af102d6d4b95ade2ed267dc5e3e01407ded17ca2df7454ee845f8177c0316e9bc73838f3965f5000f58ac51055588fdb4a90293cc431e07e9e467
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
 AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
-DIST prelink-20130503.tar.bz2 928040 BLAKE2B cb0e6fbff85b57c8698f22750377461e127bf89f6d03e6fab2338cc50dc280036ab5d1f56b0e8eed5ebaf391f8e3e0d3c32d9df6499fa17e2e556656ba13966d SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
-EBUILD prelink-20130503-r1.ebuild 2458 BLAKE2B 27df684421d5857a5727916bbcdbadca5d9e8847a1f8c0abafb892fc6af029932687c0819013416d36ad0182bf771ed89e238a8122cc83631b6cc5717ade8563 SHA512 2cc0e66fb48f2137bc9a8118d1ed97e58dd5725bd30b042c4276dad5df2d65ef8298e93cdaeb0b8b292c16ff255fa1ddacdc104150ac478e1bf8677869ce4939
-EBUILD prelink-20130503.ebuild 2617 BLAKE2B 24308a12628eadef19728c07f6a2be21671e2119d6570fd7d2fe8cb7805a041edf4bb54cdc391b808d396e2585e54fbd0c2f46fe755ab35722bfcfd2690fa7c1 SHA512 4ba50aad1ba5e142f8a0c96d2ab73fca49712202c506a57af58e9fee5021446e6587f9715420244c39aef9f006baf8cfef7cd318e8e6e21f36aa590f7840cbc0
-EBUILD prelink-20151030.ebuild 1730 BLAKE2B e26489b2564da3cf789085fbeee5094063dcb1d7293814acd510eb205a72bf07326d20a99bb6029e57b03c5db8a51519cac256d2baa318b89019413024d5912c SHA512 78e3c0e728ef3175c558c0137511e8d3c1e83977d1307868bab73ec1e7c4825147d6687f43478ab64b51aca829a92d0e33aacf68d5051b7176817b69f91950b1
-EBUILD prelink-99999999.ebuild 1585 BLAKE2B 37746d0631d4a07c94f9ad71cc00512b4c485ce13b00ca84263be41f0e8a1b00a315764a845740fe3cee30cdd5acb7d87d41fc0be2d764a158fda62bcabc4df5 SHA512 5d844567440de565d363cff958b3027ce5a7e80a68e46dc2c10e2176bf2306788d4c2d86d6a92a83324a6264e6c374d8d48a38665535588c4b71ac07a03d7a5e
+EBUILD prelink-20151030.ebuild 1651 BLAKE2B c4ffd87d6c0d8647a49b7f1dc2920b7c9ed261251b4f51c426b413af6720d8d824b2f1aca958e96b0cf68644c135d4004551639ac14b57d99fc701601dc1f50f SHA512 649e734c2133dc736af08ff60fc580fffd52ea0b5a9b9d6dabdb5a2d68acbdd3e73cacbccfcfff5d84e2eb9a4c531293b3ebfe4921d5e4de71cf0ce6bfd5ab36
+EBUILD prelink-99999999.ebuild 1505 BLAKE2B 818c487e68c6a6b8d4419e802f101a02a99bbd666005ec94745fff3242892d7e742aa5e781b89cbf95f9a35b6f043e876f0fceeaad383a3fe69a2b9a910c555a SHA512 c027960bfe1ca7efb0479024fbae2c5fe231d14c48763b11332a1f0b4c3dabc4c9c75ba616723fab6d0ef6419f95fd2b146684fcd8f4ca713304747f2dcf297d
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-20130503-r1.ebuild b/sys-devel/prelink/prelink-20130503-r1.ebuild
deleted file mode 100644
index 5f8f8e9f70d4..000000000000
--- a/sys-devel/prelink/prelink-20130503-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/p/prelink-[ver].src.rpm
-#
-# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ~ppc ~ppc64 ~x86"
-IUSE="selinux"
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
-	epatch "${FILESDIR}"/${PN}-armhf-dynamic-linker.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:CCLINK="$(CC):& -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:CXXLINK="$(CXX):& -Wl,--add-needed :' \
-		testsuite/Makefile.am
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf # prevent maintainer mode
-
-	# have to do this after eautoreconf or automake barfs on the trailing
-	# backslash of the previous line
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-
-	export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Prelink"
-		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	fi
-}
diff --git a/sys-devel/prelink/prelink-20130503.ebuild b/sys-devel/prelink/prelink-20130503.ebuild
deleted file mode 100644
index 46b2197ba6ed..000000000000
--- a/sys-devel/prelink/prelink-20130503.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://people.redhat.com/jakub/prelink"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="https://people.redhat.com/jakub/prelink/${P}.tar.bz2"
-
-# if not available on jakub's dev space extract the distfile with rpm2tarbz2 from
-# https://mirrors.kernel.org/fedora/development/rawhide/source/SRPMS/p/prelink-[ver].src.rpm
-#
-# track http://pkgs.fedoraproject.org/cgit/prelink.git/ for updates
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 x86"
-IUSE="selinux"
-
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
-	epatch "${FILESDIR}"/${PN}-armhf-dynamic-linker.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #469126
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-	# >=binutils-2.22 --no-copy-dt-needed-entries is the default
-	# --copy-dt-needed-entries was renamed from --add-needed in 2.21, use the
-	# former so we don't have to bump the dep
-	sed -i \
-		-e '/CCLINK=/s:CCLINK="$(CC):& -Wl,--add-needed :' \
-		-e '/CXXLINK=/s:CXXLINK="$(CXX):& -Wl,--add-needed :' \
-		testsuite/Makefile.am
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf # prevent maintainer mode
-
-	# have to do this after eautoreconf or automake barfs on the trailing
-	# backslash of the previous line
-	sed -i -e 's:undosyslibs.sh::' testsuite/Makefile.in #254201
-
-	export ac_cv_{header_selinux_selinux_h,lib_selinux_is_selinux_enabled}=$(usex selinux)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-
-	dodir /var/{lib/misc,log}
-	touch "${ED}"/var/lib/misc/prelink.{full,quick,force}
-	touch "${ED}"/var/log/prelink.log
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Prelink"
-		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	fi
-	touch "${EROOT}/var/lib/misc/prelink.force"
-}
diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
index ff8cc4445742..e119ab02ea93 100644
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ b/sys-devel/prelink/prelink-20151030.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 MY_PN="${PN}-cross"
 MY_P="${MY_PN}-${PV}"
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
 HOMEPAGE="https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink"
@@ -18,19 +18,21 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="doc selinux"
 
-DEPEND=">=dev-libs/elfutils-0.100[static-libs(+)]
-	selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	sys-libs/binutils-libs
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18"
+RDEPEND=">=dev-libs/elfutils-0.100
+	selinux? ( sys-libs/libselinux )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch
+	"${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	epatch "${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
+	default
 
 	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
 
diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
index 390d0c35e0cd..4088e323d9bc 100644
--- a/sys-devel/prelink/prelink-99999999.ebuild
+++ b/sys-devel/prelink/prelink-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,13 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc selinux"
 
-DEPEND="selinux? ( sys-libs/libselinux[static-libs(+)] )
-	!dev-libs/libelf
-	sys-libs/binutils-libs
-	>=sys-libs/glibc-2.8"
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.18
-	>=dev-libs/elfutils-0.100[static-libs(+)]"
+RDEPEND=">=dev-libs/elfutils-0.100
+	selinux? ( sys-libs/libselinux )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch