From f4fc10428424904caf2035cffc442195cb088b2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Jul 2021 10:27:13 +0100 Subject: gentoo resync : 28.07.2021 --- app-arch/rpm/files/rpm-4.11.0-autotools.patch | 14 ----------- app-arch/rpm/files/rpm-4.16.0-libdir.patch | 34 --------------------------- app-arch/rpm/files/rpm-4.9.1.2-libdir.patch | 31 ------------------------ 3 files changed, 79 deletions(-) delete mode 100644 app-arch/rpm/files/rpm-4.11.0-autotools.patch delete mode 100644 app-arch/rpm/files/rpm-4.16.0-libdir.patch delete mode 100644 app-arch/rpm/files/rpm-4.9.1.2-libdir.patch (limited to 'app-arch/rpm/files') diff --git a/app-arch/rpm/files/rpm-4.11.0-autotools.patch b/app-arch/rpm/files/rpm-4.11.0-autotools.patch deleted file mode 100644 index 2a2dcb129de3..000000000000 --- a/app-arch/rpm/files/rpm-4.11.0-autotools.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN rpm-4.11.0.1.old/configure.ac rpm-4.11.0.1/configure.ac ---- rpm-4.11.0.1.old/configure.ac 2013-03-26 18:38:35.137667450 +0100 -+++ rpm-4.11.0.1/configure.ac 2013-03-26 18:44:08.632673258 +0100 -@@ -824,10 +810,6 @@ - - AC_SUBST(OBJDUMP) - --if test "$with_external_db" = no; then -- AC_CONFIG_SUBDIRS(db3) --fi -- - AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) - AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no]) - AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes]) diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch deleted file mode 100644 index c9f5f297233b..000000000000 --- a/app-arch/rpm/files/rpm-4.16.0-libdir.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch deleted file mode 100644 index 221926494411..000000000000 --- a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac ---- rpm-4.9.1.2.old/configure.ac 2012-04-19 12:18:27.584725220 +0200 -+++ rpm-4.9.1.2/configure.ac 2012-04-19 12:34:50.302722933 +0200 -@@ -846,13 +846,7 @@ - AC_SUBST(RPMCANONGNU) - AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor]) - --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 -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am ---- rpm-4.9.1.2.old/rpm.am 2012-04-19 12:18:27.584725220 +0200 -+++ rpm-4.9.1.2/rpm.am 2012-04-19 12:24:49.035724332 +0200 -@@ -1,7 +1,5 @@ - # 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) -- cgit v1.2.3