gentoo resync : 21.06.2020

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 9285c98346d7..3e5e518878ef 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -10,6 +10,5 @@ AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588e
 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-r1.ebuild 1728 BLAKE2B 1d12553b815b042f46da65d32ee9d31e6d475b28eecf607060830934739121fd7cfcfa7846c3f5ba1fcd4418125ee1c3f5bbaf4c7bc61e7595daf37b3c520286 SHA512 ba5e03642a85c89cf091d12b0c097c99e5c40892587d65fa4ad8390bb7828bfa9da4e61272075c4ea0ce2e910f2c40105d601074fd38f4d43af071434b3d1946
-EBUILD ltrace-0.7.3_p4.ebuild 1366 BLAKE2B b3f31392f8643006a79bd8007f97458fba5bbefbd7875c20364e95d9204a1b7af7c8dbb30e6a4d5fa138aa6c089fe6fd72bd0d16a631abe6e743e7c49c46397a SHA512 6d2b829a0694b8d59de72ace57391a0d1cb685c0d0f71806440055416ff80a1f5281e31d05531a2aa60ee96ed12d265f791a36de1c91dc1b7483eb32ff92c6b0
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1725 BLAKE2B 5b7a5b9f7aaeb0e0132ba550f35bee99ad18ea794e1242ce657049dad5346f1af9e51efb5492fa362b4aeb4d99f91ba15d518a972bc30b0d53bbc2fab18ec733 SHA512 eb2f6ca133e89b75a4ea1073a9cea10fc5b345861fc836c202aafa188669db062c77be99202af588a432f77aa1200500d5abc007a459b9b275f1a90f4b65ddcb
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 8ca6b5a1233e..0f327a431cd5 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="debug selinux test unwind"
 
 RDEPEND="virtual/libelf:=
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
deleted file mode 100644
index 2f15597a0646..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-LTRACE_V=${PV/_p*/}
-DB_V=${PV/*_p/}
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://gitlab.com/cespedes/ltrace"
-SRC_URI="
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-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() {
-	eapply "${WORKDIR}"/debian/patches/[0-9]*
-
-	default
-
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}