gentoo resync : 20.10.2021

3 files changed, 190 insertions, 0 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 6a94f155436b..c206ab40c693 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,6 +1,9 @@
 AUX rpm-4.16.0-autotools.patch 439 BLAKE2B 173435c31b0e06f47948711da00452d08dd644fcd8ed05e61f7ed31db56a670bacdb4ca1504dd64818752e30868541e3c50f8ab84833101607cf8c487cc93bba SHA512 fce8b036dfc55e5602721206788a1a755e2df8ef6b1cc94f047f7180f97efa750957ffa063cc18c274fff8b20f41181aa1c46c11ad2feed9689d50f4f696afea
 AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7edae47f8b9597a57f1b7e3b4848129dc50f1b001f5e8ae92f5f1c07cbe51330ccd8c15867e7624ea07756317eaca6 SHA512 8fd4c0ee785fb583172df7b7543ba790927a9d4953a0368bc4a641fe6e34b35011e3d3cbecaf80c58e79239e68bdab6797c8592f0c5185197df726a51e06d224
+AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
+DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
+EBUILD rpm-4.17.0.ebuild 3911 BLAKE2B dc7861a2407f74e2b53e18d49767c8e74cb03615f5e6338e7bba9edac6ff58e39df41d41d65ec95900556e1dc3e98a09c7c486e15d68e46713c706b16eb43dc0 SHA512 21fd70ad3bec10245f074b08120fa8869e55164b35781661f7d1fc80c7ff7ea91e6a9a0f32f5c65febac0862e8a1f7ae5a5ac661219ff0f66d164d696592f7d7
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
new file mode 100644
index 000000000000..5bff26b71290
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.17.0-libdir.patch
@@ -0,0 +1,32 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
+ 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)
+--- a/rpm.am
++++ b/rpm.am
+@@ -1,10 +1,10 @@
+ # 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 = 11:0:2
diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild
new file mode 100644
index 000000000000..2bc134671182
--- /dev/null
+++ b/app-arch/rpm/rpm-4.17.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools 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="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+	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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="!app-arch/rpm5
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	dev-libs/libgcrypt:=
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/libintl
+	${LUA_DEPS}
+	dbus? ( sys-apps/dbus )
+	sqlite? ( dev-db/sqlite:3 )
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	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.8.1-db-path.patch
+	eapply "${FILESDIR}"/${PN}-4.17.0-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 || die
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	econf \
+		--without-selinux \
+		--with-crypto=libgcrypt \
+		$(use_enable berkdb bdb-ro) \
+		$(use_enable python) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable dbus inhibit-plugin) \
+		$(use_enable sqlite) \
+		$(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
+		local docname
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "docs/${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
+}