gentoo resync : 18.03.2018

6 files changed, 10 insertions, 373 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index c9595f823e0e..49072a28052d 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -2,12 +2,7 @@ AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017eba
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.11.0.1.tar.bz2 3670158 BLAKE2B 8190cd760ce86275a27a64aca7622340a2894f4f7aad0171425c7f5d3cfcf58e82c2a792f7d4687fff9270fe3f9c861027b6eea43f3602be8b12098dbccf408f SHA512 72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535
-DIST rpm-4.11.1.tar.bz2 3778922 BLAKE2B 81b41ac1c661d499267f68b4e3a5cca34a0b9f0e258fe48414069b8b8dd5197fde845da815b4d2e3ea3a75a51c65a0e72073ae961bb1cb548f4821c924b96326 SHA512 ef65b265e74e549c9525da9247a1c81a4fca2b47f49c80b155e8065f0191039b6c56be3ed92fd9dd7a88c36954039a5c1a613e2bfb45599eb9a79d06503a8587
-DIST rpm-4.11.2.tar.bz2 3988837 BLAKE2B 1f7c6c3af50bad2a5c1106867b162685dec9b08f66566fa1e23abb866fdd53dbd11652a65f6dddc6b32aaca60cc3fad8ec6e8054442e316125d5a192ee8e1ff3 SHA512 de3d8e6ca4981bcbf48f9db5f74c03afcc14a3f100a74a721a351183be8c5cc6052be6dce5809976b9aa348a79bfb5bc04b41930f75df4d6fc4021311301ef0e
 DIST rpm-4.12.0.1.tar.bz2 4129093 BLAKE2B 85addde70d031f179566771350f5907311cf61a077b647b5dbb75e1e157141e541cb7a236e5a1d4fce881d98eb7c0331a0eadd0ca1dd09e53d9d28dd954203bf SHA512 ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f
 EBUILD rpm-4.11.0.1.ebuild 2739 BLAKE2B 80664cf24466365a81eb4774a49a146327367b20c26fabc11c872ad8c4c22079235ae9dc0ece0956478668fcf47caca1215fe77674f7f06e778eea7003502ef6 SHA512 ecade45798b73e1a573edac06b60dbe0d0e2d4915a13beb41bbdfdc2596e208899bf6b7a36ad1144d65ebf1c186889c6f9928575ff7f5f14516deb5687b2d83a
-EBUILD rpm-4.11.1.ebuild 2750 BLAKE2B 94632c5c17aa232645d9b7d10934eff8e540c3f8d04698400972c8a822e02fc30b4af305ac33261323cc6e1dc9485972064faee714c80e12553ab911866f968e SHA512 3e31e3fae0961f95041d43a1fc4478c3c93309d7428e6daa3f7d56e1bdac10135f2a1e6c33d570b65a66048a8e0459515d1b40d1084a62dcf2b620dc3c246350
-EBUILD rpm-4.11.2-r1.ebuild 2849 BLAKE2B df9a6df5c08c2a9fa5a6fe006f505eae1fbb352928b42717e2d2291c91174492b316bb7813f5ef2c23b10778c077ba83b79074ca9c545c56d387d2ba71e46a91 SHA512 8b1fb11173ad640291d47b5abe43cfd5294bf2cfebb65172fcbe98869cd14fbe4284934d388cc51b8be8911aab1a50a444c40fb166bbe800dbfa7b970c105fbe
-EBUILD rpm-4.11.2.ebuild 2750 BLAKE2B 94632c5c17aa232645d9b7d10934eff8e540c3f8d04698400972c8a822e02fc30b4af305ac33261323cc6e1dc9485972064faee714c80e12553ab911866f968e SHA512 3e31e3fae0961f95041d43a1fc4478c3c93309d7428e6daa3f7d56e1bdac10135f2a1e6c33d570b65a66048a8e0459515d1b40d1084a62dcf2b620dc3c246350
-EBUILD rpm-4.12.0.1.ebuild 2879 BLAKE2B 55f735b86b70db7b1d07702d5bd436e02a363f2e5e7842445b1a46e1c5d66c594fe0df7a6c2e06e1f5db8d7f1de8e918087217cf7ce4efe459184d9378c0e792 SHA512 cb2a7ddf21a39cd5658291cd2237652a2aa6c81f3d276664dafc356d20cf0f1ba22a9cc5b8406141a1acee62e08a9ab4c00abd7afc6f32d7f514991bdcb8a3f3
-MISC metadata.xml 232 BLAKE2B c631433a9b129e3e3b7cd485e9ec345264bf2f22f7f64193d5955987c5b44339d36356c8e17c2ded1c8f771774a0811ee41f12ca699a947bf2faf183805c4c1b SHA512 23824ca618f16dec558197c0c853f3ebf5c0f1b034635242282bd40f01beea59cbac3b416e86f2eb4337942d9db945a2e1fd4fe52c88762b65749855762769fa
+EBUILD rpm-4.12.0.1.ebuild 2895 BLAKE2B d427a4186655dc4b84df4a74abd842237a0c7668f7a20c23791e6b8f2a6a8cedc1a260f94ce35b160f31b79f45732c750d0dff974320a8e4c597a626c675fe28 SHA512 3e31c722000ec68d734b43ba533eab59cef96dac93473e2bd7a01b9d19313f839c02725c785b500ae6a9529739d655e3afbe4f804edd7980dcd4282b5cae082b
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index c78052713743..097975e3adc2 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>suse@gentoo.org</email>
-	<name>SUSE</name>
-</maintainer>
 </pkgmetadata>
