summaryrefslogtreecommitdiff
path: root/app-arch/rpm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
commit6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree25413d1cb3a0cbfe36029db32398c0f333609215 /app-arch/rpm
parent9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
gentoo resync : 14.12.2020
Diffstat (limited to 'app-arch/rpm')
-rw-r--r--app-arch/rpm/Manifest4
-rw-r--r--app-arch/rpm/rpm-4.14.2.1-r1.ebuild2
-rw-r--r--app-arch/rpm/rpm-4.16.0.ebuild9
3 files changed, 9 insertions, 6 deletions
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index b8cd852b63bc..070e859a54ec 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,6 +5,6 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-EBUILD rpm-4.14.2.1-r1.ebuild 3461 BLAKE2B 9d822a8d3d59899a7d84fb206af11f5b8d0d9e4efc5202f2eecf49f682a48f3a217bc690ee2ed4bf9dacce5b053731ecae4b3403b00476faf149f4ec2adcc05d SHA512 d385a795e3413cc621af265fc0de080e36063f5a0f0fadfdedecb9dcb1d46d0fb5322cb4f68bc94f7fbcbe41dc2e73ac88d5bd8ffd7cbf194d7945d89d481d1d
-EBUILD rpm-4.16.0.ebuild 3363 BLAKE2B ea1259dee892910f0f590839816f6cfbbc99e0d4a1204812354fd9a73c48cfd960137dba14380381414c7a3b7d2e0405255df0349f52706a792b065c8fc9f0a7 SHA512 c15625d6f4235ab067dde4cf679c62393c7ad16af9d52f9315b09a36eced217b6bd782b1f6c5001d7c7031714bdc7b35d5c0e873f6114aeaffbdc0d9fcd83d45
+EBUILD rpm-4.14.2.1-r1.ebuild 3462 BLAKE2B f8905ac5a807746eb25507592625112aee78feccf478fb03063c3a506635a559f8601d3fca9a8b8dfaef051b00af8a8e3c06d70cb406f8b7a81a3d5bacc73ac3 SHA512 3be933e741e65926eb95616891d17327a1502bb052f2e80900c8d750428b3630e24967bc80f72b57a8dc80e7acf98278a16eaaa4953c02563bb7414a41180f35
+EBUILD rpm-4.16.0.ebuild 3454 BLAKE2B ffa372891087408e9bf9cc21720ad5450e3601cc58f27ec26d47dabba5a7840d55dab93a2861d95056b971f25a4e3786650472bd473766e487ea25daa36da6d2 SHA512 87b0f73bc8060bd351f7a6657632a23bdfc4b29cbdc576c33252742ebbb2440321592fabde36961b81cfa6a97213c64e2edd739a1cd876b30e3e5a6ff363f7d8
MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index f4a6a46bc5ea..22a48d51d444 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -36,7 +36,7 @@ CDEPEND="!app-arch/rpm5
dev-libs/nss
python? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
- lua? ( >=dev-lang/lua-5.1.0:*[deprecated] )
+ lua? ( >=dev-lang/lua-5.1.0:0=[deprecated] )
acl? ( virtual/acl )
caps? ( >=sys-libs/libcap-2.0 )
zstd? ( app-arch/zstd )
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 67132e47a629..f6c94ab43d7b 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
}