From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B93A815808B for ; Sun, 6 Mar 2022 09:18:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62D4EE0839; Sun, 6 Mar 2022 09:18:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BEA7E0839 for ; Sun, 6 Mar 2022 09:18:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 190BC343233 for ; Sun, 6 Mar 2022 09:18:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B74E2D3 for ; Sun, 6 Mar 2022 09:18:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1646558307.8a4e5778b6ffb0ab2d7ddf1daac24a8312ae6d2d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/rpm/rpm-4.17.0-r1.ebuild app-arch/rpm/rpm-4.17.0.ebuild X-VCS-Directories: app-arch/rpm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8a4e5778b6ffb0ab2d7ddf1daac24a8312ae6d2d X-VCS-Branch: master Date: Sun, 6 Mar 2022 09:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bf0937e7-b38d-47ee-af36-1e63678dc001 X-Archives-Hash: 15781f9a09d91a53346155d3fee28df9 commit: 8a4e5778b6ffb0ab2d7ddf1daac24a8312ae6d2d Author: Sam James gentoo org> AuthorDate: Sun Mar 6 08:56:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 6 09:18:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4e5778 app-arch/rpm: fix automagic audit, readline dependencies Closes: https://bugs.gentoo.org/709276 Signed-off-by: Sam James gentoo.org> app-arch/rpm/{rpm-4.17.0.ebuild => rpm-4.17.0-r1.ebuild} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0-r1.ebuild similarity index 92% rename from app-arch/rpm/rpm-4.17.0.ebuild rename to app-arch/rpm/rpm-4.17.0-r1.ebuild index 19b33b3904ef..c2e3e35fb19e 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc # Tests are broken. See bug 657500 RESTRICT="test" -IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE="${LUA_REQUIRED_USE} python? ( ${PYTHON_REQUIRED_USE} )" @@ -38,12 +38,14 @@ DEPEND="!app-arch/rpm5 >=sys-libs/zlib-1.2.3-r1 virtual/libintl ${LUA_DEPS} + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) + readline? ( sys-libs/readline:= ) python? ( ${PYTHON_DEPS} ) nls? ( virtual/libintl ) - acl? ( virtual/acl ) - caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd:= ) " BDEPEND=" @@ -90,6 +92,7 @@ src_configure() { # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 econf \ --without-selinux \ + --disable-inhibit-plugin \ --with-crypto=libgcrypt \ $(use_enable berkdb bdb-ro) \ $(use_enable python) \ @@ -99,6 +102,8 @@ src_configure() { $(use_enable sqlite) \ $(use_with caps cap) \ $(use_with acl) \ + $(use_with audit) \ + $(use_with readline) \ $(use_enable zstd zstd $(usex zstd yes no)) } @@ -109,7 +114,7 @@ src_install() { find "${ED}" -name '*.la' -delete || die # fix symlinks to /bin/rpm (#349840) - for binary in rpmquery rpmverify;do + for binary in rpmquery rpmverify; do ln -sf rpm "${ED}"/usr/bin/${binary} || die done