gentoo resync : 28.04.2021

5 files changed, 203 insertions, 7 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index c5db7b862083..1e53a6070ccc 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,10 +1,13 @@
 AUX rpm-4.11.0-autotools.patch 503 BLAKE2B e95c7d3b550f24310dd21c6cfd78785017ebaffbad9c2a14947c43e784ddaa349cc77da9ee7fb9e1ce4ee2dec296b57234a74d56c9e08449e067bca403fa7ee6 SHA512 fdec043c3db2315aaabd3da91067a8d299ba564eaf53ba6465840352586f0660a5216cfd291b19398a53b2646f4a0b312076e14e56004d8e941d4ae279d54305
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
 AUX rpm-4.16.0-libdir.patch 1136 BLAKE2B 6099eb30744db0debf1f1eb0a99e2f88488c805527951b3d3e6315782d793cbca20afe3dded579c3869e90116393dd5c3e37d9fbf98c2c18a41e5c34196fab08 SHA512 c592d5d4430ed41b06dc98dafac2f81bbd63e60f29a34f8d6280b1a9b0b38cfaaf5cb091625a0ea29450b219a620f1426876d8ff3a6dc85258ce9e7a5df141fa
+AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
 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.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-EBUILD rpm-4.14.2.1-r1.ebuild 3460 BLAKE2B cc58ef05231af0d5b76b4ac6157a5def7646529000b34ef091717c73c3927c45567735538fd3199f5aff5e28d6e7d80d33e022d7ec5d7d64188cb13ffe5ea318 SHA512 1c86cd41ab1dcd1ee54eea05d99dbc7f04a0f7bab57f4a8190c1c8d6ea6d308a4e47c987c5b02acca091e1351847f04baef4219a6f1ea40a417296be43517c40
-EBUILD rpm-4.16.0.ebuild 3447 BLAKE2B 97c70da29498eab733fe8a2b33b19b7d3403e015bf85df9b8052e28497c6cac6fba53c0a1a3246ad1c4707689aa55e2244a8a9314b50a193eb288cf7b36c2839 SHA512 9b6ca679b277c9dfa66d63a488bc6410919cc14e0776d51f05cb1164617042b8dab88dc27f20c98dc45e5ad3e7a11409ed9f99650576201997ad41aef90b2f6a
+DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
+EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B bac45050bb09146ca2e266747f3b35bbf37bcd089d87800bf332ae348e087fb1443f4b86a4a8676083739f2fdd74bfe54c20ff99cb680a8147dc01987632b6ae SHA512 533a3687b8f56e219bb7cacb3dcc6f2dc29fa6546977d70c8e33c6ab97ad43ebfd00cdd9c4ca6188bf0cba1c4b40911b83e2c5ab1702c6911899a1a77d52b7e9
+EBUILD rpm-4.16.0.ebuild 3935 BLAKE2B ca9fcf934a6acdfc918ccf658b1959528c5c11d0b5784402f5f599743a0a9536bf054ef8eef3cf3d9b0dfd13ce0c63d5e961d97790fb423c418cd4e48e87faff SHA512 bcbeec2d9533cdb7c41dde254fed52b579e118834cfbe033b7afa283e9813d34bb10fbd63bd31097bf974bfb1ca1037611ffdba87087d405c2aead85fb3b7f6c
+EBUILD rpm-4.16.1.3.ebuild 3638 BLAKE2B 9f9268febc26d1f74b513e39c5317081f228f15285ae8e64f61c8e5c5afc5cca0bc1dbbfea53a569591ad4f25971c8ecaf44cce816f596439c5f5b996458e253 SHA512 174cff4ee03cfac24c23e90d47f48a070303a6fc77cf8631c22a449d9ebd9b5c1e16ec877b68d13033533ecd6f191b737724f87371e01604b711f996a4dc0967
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
new file mode 100644
index 000000000000..a2c95ff064e2
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch
@@ -0,0 +1,34 @@
+diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac
+--- rpm-4.16.1.3.ORIG/configure.ac	2021-04-13 19:32:35.630955569 +0100
++++ rpm-4.16.1.3/configure.ac	2021-04-13 19:32:54.939623251 +0100
+@@ -957,13 +957,7 @@
+ AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+ AC_SUBST(RUNDIR)
+ 
+-if test X"$prefix" = XNONE ; then
+-    usrprefix="$ac_default_prefix"
+-else
+-    usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+ 
+ AC_SUBST(OBJDUMP)
+diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am
+--- rpm-4.16.1.3.ORIG/rpm.am	2021-04-13 19:32:35.584956361 +0100
++++ rpm-4.16.1.3/rpm.am	2021-04-13 19:32:54.940623234 +0100
+@@ -1,10 +1,8 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
+ 
+ # Libtool version (current-revision-age) for all our libraries
+ rpm_version_info = 10:3:1
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index 093c7b5ef40d..d75365d36031 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 1742df61ac57..3e6a36bfe072 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-2 )
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools flag-o-matic lua-single perl-module python-single-r1
+inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="https://rpm.org
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~
 # Tests are broken. See bug 657500
 RESTRICT="test"
 
-IUSE="acl caps doc dbus lua nls python selinux test +zstd"
+IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -53,9 +53,16 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-rpm )
 "
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -69,7 +76,6 @@ src_prepare() {
 	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
 
 	eapply_user
-
 	eautoreconf
 
 	# Prevent automake maintainer mode from kicking in (#450448).
@@ -78,11 +84,16 @@ src_prepare() {
 
 src_configure() {
 	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	# NOTE: 4.16.0 warns:
+	# "configure: WARNING: Using the nss library with rpm is deprecated and support will be removed in a future release!"
+	# Only libgcrypt (default) and openssl are not deprecated. We should consider this.
+	# bug #780684
 	econf \
 		--without-selinux \
 		--with-crypto=nss \
 		$(use_enable python) \
 		$(use_enable nls) \
+		$(use_enable openmp) \
 		$(use_enable dbus inhibit-plugin) \
 		$(use_with lua) \
 		$(use_with caps cap) \
diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild
new file mode 100644
index 000000000000..32b827a153fc
--- /dev/null
+++ b/app-arch/rpm/rpm-4.16.1.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-2 )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+	app-arch/libarchive
+	>=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
+	dbus? ( sys-apps/dbus )
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/libgcrypt
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	lua? ( ${LUA_DEPS} )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	# Added USE=openmp and this check for bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-4.16.0-autotools.patch
+	eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	eapply "${FILESDIR}"/${P}-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# fix #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	eapply_user
+	eautoreconf
+
+	# Prevent automake maintainer mode from kicking in (#450448).
+	touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-crypto=libgcrypt \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl) \
+		$(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "doc/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500):
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+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}/" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+	fi
+}