gentoo resync : 13.06.2020

5 files changed, 97 insertions, 2 deletions

diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index e60fa3ca198b..2e22306db015 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -2,8 +2,11 @@ AUX prelink-20130503-libiberty-md5.patch 2604 BLAKE2B 4e6eb6cbcd91ea31a090eddb92
 AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296023bac432581ee5d9569ab707b1f9c308947e9d515711bbc528d99594f079700655046e9ea773eb7165758408e124cdc3d9e SHA512 640fce42bac33d76a9ed312a138817695b57b03e7b0d1c57b074903739c3fb3b7c64b8c0d839687dd60fd50054d682f2f095c3f0eff7d5f4fe505d6c334267b2
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
 AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
+AUX prelink.service 108 BLAKE2B 69055f868da9a2e0a2f91e18b7846f4219ca599d8594e133ac7cb58c7929d22852f792f715d6a70dbc281592b4f97b19c093930aaf15d7f91317be9836eab184 SHA512 b66c3c2eac83c1deeff4e24f1b5065e4e4e1690207d82a70447d9891cc24b3d98c96c1d3b2cb1dba73d69c8b89d717ab4a3a0cab164a5f450d197af96fde3752
+AUX prelink.timer 140 BLAKE2B 2ed2a1d3b2d64c8d7329c888bf72cddb154a0d09b95d6dafe30ea4422ab7043bf62eabc121ea8d0bcc48585b28e969a8a34e8a9f3a4c755361f9d3d0e80d09a0 SHA512 66d06121fa0f7b797baa8a29350e001cdae0c3f9c02b348f5c686c417c12de0ba0b1f044e90a6a74d521fe0134f23dd9ef19cc7a6226a55616b42d483f48b5fb
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
+EBUILD prelink-20151030-r1.ebuild 1717 BLAKE2B 25846173d3bc29a0bbedc7281310b688385cbf0b471b22b0266beec8d16c0fe0fc79e31a2c4e749ecb465dcccfc3d957c604e7dae3968761df489cc31a153302 SHA512 0cb5467823ee04be85ed12c9a11dd7208a6aee8b7cee2b48396cd260c92ecce3f71ef8e4fee05c5469b711bed530f7bdad6563fad2ee5f349cf6fb6c70ed4eb0
 EBUILD prelink-20151030.ebuild 1651 BLAKE2B c4ffd87d6c0d8647a49b7f1dc2920b7c9ed261251b4f51c426b413af6720d8d824b2f1aca958e96b0cf68644c135d4004551639ac14b57d99fc701601dc1f50f SHA512 649e734c2133dc736af08ff60fc580fffd52ea0b5a9b9d6dabdb5a2d68acbdd3e73cacbccfcfff5d84e2eb9a4c531293b3ebfe4921d5e4de71cf0ce6bfd5ab36
-EBUILD prelink-99999999.ebuild 1505 BLAKE2B 818c487e68c6a6b8d4419e802f101a02a99bbd666005ec94745fff3242892d7e742aa5e781b89cbf95f9a35b6f043e876f0fceeaad383a3fe69a2b9a910c555a SHA512 c027960bfe1ca7efb0479024fbae2c5fe231d14c48763b11332a1f0b4c3dabc4c9c75ba616723fab6d0ef6419f95fd2b146684fcd8f4ca713304747f2dcf297d
+EBUILD prelink-99999999.ebuild 1723 BLAKE2B abdb7d80d8a9a1330fd5e9c67c40e9c4a26fa7b849726249f35ccd541ba219607d5bc00a81de4c1b86b4fa51fe542de04636251958687ce6ce1afbb9c6856fb9 SHA512 a070d459d47e21ecb1f550f56b4cd1ecbd224a43184e11788062adfaeacb45cd404da0c4834301b6b2150151673d9e4b2b0e712342eb406f29a63679b20cb1a9
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/files/prelink.service b/sys-devel/prelink/files/prelink.service
new file mode 100644
index 000000000000..dcdbf813a0e4
--- /dev/null
+++ b/sys-devel/prelink/files/prelink.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Perform system-wide prelinking
+
+[Service]
+Type=oneshot
+ExecStart=/etc/cron.daily/prelink
diff --git a/sys-devel/prelink/files/prelink.timer b/sys-devel/prelink/files/prelink.timer
new file mode 100644
index 000000000000..5d58d437158e
--- /dev/null
+++ b/sys-devel/prelink/files/prelink.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily system-wide prelinking
+
+[Timer]
+OnCalendar=daily
+AccuracySec=12h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/sys-devel/prelink/prelink-20151030-r1.ebuild b/sys-devel/prelink/prelink-20151030-r1.ebuild
new file mode 100644
index 000000000000..596f57b3912d
--- /dev/null
+++ b/sys-devel/prelink/prelink-20151030-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2002-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="${PN}-cross"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools flag-o-matic systemd
+
+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"
+SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${MY_PN}/snapshot/${MY_P}.tar.bz2
+	doc? ( https://people.redhat.com/jakub/prelink/prelink.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc selinux"
+
+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() {
+	default
+
+	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
+
+	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable selinux)
+}
+
+src_install() {
+	default
+
+	use doc && dodoc "${DISTDIR}"/prelink.pdf
+
+	insinto /etc
+	doins doc/prelink.conf
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/prelink.cron prelink
+	newconfd "${FILESDIR}"/prelink.confd prelink
+	systemd_dounit "${FILESDIR}"/prelink.{service,timer}
+}
+
+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-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
index 4088e323d9bc..dfe534db6194 100644
--- a/sys-devel/prelink/prelink-99999999.ebuild
+++ b/sys-devel/prelink/prelink-99999999.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 MY_PN="${PN}-cross"
 MY_P="${MY_PN}-${PV}"
 
-inherit autotools flag-o-matic git-r3
+inherit autotools flag-o-matic git-r3 systemd
 
 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"
@@ -41,6 +41,12 @@ src_configure() {
 	econf $(use_enable selinux)
 }
 
+src_test() {
+	# prelink tests check exact library lists.
+	# LD_PRELOADed libraries break the assumption.
+	SANDBOX_ON=0 LD_PRELOAD= emake check VERBOSE=1
+}
+
 src_install() {
 	default
 
@@ -52,6 +58,7 @@ src_install() {
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/prelink.cron prelink
 	newconfd "${FILESDIR}"/prelink.confd prelink
+	systemd_dounit "${FILESDIR}"/prelink.{service,timer}
 }
 
 pkg_postinst() {