From 2e34d110f164bf74d55fced27fe0000201b3eec5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 1 Oct 2020 23:05:41 +0100
Subject: gentoo resync : 01.10.2020

---
 app-arch/rpm/files/rpm-4.16.0-autotools.patch | 13 ++++++++++
 app-arch/rpm/files/rpm-4.16.0-libdir.patch    | 34 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 app-arch/rpm/files/rpm-4.16.0-autotools.patch
 create mode 100644 app-arch/rpm/files/rpm-4.16.0-libdir.patch

(limited to 'app-arch/rpm/files')

diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
new file mode 100644
index 000000000000..9b1f71ad86e5
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
@@ -0,0 +1,13 @@
+diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
+--- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:02:21.605485875 +0100
++++ rpm-4.16.0/configure.ac	2020-10-01 11:05:34.077157904 +0100
+@@ -552,9 +552,6 @@
+ 
+ AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
+-if test "x$have_bdb" = "xinternal"; then
+-    AC_CONFIG_SUBDIRS(db3)
+-fi
+ 
+ 
+ #=================
diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch
new file mode 100644
index 000000000000..c9f5f297233b
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.0-libdir.patch
@@ -0,0 +1,34 @@
+diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
+--- rpm-4.16.0.ORIG/configure.ac	2020-10-01 11:08:43.780842602 +0100
++++ rpm-4.16.0/configure.ac	2020-10-01 11:09:03.533705353 +0100
+@@ -935,13 +935,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.0.ORIG/rpm.am rpm-4.16.0/rpm.am
+--- rpm-4.16.0.ORIG/rpm.am	2020-10-01 11:08:43.743842859 +0100
++++ rpm-4.16.0/rpm.am	2020-10-01 11:09:03.533705353 +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:0:1
-- 
cgit v1.2.3