gentoo resync : 16.09.2020

5 files changed, 53 insertions, 36 deletions

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index ad4bb3dcdf24..9c87d00b3337 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,11 +1,11 @@
-AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c
-DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
+AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
-EBUILD elfutils-0.177.ebuild 2156 BLAKE2B d2455d04f65331456093f5a43b9e1ec06c0ae2ee2ec8073e6db3a1451aa1e6a3ed43834c181fbc7c742d77638ea3746d9f260e8d3ba0924f2f1edc56b05c6b42 SHA512 01011fc1c148a173ad401ecb0d067e9f051d0a37e9c1bc965f7bc6b7d07ca5b69b811ddb7af613e2e95eed768adbca4ff9e16ffaf48bf513017898cb79985fe6
-EBUILD elfutils-0.180.ebuild 2423 BLAKE2B a08d3dc7956d58df7c6bd10f5ba479063b9121925ec91de1b19c215b84053929627f9d73c796c9525d496f7e2a0875a91d84792b42fcf70938d68c6a34183527 SHA512 cc800030fdadffab722b08485055bdc8973bc9cfad67841fb7020707abfb4a44223354628358da645e2f9f61effa0d2b065e9db9c021eaaf8d6c4afd617e056a
+DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
+EBUILD elfutils-0.180.ebuild 2422 BLAKE2B 40571def8e77f4d077623ad2b0c4a600b4bc70f14702facb099958a4260cc638e3ac19ecc73b043d531c3cee873fca1ad254e0c5d3bc3ba1e003edf27f786b6e SHA512 82614e2da77c393a36fa9a1a0a121743acc3db4f2d2c66521c214d3adf80c27f945403f86ac7861e87dc2b2c2ad7ac9c0a0d79662c4ce3ec29ed245f9845dc9e
+EBUILD elfutils-0.181.ebuild 2466 BLAKE2B cb089361fbb8e912888ac81f13e686161d3ccf06bae6d2705ed4e77ef38460290f5c8b389d5e9c0de298d65cfe72edc49d1c8380264bbf7572ac93296cc07333 SHA512 83d659750dc4a6d68471d7305a064802de231e69e1f8b75a662d382bf076427a19789623bd35b401d5fd7d8b4d11ced747315ec64c3a7583b850a14f2ba1cc05
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild
index 294f12aade26..a8ed95308653 100644
--- a/dev-libs/elfutils/elfutils-0.180.ebuild
+++ b/dev-libs/elfutils/elfutils-0.180.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index e0fb96346a94..83603f15c7b3 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="http://elfutils.org/"
@@ -11,14 +11,16 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
 BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
@@ -26,9 +28,11 @@ BDEPEND="nls? ( sys-devel/gettext )
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
+	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
 )
 
 src_prepare() {
@@ -55,6 +59,9 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--disable-libdebuginfod \
 		--program-prefix="eu-" \
 		--with-zlib \
 		$(use_with bzip2 bzlib) \
@@ -62,8 +69,10 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
+	# CC is a workaround for tests using ${CC-gcc}
 	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
 		LC_ALL="C" \
+		CC="$(tc-getCC)" \
 		emake check VERBOSE=1
 }
 
diff --git a/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch
deleted file mode 100644
index 0ae359fe7dbb..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Add support for PaX ELF markings
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-
-http://bugs.gentoo.org/115100
-
---- a/libelf/elf.h
-+++ b/libelf/elf.h
-@@ -568,6 +568,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS    0x65041580  /* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
---- a/src/elflint.c
-+++ b/src/elflint.c
-@@ -3187,6 +3187,7 @@
- 
-       if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
- 	  && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
-+	  && phdr->p_type != PT_PAX_FLAGS
- 	  /* Check for a known machine-specific type.  */
- 	  && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
- 	ERROR (gettext ("\
diff --git a/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
new file mode 100644
index 000000000000..63c0ed0cb608
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
@@ -0,0 +1,34 @@
+--- a/tests/run-test-includes.sh
++++ b/tests/run-test-includes.sh
+@@ -3,24 +3,24 @@
+ . $srcdir/test-subr.sh
+ 
+ echo '#include "libelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ echo '#include "gelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ 
+ echo '#include "dwarf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ echo '#include "libdw.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ 
+ echo '#include "libdwfl.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwfl -xc -
+ echo '#include "libdwelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwelf -xc -
+ 
+ echo '#include "libasm.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libasm -xc -