gentoo resync : 22.05.2021

4 files changed, 45 insertions, 7 deletions

diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 023ad9056fd2..09114fc8aa11 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1,6 +1,8 @@
 AUX add-freebsd-elf-defs.patch 1937 BLAKE2B d7983f6a93dc7a4621fe2da97de6dda8ea1d938996835fad6100c8c561aca37e2fa6b4ba796cb04bbd6d5674e05a84f02df22d954c731777652265f5a18768af SHA512 3f480926cc89ebf3a02bf0fbb8e304226e9b58bed2bc887854a8935915a444822093264e98856f55fb76e3c32127914e171e3da5ebfc05fed5a2d02931e970c2
+AUX elfkickers-3.1-AR.patch 708 BLAKE2B c6aa014e2e0f4f458911bc6153ecf92fba3387e167a0517499ccf4956a3c2d13af2ed399399b3c7068d210d571e5a327d8cc64c67e53cd400e44bad9e18e3950 SHA512 db28147e25e7da6f6732ee196b3bb64f49ac4e60453bc8b8302ea2ab602c81b5fe4aac4cbbfdaec44d579ed7ca5f8d25c5a35b0ea1000d09c5e8db668c57728d
+AUX elfkickers-3.1-CC.patch 434 BLAKE2B 964201ceb6f0a949dd33f8f1b1900044c3a11183f5f54ab6f131ef85155e8ae755b0e16ca8af953bcd6b55129953e0da062adc0bbe12537bf14d02bd6d445ff3 SHA512 a0f32954eaf95ff281bed8d127b38a01cec7609c80e10abfe0d616888b14c0197e4b857862a63ca98e2e463e84f8748c8d933feb1b46b781561d3d5c5a5e3ab0
 AUX elfkickers-3.1-create-destdir-path.patch 620 BLAKE2B 97cb8593a14405aba7ed766323272559c140258aec9dbdf04781d75f5b185790a2f5a7cf11511ab80eb0ef224bca43c8c6bbf7971f982484f2c4ec6fd6a3ce9e SHA512 63805893f21f7b4688c4363fa0e9fdd721ad14a03e657ca73b80850726c7c3178fc538005d5e8a47746f0496aea2b9899a39b511dc73556231141a02cf46d281
 AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178aca6bb42c3f93b271f2132fedf793b71f1f216ab57e4e05fb299a06ff0f47e0626d5067ae44c79b3b96b41fb40d40a935bcd24596272b7 SHA512 fc44d407d1cab8e26af3a7011d82a8f236ef330d881308c28ecc0685e5e8e11b3477ed67c59284ed0905ddd5d62e76f88b99ee4b27dcfb2f5d188f0318ebc1ef
 DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
-EBUILD elfkickers-3.1a.ebuild 863 BLAKE2B af011352123cb593849d27b897d641572e6ce94d88c0ebdfa5c51487cb38c1084702c04d88c56ff51b8b82cc942cda16e4f62ad240fa9d3c5d4a1bcf9d8f30b3 SHA512 c0e14ea9d51b59afebabc5096a7b93b8eb44b3f4a5192cb4e3ad0fddb0608038ad23b7659da3112c65f337ead61ea2885b02d3535481987b9d29c9fc53af16d3
+EBUILD elfkickers-3.1a.ebuild 913 BLAKE2B b7f61c9e063fbb00036c562a95fb37a7b66277771f9e3c3f75bf26430fc3e6d2dd938f8abc28957877cefd4a6022a18fa360bc258792d8a2f76012e11b78177c SHA512 1f81e2a5dbf70b0df0a6d33bbda4fee861793e775c55f98aad917ac0bc2c61e2f0b41be0b9ef11e2afd55a1cee688c8688855f80b2a3f529159675edab643786
 MISC metadata.xml 657 BLAKE2B 81a73ead5e1fee87a15c34c14135154148a9bf3449d8d7160bc18427edab55caf7d1916943bc8bc0e42f402031d8753c5102f504e191904f21b37996de36d24a SHA512 4519d4c439e25c4c70dabe91740ea572f084f4756cbf471f346d4bf0c85226f7254fbc9744ba32bd168885b238950d01de99bcd1baa7f24939b94daba41750a7
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
index cc49c477cb5b..17da43f9da49 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,14 +24,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
 	"${FILESDIR}"/add-freebsd-elf-defs.patch
+	"${FILESDIR}"/${PN}-3.1-AR.patch
+	"${FILESDIR}"/${PN}-3.1-CC.patch
 )
 
 src_prepare() {
 	default
-	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
-		|| die "sed failed"
-}
 
-src_compile() {
-	emake CC=$(tc-getCC) all
+	tc-export AR CC
+
+	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
+		|| die "sed failed"
 }
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-AR.patch b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
new file mode 100644
index 000000000000..6b5100c06eee
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-AR.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/724258
+--- a/ebfc/Makefile
++++ b/ebfc/Makefile
+@@ -10,7 +10,7 @@ brainfuck.o: brainfuck.c elfparts.h ebfc.h
+ 
+ libelfparts.a: elfparts.o ehdr.o phdrtab.o shdrtab.o progbits.o	\
+                strtab.o symtab.o hash.o rel.o got.o dynamic.o
+-	ar crs libelfparts.a $^
++	$(AR) crs libelfparts.a $^
+ 
+ elfparts.o: elfparts.c elfparts.h gen.h
+ ehdr.o: ehdr.c elfparts.h gen.h
+--- a/elfrw/Makefile
++++ b/elfrw/Makefile
+@@ -6,7 +6,7 @@ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+ 
+ libelfrw.a: $(LIBOBJS)
+-	ar crs $@ $^
++	$(AR) crs $@ $^
+ 
+ elfrw.o: elfrw.c elfrw.h elfrw_int.h
+ elfrw_dyn.o: elfrw_dyn.c elfrw_int.h
diff --git a/dev-util/elfkickers/files/elfkickers-3.1-CC.patch b/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
new file mode 100644
index 000000000000..b1541d5cb179
--- /dev/null
+++ b/dev-util/elfkickers/files/elfkickers-3.1-CC.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790611
+--- a/elftoc/Makefile
++++ b/elftoc/Makefile
+@@ -30,7 +30,7 @@ out.o     : out.c out.h gen.h readelf.h pieces.h address.h shdrtab.h \
+ elftoc.o  : elftoc.c gen.h readelf.h pieces.h address.h outbase.h out.h
+ 
+ elfnames.c: mknames
+-	echo '#include <elf.h>' | gcc -E -dM -xc /dev/stdin | ./$^ $@
++	echo '#include <elf.h>' | $(CC) -E -dM -xc /dev/stdin | ./$^ $@
+ 
+ mknames: mknames.o
+ mknames.o: mknames.c