gentoo resync : 19.05.2018

5 files changed, 23 insertions, 15 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index e13439463fdd..b7eefc818e01 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,8 @@
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d
 DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e136cc1cba1d83091445e2a3b64588c0578f0165ffec01dda1cb1824c29dbdab05bb409232edede953f2a5e78 SHA512 624c3f27921b6df2eb8ff409a35fa9153c4571cd5f703e6cac18f024bccd5ff4acb81f88ca33f81d1046d9718dec7b2705e8940e80bb8447ec3e62a6fd5f8350
-EBUILD strace-4.20.ebuild 1960 BLAKE2B 65781937316df4e01de886b552b02834c37411a1c004de98b6e95e7dd2b6c9b11bfa27de5effc9661bbc341172d1cedae180e6488abca43c014e18949fccc3f3 SHA512 ca60303dcd6526df451f516dd519406e0c0160b92d400e1c44c1fac8e5df2874ae2dc8c9a2dc0297d6354246302e8bc7af20522d2422de2df858b3b1348da2fd
-EBUILD strace-4.21.ebuild 2109 BLAKE2B ab88781b7c02413b1c458a92bc424159e8302c2407d8d4c281ebb259e5e3ec5fa59df9c0ee6e69f6d639106b82f3af7c5f1d5282038433a8e4f401818bc10092 SHA512 5d5a2e17d23a2705e0011ab5ad1c5635f6548d81c7ff0f5592880794e711305a6af05a0f10797bbabc16d2b28edcf9326df513cc1b485fb62aad965c2fa46eb9
-EBUILD strace-4.22.ebuild 2043 BLAKE2B d7efddc5eb17c80c6941f1cf48aaedfcbfe363069d0726495fa00a3356a81ea393e1f94c360c6e8180052685ce7b5ea98c4d5802e1d9e7293fe40e84af15db80 SHA512 a3dabd8cbac78b1b84f72d22893a79da60f036d48d4e0424598f916f0f969ca74ea7064f08f3e31b195dd8a40cf38240135a49abd5e05c3c209220f4bffe0624
-EBUILD strace-9999.ebuild 2038 BLAKE2B 61c00720bd641dfb3f9fae3772c0c6313e904d07a8e635b1a5b3dfa263f0c810f237f34b87b6bba055e2876d10ddf793a4ca74aae40897a2beb4581be182623e SHA512 23e56bf7661d29d8331d51f68c732ceb2db55ff2a88927f4f9281beca96c0d30d39c3aa1e19f5509f22c3c2b40bfef6668e4cec0b95bdde53b9f9ac7fe1c3ba9
+EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
+EBUILD strace-4.21.ebuild 2129 BLAKE2B 087f7b3b5f850d5d587f4d0685ce8809d4fbc5475ce2cfe70c303e9f3d071cd9f094c0c4cb11a50c23381f7d48b63137fcc536f8a4fa3dcb1b5090e1adc63a67 SHA512 4e8beb9a870d0b415df2f71226ba4a439bd2f9528b1d533e1b385d35691d27b8fbd4d9ec0ead5f211d89dacaa642d73b47c0b648a9c65b18ea4cb78f67ca4852
+EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
+EBUILD strace-9999.ebuild 2150 BLAKE2B c9f5b515169763de2bbdc32ee6bb875391839a474d333977ae1f5022b380a09b232d79897f42c2f2e6e8404c643096bb733ec3ad1391dc80bccfd5e1b322f0f7 SHA512 ed67dd4e6dd1c35267ef6472cae76eabbb46cfa83ee674068d62fdf0c80f43cb3d6841ee22771f1eb832c147b621a2bb4f2f056ac9c072977b9f4ac026689650
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index e8dda4da74b5..4093a8fe8f0c 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
+HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/strace/strace-4.21.ebuild b/dev-util/strace/strace-4.21.ebuild
index 0a2a04c8fabb..62217d304567 100644
--- a/dev-util/strace/strace-4.21.ebuild
+++ b/dev-util/strace/strace-4.21.ebuild
@@ -11,13 +11,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
-	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
+HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
@@ -65,7 +64,10 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	econf $(use_with unwind libunwind)
+	# Don't require mpers support on non-multilib systems. #649560
+	econf \
+		--enable-mpers=check \
+		$(use_with unwind libunwind)
 }
 
 src_test() {
diff --git a/dev-util/strace/strace-4.22.ebuild b/dev-util/strace/strace-4.22.ebuild
index 98126c008d99..216395c678c1 100644
--- a/dev-util/strace/strace-4.22.ebuild
+++ b/dev-util/strace/strace-4.22.ebuild
@@ -9,13 +9,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
-	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
+HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
@@ -45,6 +44,7 @@ src_prepare() {
 	fi
 
 	filter-lfs-flags # configure handles this sanely
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
 	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
@@ -63,7 +63,10 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	econf $(use_with unwind libunwind)
+	# Don't require mpers support on non-multilib systems. #649560
+	econf \
+		--enable-mpers=check \
+		$(use_with unwind libunwind)
 }
 
 src_test() {
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 8e7cd87aff5f..f9e3966c500e 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -9,13 +9,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
-	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
+HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
@@ -45,7 +44,8 @@ src_prepare() {
 	fi
 
 	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
 	use elibc_musl && export ac_cv_header_stdc=no
@@ -63,7 +63,10 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	econf $(use_with unwind libunwind)
+	# Don't require mpers support on non-multilib systems. #649560
+	econf \
+		--enable-mpers=check \
+		$(use_with unwind libunwind)
 }
 
 src_test() {