gentoo resync : 10.11.2019

4 files changed, 30 insertions, 3 deletions

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index ae7264fc2046..1a82b93769fb 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -2,6 +2,7 @@ AUX valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch 3765 BLAK
 AUX valgrind-3.13.0-ignore-further-mappings-after-read-all-debuginfo.patch 3340 BLAKE2B 344519d755c875acfd70eb7fd475057eacb1321401bafeffb2f632e1edfb01e88db9fef2cf6541db0cae9a7d11cd2d2eb1f00429561a22f96621242c696c9112 SHA512 28bc64b5157738302aee97cbaf0b57ca6f17166de1e63167fe879560f493510b2db17478847519731004f72f87904e0647f593a53d88aa8638b1e1738310954d
 AUX valgrind-3.13.0-test-fixes.patch 929 BLAKE2B cf0316cc3637785bfa57cd2277ad7669ab968b28424bdcf56c47219c90d00915f51293bfc90f5319785752bcebbde7b011dbac964f9538ac2f4208ec7709047f SHA512 1cff77e987e2d20ce1563c96d76431c60c142c42afa978e32d3a8c8dda17d0f3c1ba29fe3d0fcf0e7445fa5ca9558690ecdaad259fb9d23f435dcdc0baa9175d
 AUX valgrind-3.13.0-xml-socket.patch 934 BLAKE2B 151db92f36623a27a6798eb0e559211613fb70e6847985446f4d3cd2a31f9930377e66efc46ae86116f8bcec855cfef2640111bce543ecd3a3e92914f0fa04cb SHA512 a250d6c395a6a02f3898ca94edab92785a720024ce0555c0b48cfe6c96c3bfcc088c5c67242019cb7d89f68066cffde18efe2c74f9b7f8e068b012173c3ec189
+AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbbaddbbbb2773c6f1223e725898dfd5d0ae9078948642c4f2b9deca2bded676230bcfa20d39071f69e640a64dc254759115971374a82 SHA512 4f9573fd68a0e1e209518fb4100c27b697ccd28e7a39abaa921f1949cd87ffb79a6784d2d1f6e006d68a08c7217cee77cba378c18aab48b87a3824eedb53ed5e
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
@@ -14,6 +15,6 @@ EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d
 EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
 EBUILD valgrind-3.14.0.ebuild 3681 BLAKE2B 4edebcceac72d0191cc6a7dfc1c47bfb3bf7afb1acc15479346cbb7f4d7afc20311393c68f623e92f6ed7efa12cafb0c33dd888aca27defb6c0e1efe5f235b04 SHA512 e9e987302ff3dc55b345cb5b497b22599eca3c1fda2de35b350189b519ab2a1fcf33e959c814b40918c11994a2421eeb27b66bea48080cc0ac015108828f89d8
-EBUILD valgrind-3.15.0.ebuild 3685 BLAKE2B b7ac7a43be897765449cee359a75b9e276729c9898106bd90ae2f259fabcd6bc947d0ccaf4c9c77823f1089db70357d1a82a5a3f1319351af0dbef95e60cc030 SHA512 da1e9949b59bd238fefd7b8f4dc3bce5a687ff337738f2354d2121bc4da4f44d416b3c7a03cfbf0e74d4e1d7ea0f5137f0b6d017b36b73ae5159c1209b5929c5
-EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
+EBUILD valgrind-3.15.0.ebuild 3761 BLAKE2B ab6c185f2539185fca886b5bba8bcdb94bbb79242ba0f0a5a0a7b21e5e012dc6bfd6dd9071a4bdb0a0ac9e6876b9754f80f54d55577a5e3937811968e485e203 SHA512 3a7f23bc0fdd5f03d8c8a4a5966380c75bd0f964ea168c5552d647f5db5ff51da6ebc14ce95580d62698d15943243ab38e572f9b142d81700f213fc8143a4711
+EBUILD valgrind-9999.ebuild 3755 BLAKE2B cc2dd005abd89595057c702a3f9afef60b554b3aaff7b0ad267a4c06db1b38df4106640952eefd2413fac5097a48df2d99f2b9e41f81be4731c587b3b7267156 SHA512 b24c9ebcdd36c1fc981cfd0a9e9233239dc6acc52b9d7a0a6533798580f8516b79486cbad800b9b64a4bcdb90c949bbca1e2fc813c19c7c6ed5ac282e2fe71d8
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch b/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
new file mode 100644
index 000000000000..44176658df74
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
@@ -0,0 +1,22 @@
+From beab8d9f8d65230567270331017184c8762faa42 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 4 Nov 2019 09:12:16 -0800
+Subject: [PATCH] Build ldst_multiple test with -fno-pie
+
+Bug: https://bugs.gentoo.org/685070
+---
+ none/tests/ppc32/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
+index 11697c99a..222efd3f2 100644
+--- a/none/tests/ppc32/Makefile.am
++++ b/none/tests/ppc32/Makefile.am
+@@ -156,3 +156,4 @@ test_isa_2_07_part2_LDADD = -lm
+ test_tm_LDADD = -lm
+ test_touch_tm_LDADD = -lm
+ 
++ldst_multiple_CFLAGS = $(AM_CFLAGS) -fno-pie
+-- 
+2.23.0
+
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
index b18a128859a5..7810056a3669 100644
--- a/dev-util/valgrind/valgrind-3.15.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.15.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
@@ -31,6 +31,8 @@ src_prepare() {
 	# Respect CFLAGS, LDFLAGS
 	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
 		# Sun/Oracle ld, we have a GNU toolchain, so get some things
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index b7152e95dc5e..41689a1904e1 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -31,6 +31,8 @@ src_prepare() {
 	# Respect CFLAGS, LDFLAGS
 	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
+
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# upstream doesn't support this, but we don't build with
 		# Sun/Oracle ld, we have a GNU toolchain, so get some things