gentoo resync : 10.11.2019

3 files changed, 22 insertions, 16 deletions

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 733bd9abd3ce..5b412021904b 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,9 +1,9 @@
-AUX ltrace-0.7.3-alpha-protos.patch 849 BLAKE2B 694ebae21ebb658d87455d01cb82376d2a1f4854961d1bd04c351955259f1ae99cf436a8f885b9e1aaad8e842b021dc5818ad5f37667276589d9651d04a4deeb SHA512 014660bf48b7e5bf43b17fd3f82fb8a01f3855c16dc2fed76f6a9e4f348ec28beca0e7429ee10dc3aba3bd0bba143d21ee5b67ccc7057cb006ef694a6d38aa72
+AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4.ebuild 1356 BLAKE2B 21ff4a5e4b94063ea58710e38f93609dbbaee69452524573ebeee187c84be2a4ac43d9f700011acc68e9b1a98c5f3119f41147e410e07cf355d4dad99f2c2cbc SHA512 d9a179a1e1220b1b24d9736e59392b54a2417fb6ff5dea0919f45671b4688ff59f820b72fdc36aec4ab65a15d7e5fdd0e373817d172b18dabd0a34860a062c89
+EBUILD ltrace-0.7.3_p4.ebuild 1366 BLAKE2B b3f31392f8643006a79bd8007f97458fba5bbefbd7875c20364e95d9204a1b7af7c8dbb30e6a4d5fa138aa6c089fe6fd72bd0d16a631abe6e743e7c49c46397a SHA512 6d2b829a0694b8d59de72ace57391a0d1cb685c0d0f71806440055416ff80a1f5281e31d05531a2aa60ee96ed12d265f791a36de1c91dc1b7483eb32ff92c6b0
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
index 659952bdf148..7ff573272963 100644
--- a/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
+++ b/dev-util/ltrace/files/ltrace-0.7.3-alpha-protos.patch
@@ -2,13 +2,11 @@ Fix build failure on alpha:
   plt.c:32:12: error: dereferencing pointer to incomplete type ‘struct library_symbol’
     return sym->enter_addr;
             ^
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c     2012-11-10 13:43:55.000000000 +0100
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200
+--- a/sysdeps/linux-gnu/alpha/plt.c     2012-11-10 13:43:55.000000000 +0100
++++ b/sysdeps/linux-gnu/alpha/plt.c 2016-06-27 23:21:28.000000000 +0200
 @@ -23,0 +24 @@
 +#include "library.h"
-diff -U0 -raN ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c
---- ltrace-0.7.3_p4/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c   2016-06-27 23:30:08.000000000 +0200
-+++ foo/work/ltrace-0.7.3/sysdeps/linux-gnu/alpha/trace.c       2016-06-27 23:25:20.000000000 +0200
+--- a/sysdeps/linux-gnu/alpha/trace.c   2016-06-27 23:30:08.000000000 +0200
++++ b/sysdeps/linux-gnu/alpha/trace.c       2016-06-27 23:25:20.000000000 +0200
 @@ -29,0 +30 @@
 +#include "backend.h"
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index abe4ea0c259e..2f15597a0646 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 LTRACE_V=${PV/_p*/}
 DB_V=${PV/*_p/}
@@ -26,15 +26,23 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	test? ( dev-util/dejagnu )"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/${PN}-${LTRACE_V}
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
+	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
+	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
+)
+
 src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/[0-9]*
-	epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
-	epatch "${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
+	eapply "${WORKDIR}"/debian/patches/[0-9]*
+
+	default
+
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }