[patch] Patch

prelink.patch (text/plain), 3.76 KB, created by Arfrever Frehtes Taifersar Arahesis on 2020-04-06 01:20:43 UTC

From d52d04555c0365779619fc95e7aa38ab0b843aee Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 6 Apr 2020 01:06:13 +0000
Subject: [PATCH 1/2] sys-devel/prelink: Update dependencies.

Closes: https://bugs.gentoo.org/716398
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 sys-devel/prelink/prelink-20151030.ebuild | 14 ++++++--------
 sys-devel/prelink/prelink-99999999.ebuild | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
index ff8cc444574..6c1b59681b7 100644
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ b/sys-devel/prelink/prelink-20151030.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,13 +18,11 @@ 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}
 
diff --git a/sys-devel/prelink/prelink-99999999.ebuild b/sys-devel/prelink/prelink-99999999.ebuild
index 390d0c35e0c..4088e323d9b 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
-- 
2.26.0


From 5fe8dc253eb02787e8cf2ef27b5621731675441a Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 6 Apr 2020 01:09:27 +0000
Subject: [PATCH 2/2] sys-devel/prelink: Use EAPI="7".

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 sys-devel/prelink/prelink-20151030.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
index 6c1b59681b7..e119ab02ea9 100644
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ b/sys-devel/prelink/prelink-20151030.ebuild
@@ -1,12 +1,12 @@
 # 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"
@@ -26,9 +26,13 @@ DEPEND="${RDEPEND}
 
 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
 
-- 
2.26.0