gentoo resync : 04.05.2021

3 files changed, 2 insertions, 95 deletions

diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 29b98f9ac69c..a0f6ed1810dd 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
-EBUILD debugedit-4.16.1.2.ebuild 1778 BLAKE2B fb9b687a9f514cf77455b757e5e908d0f43672848b9f77a62f8040cb7c5951886e4b203ba9326b4a67a0db01c5a4272579fb498948cb817c179b006e6c2dbfe1 SHA512 2446eed2b524a754520fd974d018a2a0b4b88cb0ac5f4ee11bfd3b86e98faf77d1d153600f77fc67bdb865bc542da862f21387aa8bb9c9d0ed01cba87b26f7c9
-EBUILD debugedit-4.16.1.3.ebuild 1780 BLAKE2B 80b4150edd3bda060a17a2aed4fcf997f8802af356968966de23b34695f9ec77036a0b086b407efc749a6ab457f5ec1bb194ca0174c5ae3e8c9edd0181bcb7b7 SHA512 5195e2a9a6b28a734795ce90cebe8587f02ec9dce351d20798ec5437dbc0e26d9d0cf2dbd5543c7068a6d146cfb5ec17b89135fc4c2faceff8c2417978f25a59
+EBUILD debugedit-4.16.1.3.ebuild 1778 BLAKE2B fb9b687a9f514cf77455b757e5e908d0f43672848b9f77a62f8040cb7c5951886e4b203ba9326b4a67a0db01c5a4272579fb498948cb817c179b006e6c2dbfe1 SHA512 2446eed2b524a754520fd974d018a2a0b4b88cb0ac5f4ee11bfd3b86e98faf77d1d153600f77fc67bdb865bc542da862f21387aa8bb9c9d0ed01cba87b26f7c9
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.1.2.ebuild b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
deleted file mode 100644
index 17d121e9642e..000000000000
--- a/dev-util/debugedit/debugedit-4.16.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	>=dev-libs/elfutils-0.176-r1
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-bdb
-		--disable-nls
-		--disable-plugins
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/debugedit-4.16.1.3.ebuild b/dev-util/debugedit/debugedit-4.16.1.3.ebuild
index edd74490343d..17d121e9642e 100644
--- a/dev-util/debugedit/debugedit-4.16.1.3.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="