diff --git a/app-arch/rpm/rpm-4.11.1.ebuild b/app-arch/rpm/rpm-4.11.1.ebuild
deleted file mode 100644
index bb5f3723c57d..000000000000
--- a/app-arch/rpm/rpm-4.11.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.11.2-r1.ebuild b/app-arch/rpm/rpm-4.11.2-r1.ebuild
deleted file mode 100644
index 81e5f7aef1a7..000000000000
--- a/app-arch/rpm/rpm-4.11.2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# fix #492642
-	sed -i 's:@__PYTHON@:/usr/bin/python2:' macros.in || die "Fixing %__python failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.11.2.ebuild b/app-arch/rpm/rpm-4.11.2.ebuild
deleted file mode 100644
index bb5f3723c57d..000000000000
--- a/app-arch/rpm/rpm-4.11.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org"
-SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="nls python doc caps lua acl selinux"
-
-CDEPEND="!app-arch/rpm5
-	>=sys-libs/db-4.5:*
-	>=sys-libs/zlib-1.2.3-r1
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/popt-1.7
-	>=app-crypt/gnupg-1.2
-	dev-libs/elfutils
-	virtual/libintl
-	>=dev-lang/perl-5.8.8
-	dev-libs/nss
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
-	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
-		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
-		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
-
-	# fix #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-
-	eautoreconf
-
-	# Prevent automake maintainer mode from kicking in (#450448).
-	touch -r Makefile.am preinstall.am
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	econf \
-		--without-selinux \
-		--with-external-db \
-		--without-beecrypt \
-		$(use_enable python) \
-		$(use_with doc hackingdocs) \
-		$(use_enable nls) \
-		$(use_with lua) \
-		$(use_with caps cap) \
-		$(use_with acl)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	# remove la files
-	prune_libtool_files --all
-
-	mv "${ED}"/bin/rpm "${ED}"/usr/bin
-	rmdir "${ED}"/bin
-	# fix symlinks to /bin/rpm (#349840)
-	for binary in rpmquery rpmverify;do
-		ln -sf rpm "${ED}"/usr/bin/${binary}
-	done
-
-	use nls || rm -rf "${ED}"/usr/share/man/??
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CHANGES CREDITS GROUPS README*
-	if use doc; then
-		pushd doc/hacking/html
-		dohtml -p hacking -r .
-		popd
-		pushd doc/librpm/html
-		dohtml -p librpm -r .
-		popd
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
-	fi
-}
diff --git a/app-arch/rpm/rpm-4.12.0.1.ebuild b/app-arch/rpm/rpm-4.12.0.1.ebuild
index b57bd21fbbe5..e0418711eda3 100644
--- a/app-arch/rpm/rpm-4.12.0.1.ebuild
+++ b/app-arch/rpm/rpm-4.12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="nls python doc caps lua acl selinux"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 CDEPEND="!app-arch/rpm5
 	app-arch/libarchive
@@ -32,17 +33,15 @@ CDEPEND="!app-arch/rpm5
 	nls? ( virtual/libintl )
 	lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
 	acl? ( virtual/acl )
-	caps? ( >=sys-libs/libcap-2.0 )"
-
+	caps? ( >=sys-libs/libcap-2.0 )
+"
 DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-rpm )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
+	selinux? ( sec-policy/selinux-rpm )
 "
 
 src_prepare() {