sys-apps/keyutils: silence check for /etc/rpm & /usr/lib/rpm

Closes: https://bugs.gentoo.org/656446
Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
new file mode 100644 (file)
index 0000000..dafd7de
--- /dev/null
+++ b/sys-apps/keyutils/files/keyutils-1.5.10-silence-rpm-check.patch
@@ -0,0 +1,20 @@
+Hide
+
+> grep: /etc/rpm: No such file or directory
+> grep: /usr/lib/rpm: No such file or directory
+
+errors.
+
+Bug: https://bugs.gentoo.org/656446
+
+--- a/Makefile
++++ b/Makefile
+@@ -245,7 +245,7 @@ SRCBALL    := rpmbuild/SOURCES/$(TARBALL)
+ ZSRCBALL := rpmbuild/SOURCES/$(ZTARBALL)
+ 
+ BUILDID       := .local
+-dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm))
++dist  := $(word 2,$(shell grep -r "^%dist" /etc/rpm /usr/lib/rpm 2>/dev/null))
+ release       := $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release       := $(subst %{?dist},$(dist),$(release))
+ release       := $(subst %{?buildid},$(BUILDID),$(release))

diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index f2610937efef327f09acb3d4f93240d4b1a373db..eb922e7c5c42283b8993b159ab73dc16ccae74e7 100644 (file)
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.ebuild
@@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 PATCHES=(
        "${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
        "${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+       "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
        "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
        "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
 )

diff --git a/sys-apps/keyutils/keyutils-1.5.11.ebuild b/sys-apps/keyutils/keyutils-1.5.11.ebuild
index 4d30cfbe2eb8da60b40bb80f0456d168b424ec15..dc870fbcc6f4aa34461e49d7f98a757818996963 100644 (file)
--- a/sys-apps/keyutils/keyutils-1.5.11.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.11.ebuild
@@ -20,6 +20,7 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 PATCHES=(
        "${FILESDIR}"/${PN}-1.5.10-endian-check-1.patch
        "${FILESDIR}"/${PN}-1.5.10-makefile-fixup.patch
+       "${FILESDIR}"/${PN}-1.5.10-silence-rpm-check.patch #656446
        "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
        "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
 )