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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3B331382C5 for ; Mon, 7 Dec 2020 13:12:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93E85E0980; Mon, 7 Dec 2020 13:12:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67197E0980 for ; Mon, 7 Dec 2020 13:12:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E2243410F4 for ; Mon, 7 Dec 2020 13:12:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C44EA46F for ; Mon, 7 Dec 2020 13:12:31 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1607346739.0ceaf9ef9abf10d32e6a21cea95f4fec73be9c32.marecki@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.16.0.ebuild X-VCS-Directories: app-arch/rpm/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 0ceaf9ef9abf10d32e6a21cea95f4fec73be9c32 X-VCS-Branch: master Date: Mon, 7 Dec 2020 13:12:31 +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: 4efd367b-5097-4643-a801-932ad034ffb0 X-Archives-Hash: 40df9c5a988cf135b0613ea502246b02 commit: 0ceaf9ef9abf10d32e6a21cea95f4fec73be9c32 Author: Marek Szuba gentoo org> AuthorDate: Mon Dec 7 12:44:17 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Dec 7 13:12:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ceaf9ef app-arch/rpm-4.16.0: migrate to lua-single.eclass Trivial, upstream autoconf scripts use pkg-config to find Lua. Supports lua5-2 only i.e. same as before the migration. No change to the mask. Closes: https://bugs.gentoo.org/752519 Signed-off-by: Marek Szuba gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 67132e47a62..f6c94ab43d7 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -3,9 +3,10 @@ EAPI=7 +LUA_COMPAT=( lua5-2 ) PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit autotools flag-o-matic perl-module python-single-r1 +inherit autotools flag-o-matic lua-single perl-module python-single-r1 DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="https://rpm.org @@ -20,7 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ RESTRICT="test" IUSE="acl caps doc dbus lua nls python selinux test +zstd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND="!app-arch/rpm5 app-arch/libarchive @@ -36,7 +38,7 @@ CDEPEND="!app-arch/rpm5 dev-libs/nss python? ( ${PYTHON_DEPS} ) nls? ( virtual/libintl ) - lua? ( dev-lang/lua:5.2 ) + lua? ( ${LUA_DEPS} ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) @@ -52,6 +54,7 @@ RDEPEND="${CDEPEND} " pkg_setup() { + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup }