[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 289323bce9083657d7fbee952a6af20e60db4b26 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Oct 6 13:30:22 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Oct 6 13:30:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289323bc app-arch/rpm: Stabilize 4.19.1.1 ppc64, #940920 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 294c690d67b7..79412f165585 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: a18984c5d49be8d3f39d3e496fe7fb07cb76d366 Author: Sam James gentoo org> AuthorDate: Tue May 28 13:18:16 2024 + Commit: Sam James gentoo org> CommitDate: Tue May 28 13:18:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18984c5 app-arch/rpm: Stabilize 4.19.1.1 ppc, #932914 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 72658f84349e..24b051845fce 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~riscv ~s390 ~sparc x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 3966a907bf2919ff9a237f22eb1ce487c356814a Author: Sam James gentoo org> AuthorDate: Tue May 28 12:34:10 2024 + Commit: Sam James gentoo org> CommitDate: Tue May 28 12:34:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3966a907 app-arch/rpm: Stabilize 4.19.1.1 x86, #932914 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 66a4d697f4d7..72658f84349e 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: e1ef2a48465717e3a347bdcb1e9fc70edeca6a98 Author: Michał Górny gentoo org> AuthorDate: Tue May 28 12:29:12 2024 + Commit: Michał Górny gentoo org> CommitDate: Tue May 28 12:29:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ef2a48 app-arch/rpm: Stabilize 4.19.1.1 arm64, #932914 Signed-off-by: Michał Górny gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 12afb9af1745..66a4d697f4d7 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 65998cd3abe9e5b4c65a5956435eabb0bbc19a60 Author: Michał Górny gentoo org> AuthorDate: Tue May 28 12:10:49 2024 + Commit: Michał Górny gentoo org> CommitDate: Tue May 28 12:10:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65998cd3 app-arch/rpm: Stabilize 4.19.1.1 arm, #932914 Signed-off-by: Michał Górny gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 30fa81d1ff98..12afb9af1745 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: d0191c52e9a6bb6a23b0d043e277d5f2cce2d54b Author: Matoro Mahri matoro tk> AuthorDate: Mon Apr 22 22:53:55 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 23 05:19:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0191c52 app-arch/rpm: Keyword 4.19.1.1 mips, #919936 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Viorel Munteanu gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index f21eb47dd235..32f3334408d4 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: e2a0139665a5d9a4ea830683e4592862612c4de7 Author: Matoro Mahri matoro tk> AuthorDate: Tue Apr 23 01:10:03 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 23 05:19:11 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a01396 app-arch/rpm: Keyword 4.19.1.1 sparc, #919936 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Viorel Munteanu gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 32f3334408d4..30fa81d1ff98 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~riscv ~s390 ~sparc ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 9454caea65308c00736898731c2b9f638b2abe6f Author: Matoro Mahri matoro tk> AuthorDate: Mon Apr 22 16:28:31 2024 + Commit: Viorel Munteanu gentoo org> CommitDate: Tue Apr 23 05:19:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9454caea app-arch/rpm: Keyword 4.19.1.1 hppa, #919936 Signed-off-by: Matoro Mahri matoro.tk> Signed-off-by: Viorel Munteanu gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 333a28624aab..f21eb47dd235 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~riscv ~s390 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f2a1c80a4a64ebf34880c8ba9cc3ecef9e91558e Author: Sam James gentoo org> AuthorDate: Fri Apr 5 05:38:29 2024 + Commit: Sam James gentoo org> CommitDate: Fri Apr 5 05:38:29 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a1c80a app-arch/rpm: Keyword 4.19.1.1 ppc, #919936 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index cc31c42b0a1f..333a28624aab 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~s390 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 266c34fb2b776055848d998648107d73d74373ed Author: Arthur Zamarin gentoo org> AuthorDate: Fri Apr 5 05:16:10 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Apr 5 05:16:10 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266c34fb app-arch/rpm: Keyword 4.19.1.1 ia64, #919936 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 6d8da3c170bc..cc31c42b0a1f 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~riscv ~s390 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~s390 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 3246ca54fb68eb5c790577522e3575d5d15875e0 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 23 05:58:44 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 23 05:59:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3246ca54 app-arch/rpm: Keyword 4.19.1.1 s390, #919936 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 99d64b8b5d10..6d8da3c170bc 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~riscv ~s390 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 2fa9a6227eff46243bafceec309995722605e6ff Author: Sam James gentoo org> AuthorDate: Sat Mar 23 05:58:40 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 23 05:58:40 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa9a622 app-arch/rpm: Keyword 4.19.1.1 arm, #919936 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index d57cff0ff5c7..7f278f65081b 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~loong ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~loong ~riscv ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: b8180f66fc6c03d1432537ff8d3d6a21c026d1a8 Author: Sam James gentoo org> AuthorDate: Sat Mar 23 05:58:45 2024 + Commit: Sam James gentoo org> CommitDate: Sat Mar 23 05:58:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8180f66 app-arch/rpm: Keyword 4.19.1.1 arm64, #919936 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild index 7f278f65081b..99d64b8b5d10 100644 --- a/app-arch/rpm/rpm-4.19.1.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~loong ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~riscv ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
commit: 07d89f7bad0ec7c412402314f5aa0e53bf7a967f Author: Joonas Niilola gentoo org> AuthorDate: Mon Mar 4 07:47:42 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 4 07:53:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d89f7b app-arch/rpm: drop 4.19.1 Signed-off-by: Joonas Niilola gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/files/rpm-4.19.1-musl-compat.patch | 59 --- app-arch/rpm/rpm-4.19.1.ebuild | 134 3 files changed, 194 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 21df9682d6aa..1598162f1521 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1,2 @@ DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d -DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642 diff --git a/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch deleted file mode 100644 index ca9f97257c70.. --- a/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch +++ /dev/null @@ -1,59 +0,0 @@ -musl doesn't implement GLOB_BRACE, simply disable it. - -https://bugs.gentoo.org/922286 -https://github.com/rpm-software-management/rpm/issues/2844 a/rpmio/rpmglob.c -+++ b/rpmio/rpmglob.c -@@ -33,6 +33,10 @@ - - #include "debug.h" - -+#ifndef GLOB_BRACE -+#define GLOB_BRACE 0 -+#endif -+ - /* Return 1 if pattern contains a magic char, see glob(7) for a list */ - static int ismagic(const char *pattern) - { - -From 57f3711846f44da0f37cbc5dd66e8fba80a3bee1 Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Mon, 18 Dec 2023 12:25:04 +0200 -Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag - -This regressed when we axed our internal glob copy in commit -66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only -an optimization so we can just skip it if not available. a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -350,6 +350,7 @@ if (LIBDW_FOUND) - set(HAVE_LIBDW 1) - endif() - -+check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) - check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) - if (NOT MAJOR_IN_SYSMACROS) - check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) a/config.h.in -+++ b/config.h.in -@@ -100,6 +100,7 @@ - #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ - #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ - #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ -+#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ - #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ - #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ - #cmakedefine RUNDIR @rundir@ a/rpmio/rpmglob.c -+++ b/rpmio/rpmglob.c -@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, - gflags |= GLOB_BRACE; - if (home != NULL && strlen(home) > 0) - gflags |= GLOB_TILDE; -+#if HAVE_GLOB_ONLYDIR - if (dir_only) - gflags |= GLOB_ONLYDIR; -+#endif - if (flags & RPMGLOB_NOCHECK) - gflags |= GLOB_NOCHECK; - diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild deleted file mode 100644 index bac0276f3d5c.. --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR=emake -LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake lua-single python-single-r1 toolchain-funcs - -DESCRIPTION="The RPM Package Manager" -HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; -SRC_URI=" - https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 -" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~loong ~riscv ~sparc ~x86" -IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} ) -" -# Tests run against a Fedora container image, which needs to be pu
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
commit: cbddeb9984d61e08cff7c7b5f2e416251d84a5a7 Author: Takuya Wakazono gmail com> AuthorDate: Thu Feb 8 12:33:02 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 4 07:53:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbddeb99 app-arch/rpm: add 4.19.1.1 bump + fix DEPEND ordering Closes: https://github.com/gentoo/gentoo/pull/35227 Signed-off-by: Takuya Wakazono gmail.com> Signed-off-by: Joonas Niilola gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch | 17 +++ app-arch/rpm/rpm-4.19.1.1.ebuild | 134 ++ 3 files changed, 152 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 9a58e89006b0..21df9682d6aa 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1,3 @@ DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c +DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642 diff --git a/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch new file mode 100644 index ..441689febd5d --- /dev/null +++ b/app-arch/rpm/files/rpm-4.19.1.1-musl-compat.patch @@ -0,0 +1,17 @@ +musl doesn't implement GLOB_BRACE, simply disable it. + +https://bugs.gentoo.org/922286 +https://github.com/rpm-software-management/rpm/issues/2844 +--- a/rpmio/rpmglob.c b/rpmio/rpmglob.c +@@ -33,6 +33,10 @@ + + #include "debug.h" + ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ + static int ismagic(const char *pattern) + { diff --git a/app-arch/rpm/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild new file mode 100644 index ..d57cff0ff5c7 --- /dev/null +++ b/app-arch/rpm/rpm-4.19.1.1.ebuild @@ -0,0 +1,134 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake lua-single python-single-r1 toolchain-funcs + +DESCRIPTION="The RPM Package Manager" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; +SRC_URI=" + https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~loong ~riscv ~x86" +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sequoia +sqlite" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Tests run against a Fedora container image, which needs to be pulled. +RESTRICT="test" + +DEPEND=" + ${LUA_DEPS} + >=app-arch/bzip2-1.0.1 + app-arch/libarchive:= + app-arch/xz-utils + app-arch/zstd:= + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + >=dev-libs/popt-1.7 + sys-apps/file + sys-libs/readline:= + >=sys-libs/zlib-1.2.3-r1 + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + nls? ( virtual/libintl ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) + sequoia? ( app-crypt/rpm-sequoia ) + !sequoia? ( dev-libs/libgcrypt:= ) + sqlite? ( dev-db/sqlite:3 ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.19.0-libdir.patch + "${FILESDIR}"/${P}-musl-compat.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + # r
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 59fa7bc73e001a0035bc27f50eaff336fc1b8e3d Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Feb 23 19:06:00 2024 + Commit: Sam James gentoo org> CommitDate: Sat Feb 24 07:07:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fa7bc7 app-arch/rpm: keyword 4.19.1 for sparc, bug #919936 Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild index a011006febb8..bac0276f3d5c 100644 --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~loong ~riscv ~x86" +KEYWORDS="~alpha ~amd64 ~loong ~riscv ~sparc ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: b19fda22ba177985a19d629c57ca27e4b819036f Author: Takuya Wakazono gmail com> AuthorDate: Thu Jan 18 15:03:27 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 2 03:56:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19fda22 app-arch/rpm: drop 4.18.0 Signed-off-by: Takuya Wakazono gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34883 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/rpm-4.18.0.ebuild | 165 - 2 files changed, 166 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index dfd3723ff544..9a58e89006b0 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1,2 @@ -DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642 diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild deleted file mode 100644 index 3dda9821a973.. --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools lua-single perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; -SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" - -# Tests are broken. See bug #657500 -RESTRICT="test" - -IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" -REQUIRED_USE="${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - ${LUA_DEPS} - !app-arch/rpm5 - app-arch/libarchive:= - >=app-arch/bzip2-1.0.1 - app-arch/xz-utils - >=app-crypt/gnupg-1.2 - >=dev-lang/perl-5.8.8 - dev-libs/elfutils - dev-libs/libgcrypt:= - >=dev-libs/popt-1.7 - sys-apps/file - >=sys-libs/zlib-1.2.3-r1 - virtual/libintl - acl? ( virtual/acl ) - audit? ( sys-process/audit ) - caps? ( >=sys-libs/libcap-2.0 ) - dbus? ( sys-apps/dbus ) - readline? ( sys-libs/readline:= ) - sqlite? ( dev-db/sqlite:3 ) - python? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - zstd? ( app-arch/zstd:= ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - nls? ( sys-devel/gettext ) - test? ( sys-apps/fakechroot ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-rpm ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.1-db-path.patch - "${FILESDIR}"/${PN}-4.17.0-libdir.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - lua-single_pkg_setup - - use python && python-single-r1_pkg_setup - - # Added USE=openmp and this check for bug #779769 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - # bug #356769 - sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" - # bug #492642 - sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" - - # Prevent automake maintainer mode from kicking in (bug #450448). - #touch -r Makefile.am preinstall.am || die - - eautoreconf -} - -src_configure() { - # rpm no longer supports berkdb, but has readonly support. - # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 - econf \ - --enable-libelf \ - --without-selinux \ - --disable-inhibit-plugin \ - --with-crypto=libgcrypt \ - $(use_enable berkdb bdb-ro) \ -
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
commit: 191bd72e6913e1c56736e801e0fb9e1f7262cfb2 Author: Takuya Wakazono gmail com> AuthorDate: Thu Jan 18 15:00:44 2024 + Commit: Sam James gentoo org> CommitDate: Fri Feb 2 03:56:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191bd72e app-arch/rpm: fix musl build Closes: https://bugs.gentoo.org/888954 Closes: https://bugs.gentoo.org/922286 Signed-off-by: Takuya Wakazono gmail.com> Signed-off-by: Sam James gentoo.org> app-arch/rpm/files/rpm-4.18.1-musl-nls.patch| 42 ++ app-arch/rpm/files/rpm-4.19.1-musl-compat.patch | 59 + app-arch/rpm/rpm-4.18.1.ebuild | 1 + app-arch/rpm/rpm-4.19.1.ebuild | 2 + 4 files changed, 104 insertions(+) diff --git a/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch new file mode 100644 index ..7d1fde28bacf --- /dev/null +++ b/app-arch/rpm/files/rpm-4.18.1-musl-nls.patch @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/888954 +https://github.com/rpm-software-management/rpm/commit/f401979a4c4829d68e9614860644bdb74b6dda66 + +From da222f0d82721d17e57d491d2749a4bc44754b9d Mon Sep 17 00:00:00 2001 +From: Takuya Wakazono +Date: Thu, 18 Jan 2024 18:41:11 +0900 +Subject: [PATCH] Don't use _nl_msg_cat_cntr if __GLIC__ is not defined + +musl doesn't need to use libintl from GNU gettext because it has its +own NLS implementation. Assuming _nl_msg_cat_cntr exists breaks the +build against the musl system. +--- a/lib/tagexts.c b/lib/tagexts.c +@@ -532,7 +532,7 @@ static int filerequireTag(Header h, rpmtd td, headerGetFlags hgflags) + + /* I18N look aside diversions */ + +-#if defined(ENABLE_NLS) ++#if defined(ENABLE_NLS) && (defined(__GLIBC__) || !defined(__linux__)) + extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */ + #endif + static const char * const language = "LANGUAGE"; +@@ -569,7 +569,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) + /* change to en_US for msgkey -> msgid resolution */ + langval = getenv(language); + (void) setenv(language, "en_US", 1); ++#if defined(__GLIBC__) || !defined(__linux__) + ++_nl_msg_cat_cntr; ++#endif + + msgid = NULL; + for (domain = dstring; domain != NULL; domain = de) { +@@ -584,7 +586,9 @@ static int i18nTag(Header h, rpmTag tag, rpmtd td, headerGetFlags hgflags) + (void) setenv(language, langval, 1); + else + unsetenv(language); ++#if defined(__GLIBC__) || !defined(__linux__) + ++_nl_msg_cat_cntr; ++#endif + + if (domain && msgid) { + td->data = dgettext(domain, msgid); diff --git a/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch new file mode 100644 index ..ca9f97257c70 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.19.1-musl-compat.patch @@ -0,0 +1,59 @@ +musl doesn't implement GLOB_BRACE, simply disable it. + +https://bugs.gentoo.org/922286 +https://github.com/rpm-software-management/rpm/issues/2844 +--- a/rpmio/rpmglob.c b/rpmio/rpmglob.c +@@ -33,6 +33,10 @@ + + #include "debug.h" + ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ + static int ismagic(const char *pattern) + { + +From 57f3711846f44da0f37cbc5dd66e8fba80a3bee1 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen +Date: Mon, 18 Dec 2023 12:25:04 +0200 +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag + +This regressed when we axed our internal glob copy in commit +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only +an optimization so we can just skip it if not available. +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -350,6 +350,7 @@ if (LIBDW_FOUND) + set(HAVE_LIBDW 1) + endif() + ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) + if (NOT MAJOR_IN_SYSMACROS) + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) +--- a/config.h.in b/config.h.in +@@ -100,6 +100,7 @@ + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ + #cmakedefine RUNDIR @rundir@ +--- a/rpmio/rpmglob.c b/rpmio/rpmglob.c +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, + gflags |= GLOB_BRACE; + if (home != NULL && strlen(home) > 0) + gflags |= GLOB_TILDE; ++#if HAVE_GLOB_ONLYDIR + if (dir_only) + gflags |= GLOB_ONLYDIR; ++#endif + if (flags & RPMGLOB_NOCHECK) + gflags |= GLOB_NOCHECK; + diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 8695d7cf06c8..505
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: bd92ddc826d7ab1a1d7ed49ecb05b7b2a7885008 Author: WANG Xuerui gentoo org> AuthorDate: Wed Jan 3 09:00:57 2024 + Commit: WANG Xuerui gentoo org> CommitDate: Wed Jan 3 09:10:59 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd92ddc8 app-arch/rpm: keyword 4.19.1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-arch/rpm/rpm-4.19.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild index 9a85d2ed9d75..a2e45f9781bb 100644 --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="~amd64 ~loong ~riscv ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 62b741ece5d4cde926268762ffeade2d89137f0d Author: Jakov Smolić gentoo org> AuthorDate: Sat Dec 23 16:54:38 2023 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Dec 23 16:54:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b741ec app-arch/rpm: Keyword 4.19.1 riscv, #919936 Signed-off-by: Jakov Smolić gentoo.org> app-arch/rpm/rpm-4.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild index b9ea43fced06..9a85d2ed9d75 100644 --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 5d703b459988d0c966fe1655dfb1e382845e6748 Author: Joonas Niilola gentoo org> AuthorDate: Fri Dec 22 07:50:16 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Dec 22 07:50:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d703b45 app-arch/rpm: Keyword 4.19.1 x86, #919936 Signed-off-by: Joonas Niilola gentoo.org> app-arch/rpm/rpm-4.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild index 978201150776..b9ea43fced06 100644 --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 4d0e37a0837561d09a8f4e44e1f30740efe13846 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 06:23:15 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 06:23:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0e37a0 app-arch/rpm: drop most keywords Needs rekeywording given it's a substantial rewrite of the ebuild + build system. Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.19.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild index a63e0576b9a7..978201150776 100644 --- a/app-arch/rpm/rpm-4.19.1.ebuild +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64" IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
commit: 8634659b0403f663819078f71936e259f0e7e159 Author: Takuya Wakazono gmail com> AuthorDate: Mon Nov 20 15:46:10 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 06:20:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8634659b app-arch/rpm: add 4.19.1 - switch from autotools to cmake - add rpm-sequoia as a new dependency - remove USE flags that do not have proper compile options - remove old patches and workarounds Closes: https://bugs.gentoo.org/917034 Signed-off-by: Takuya Wakazono gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33742 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/files/rpm-4.19.0-libdir.patch | 13 +++ app-arch/rpm/metadata.xml | 12 ++- app-arch/rpm/rpm-4.19.1.ebuild | 132 + 4 files changed, 157 insertions(+), 1 deletion(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index fe632121d059..dfd3723ff544 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1,3 @@ DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c +DIST rpm-4.19.1.tar.bz2 5940447 BLAKE2B b40de875d79a48d0c54aef86bb8b3cb0312cbb4eb5b1382fcc147669c5d559c9a91fcfb3b4160fe1ad34595bc553132d1af34fe70a45f868b7f06a1635c3fe1e SHA512 12e6c7294a98032418ec9a0510a8183658483fe713d67e6890a9c0da44748371df45a26af6055d08470b85b5dec0cf94795d17c5b3e11db08b20ef07e8e06642 diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch new file mode 100644 index ..9899827c985e --- /dev/null +++ b/app-arch/rpm/files/rpm-4.19.0-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c164e9c52..5738c821f 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) + option(WITH_IMAEVM "Build with IMA support" OFF) + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) + +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/libexec/rpm" CACHE PATH "rpm home") + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") + + # Emulate libtool versioning. Before a public release: diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml index 43a5b10a145b..8e808eda79fe 100644 --- a/app-arch/rpm/metadata.xml +++ b/app-arch/rpm/metadata.xml @@ -1,8 +1,18 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + pastalia...@gmail.com + Takuya Wakazono + + + proxy-ma...@gentoo.org + Proxy Maintainers + rpm-software-management/rpm + + Use app-crypt/rpm-sequoia instead of the deprecated internal parser + diff --git a/app-arch/rpm/rpm-4.19.1.ebuild b/app-arch/rpm/rpm-4.19.1.ebuild new file mode 100644 index ..a63e0576b9a7 --- /dev/null +++ b/app-arch/rpm/rpm-4.19.1.ebuild @@ -0,0 +1,132 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR=emake +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake lua-single python-single-r1 toolchain-funcs + +DESCRIPTION="The RPM Package Manager" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; +SRC_URI=" + https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sequoia +sqlite" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Tests run against a Fedora container image, which needs to be pulled. +RESTRICT="test" + +DEPEND=" + ${LUA_DEPS} + app-arch/libarchive:= + >=app-arch/bzip2-1.0.1 + app-arch/xz-utils + app-arch/zstd:= + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + >=dev-libs/popt-1.7 + sys-apps/file + sys-libs/readline:= + >=sys-libs/zlib-1.2.3-r1 + vir
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/files/, app-arch/rpm/
commit: 184cddf3f85fde7effacd6c8bc5f8f4801062163 Author: Denis Pronin yandex ru> AuthorDate: Mon Oct 23 14:44:31 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 14 08:14:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=184cddf3 app-arch/rpm: fix building RPM package with clang Signed-off-by: Denis Pronin yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/33471 Signed-off-by: Sam James gentoo.org> app-arch/rpm/files/rpm-4.8.1-clang.patch | 52 app-arch/rpm/rpm-4.18.1.ebuild | 1 + 2 files changed, 53 insertions(+) diff --git a/app-arch/rpm/files/rpm-4.8.1-clang.patch b/app-arch/rpm/files/rpm-4.8.1-clang.patch new file mode 100644 index ..714fbc09b534 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.8.1-clang.patch @@ -0,0 +1,52 @@ +https://github.com/rpm-software-management/rpm/commit/6ad8a71407b173b6c50d389f01edd8a4aecd6807 +--- a/lib/fsm.c b/lib/fsm.c +@@ -1015,27 +1015,28 @@ + } + + setmeta: +- /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); +- if (!rc && fd == -1 && mayopen) { +- int flags = O_RDONLY; +- /* Only follow safe symlinks, and never on temporary files */ +- if (fp->suffix) +- flags |= AT_SYMLINK_NOFOLLOW; +- fd = fsmOpenat(di.dirfd, fp->fpath, flags, +- S_ISDIR(fp->sb.st_mode)); +- if (fd < 0) +- rc = RPMERR_OPEN_FAILED; +- } ++ { ++ /* Special files require path-based ops */ ++ int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ if (!rc && fd == -1 && mayopen) { ++ int flags = O_RDONLY; ++ /* Only follow safe symlinks, and never on temporary files */ ++ if (fp->suffix) ++ flags |= AT_SYMLINK_NOFOLLOW; ++ fd = fsmOpenat(di.dirfd, fp->fpath, flags, ++ S_ISDIR(fp->sb.st_mode)); ++ if (fd < 0) ++ rc = RPMERR_OPEN_FAILED; ++ } ++ if (!rc && fp->setmeta) { ++ rc = fsmSetmeta(fd, di.dirfd, fp->fpath, ++ fi, plugins, fp->action, ++ &fp->sb, nofcaps); ++ } + +- if (!rc && fp->setmeta) { +- rc = fsmSetmeta(fd, di.dirfd, fp->fpath, +- fi, plugins, fp->action, +- &fp->sb, nofcaps); +- } +- +- if (fd != firstlinkfile) +- fsmClose(&fd); ++ if (fd != firstlinkfile) ++ fsmClose(&fd); ++ } + } + + /* Notify on success. */ diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index b05d5a57334b..27f9c7e5e81a 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -63,6 +63,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.8.1-clang.patch "${FILESDIR}"/${PN}-4.17.0-libdir.patch )
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: ece42c95850bb1b9aba0e502940ac01bf3447a30 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 29 14:08:56 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 29 14:08:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece42c95 app-arch/rpm: Stabilize 4.18.1 ppc, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 06e0ffbbbef2..b05d5a57334b 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: cc341c28ba4276393093ad5d0bb53ce53f99f6f6 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 22 17:46:16 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 22 17:46:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc341c28 app-arch/rpm: Stabilize 4.18.1 arm64, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 870ab6e0efcd..06e0ffbbbef2 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 82fe0835a5805f9823bb89e37948d40a458116f1 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 22 12:14:04 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 22 12:14:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fe0835 app-arch/rpm: Stabilize 4.18.1 amd64, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 388590a098f9..870ab6e0efcd 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: e40c15766635e8c7afa363a7c7e25927a82f8803 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 22 09:47:30 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 22 09:47:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40c1576 app-arch/rpm: Stabilize 4.18.1 ppc64, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index f15c24c9661e..388590a098f9 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 2c142c04a89075be20e50d010273807f45079613 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 22 09:14:44 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 22 09:14:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c142c04 app-arch/rpm: Stabilize 4.18.1 arm, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index 0eeb5edc4ae6..f15c24c9661e 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 9ee91944f7f7eb3f79057e853b5f8c7a396d9239 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 22 09:14:43 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 22 09:14:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee91944 app-arch/rpm: Stabilize 4.18.1 x86, #914515 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild index c503e5487ff0..0eeb5edc4ae6 100644 --- a/app-arch/rpm/rpm-4.18.1.ebuild +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" REQUIRED_USE=" ${LUA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f6ac5bdf254c71318f8a3b3fe4948adf1c1a4c86 Author: Sam James gentoo org> AuthorDate: Sun Aug 13 06:48:58 2023 + Commit: Sam James gentoo org> CommitDate: Sun Aug 13 06:49:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ac5bdf app-arch/rpm: add 4.18.1 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/rpm-4.18.1.ebuild | 170 + 2 files changed, 171 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 36f8cd7a71c0..fe632121d059 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1 +1,2 @@ DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec +DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild new file mode 100644 index ..c503e5487ff0 --- /dev/null +++ b/app-arch/rpm/rpm-4.18.1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; +SRC_URI=" + https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 +" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Tests are broken. See bug #657500 +RESTRICT="test" + +DEPEND=" + ${LUA_DEPS} + !app-arch/rpm5 + app-arch/libarchive:= + >=app-arch/bzip2-1.0.1 + app-arch/xz-utils + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + dev-libs/libgcrypt:= + >=dev-libs/popt-1.7 + sys-apps/file + >=sys-libs/zlib-1.2.3-r1 + virtual/libintl + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + python? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + zstd? ( app-arch/zstd:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) + test? ( sys-apps/fakechroot ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.17.0-libdir.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # bug #356769 + sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" + # bug #492642 + sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" + + # Prevent automake maintainer mode from kicking in (bug #450448). + #touch -r Makefile.am preinstall.am || die + + eautoreconf +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 + local myeconfargs=( + --enable-libelf + --without-selinux + --disable-inhibit-plugin + --with-crypto=libgcrypt + $(use_enable berkdb bdb-ro) + $(use_enable python) + $(use_enable nls) + $(use_enable openmp) + $(use_enable dbus inhibit-plugin) + $(use_enable sqlite) + $(use_with caps cap) + $(use_with acl) + $(use_with audit) + $(use_with readline) + $(use_enable zstd zstd $(usex zstd yes no)) + ) + + econf "${myecon
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 7a9cd70aacc9c2f07581f04ae723cbfa02938da3 Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu Feb 23 13:52:44 2023 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Feb 23 13:52:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9cd70a app-arch/rpm: enable py3.11 Signed-off-by: Andrew Ammerlaan gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index 9019cd542c75..1f181445323b 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: c38cf33a34b890022416fe0d560be2ef50440c3e Author: WANG Xuerui gentoo org> AuthorDate: Tue Nov 29 14:48:18 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Tue Nov 29 15:57:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38cf33a app-arch/rpm: keyword 4.18.0 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index fc81ed9a8eb9..c5e8d10e5576 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 1dbbdcdb43b2c2dab997bc818c96b315e48fff77 Author: John Helmert III gentoo org> AuthorDate: Tue Oct 25 21:37:09 2022 + Commit: John Helmert III gentoo org> CommitDate: Tue Oct 25 21:55:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbbdcdb app-arch/rpm: drop 4.17.1 Bug: https://bugs.gentoo.org/866716 Signed-off-by: John Helmert III gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/rpm-4.17.1.ebuild | 161 - 2 files changed, 162 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index b49e65037fc9..36f8cd7a71c0 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1 @@ -DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild deleted file mode 100644 index a4ee4d202c0d.. --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools lua-single perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org - https://github.com/rpm-software-management/rpm"; -SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" - -# Tests are broken. See bug 657500 -RESTRICT="test" - -IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" -REQUIRED_USE="${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="!app-arch/rpm5 - app-arch/libarchive:= - >=app-arch/bzip2-1.0.1 - app-arch/xz-utils - >=app-crypt/gnupg-1.2 - >=dev-lang/perl-5.8.8 - dev-libs/elfutils - dev-libs/libgcrypt:= - >=dev-libs/popt-1.7 - sys-apps/file - >=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 ) - python? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - zstd? ( app-arch/zstd:= ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext ) - test? ( sys-apps/fakechroot ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rpm ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.1-db-path.patch - "${FILESDIR}"/${PN}-4.17.0-libdir.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - lua-single_pkg_setup - - use python && python-single-r1_pkg_setup - - # Added USE=openmp and this check for bug #779769 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - - # bug #356769 - sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" - # bug #492642 - sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" - - # Prevent automake maintainer mode from kicking in (bug #450448). - #touch -r Makefile.am preinstall.am || die - - eautoreconf -} - -src_configure() { - # rpm no longer supports berkdb, but has readonly support. - # 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) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_enable dbus inhibit-plugin) \ - $(use_enable sqlite) \ - $(use_with caps cap) \ - $(use_with acl) \ - $(use_with audit) \ - $(use_enable zstd zstd $(usex zstd yes no)) -} - -src_test() { - # Known to fail with FEATURES=usersandbox (bug #657500) -
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: e7c9157454e85047431fc5603ebac8b8a0a5cae0 Author: Sam James gentoo org> AuthorDate: Tue Oct 25 12:48:25 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 25 12:48:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c91574 app-arch/rpm: Stabilize 4.18.0 amd64, #877857 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index ae507ae0f39c..fc81ed9a8eb9 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 18f125bfe9b399e392beb411afae885393d07257 Author: Sam James gentoo org> AuthorDate: Tue Oct 25 09:07:32 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 25 09:07:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f125bf app-arch/rpm: Stabilize 4.18.0 x86, #877857 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index b0907a49357b..ae507ae0f39c 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 094cd850cf9a8755a79881e7120f28aca1be15b8 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Oct 22 07:31:08 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Oct 22 07:31:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094cd850 app-arch/rpm: Stabilize 4.18.0 ppc, #877857 Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index 132084c716a4..b0907a49357b 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 100097b3f1973cd47c1e897bcfa0a54a5949b447 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Oct 21 19:07:45 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 21 19:07:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100097b3 app-arch/rpm: Stabilize 4.18.0 arm, #877857 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index 7d08e74ccb97..3a1f3993ee9c 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: ab137d2c9ec04b310f307f8fc3e401c2fef53ab3 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Oct 21 19:07:44 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 21 19:07:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab137d2c app-arch/rpm: Stabilize 4.18.0 ppc64, #877857 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index a9fd82c33c5d..7d08e74ccb97 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 46a43c1bcb6cd892ff88101c5d75b8a796b900f4 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Oct 21 19:07:45 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 21 19:07:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a43c1b app-arch/rpm: Stabilize 4.18.0 arm64, #877857 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.18.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild index 3a1f3993ee9c..132084c716a4 100644 --- a/app-arch/rpm/rpm-4.18.0.ebuild +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug #657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 5078a9788b7ff36a1af60ad7a701d958e37206e1 Author: John Helmert III gentoo org> AuthorDate: Fri Oct 21 17:53:55 2022 + Commit: John Helmert III gentoo org> CommitDate: Fri Oct 21 17:55:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5078a978 app-arch/rpm: drop 4.17.0-r2 Bug: https://bugs.gentoo.org/830380 Signed-off-by: John Helmert III gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/rpm-4.17.0-r2.ebuild | 158 -- 2 files changed, 159 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 8bc829917e95..b49e65037fc9 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1,2 @@ -DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec diff --git a/app-arch/rpm/rpm-4.17.0-r2.ebuild b/app-arch/rpm/rpm-4.17.0-r2.ebuild deleted file mode 100644 index 77e2508c4dd6.. --- a/app-arch/rpm/rpm-4.17.0-r2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{3,4} ) -PYTHON_COMPAT=( python3_{8,9,10} ) - -inherit autotools lua-single perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org - https://github.com/rpm-software-management/rpm"; -SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 - http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" - -# Tests are broken. See bug 657500 -RESTRICT="test" - -IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" -REQUIRED_USE="${LUA_REQUIRED_USE} - python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="!app-arch/rpm5 - app-arch/libarchive:= - >=app-arch/bzip2-1.0.1 - app-arch/xz-utils - >=app-crypt/gnupg-1.2 - >=dev-lang/perl-5.8.8 - dev-libs/elfutils - dev-libs/libgcrypt:= - >=dev-libs/popt-1.7 - sys-apps/file - >=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 ) - python? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - zstd? ( app-arch/zstd:= ) -" -BDEPEND=" - nls? ( sys-devel/gettext ) - doc? ( app-doc/doxygen ) - virtual/pkgconfig - test? ( sys-apps/fakechroot ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rpm ) -" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - lua-single_pkg_setup - - use python && python-single-r1_pkg_setup - - # Added USE=openmp and this check for bug #779769 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch - eapply "${FILESDIR}"/${PN}-4.17.0-libdir.patch - - # fix #356769 - sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" - # fix #492642 - sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" - - eapply_user - eautoreconf - - # Prevent automake maintainer mode from kicking in (#450448). - touch -r Makefile.am preinstall.am || die -} - -src_configure() { - # rpm no longer supports berkdb, but has readonly support. - # 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) \ - $(use_enable nls) \ - $(use_enable openmp) \ - $(use_ena
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: b64eb8b77a34c02769471d3b74d3674192b820f0 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Oct 14 06:56:07 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Oct 14 06:56:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64eb8b7 app-arch/rpm: Stabilize 4.17.1 ppc64, #877041 Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index 5c2044fa8ef8..a4ee4d202c0d 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 91d24c4a74c2e3f736d18d0d53c75771507ddef3 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Oct 14 06:55:31 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Oct 14 06:55:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d24c4a app-arch/rpm: Stabilize 4.17.1 ppc, #877041 Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index 7e61b2994697..5c2044fa8ef8 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: c7696d58393b64971191ec430bd2d4bb6f1d3eaf Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Oct 14 06:54:39 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Oct 14 06:54:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7696d58 app-arch/rpm: Stabilize 4.17.1 arm64, #877041 Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index 333fec8977d1..7e61b2994697 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 300276470467096ab9dd0bd74e12257e72c64f7b Author: Arthur Zamarin gentoo org> AuthorDate: Fri Oct 14 04:36:29 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 14 04:36:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30027647 app-arch/rpm: Stabilize 4.17.1 arm, #877041 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index 7a3734e73030..333fec8977d1 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 7f79fb859e0c921958450d97dce20fa7324073d1 Author: Sam James gentoo org> AuthorDate: Thu Oct 13 23:03:19 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 13 23:03:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f79fb85 app-arch/rpm: Stabilize 4.17.1 x86, #877041 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index 4d288f743e70..7a3734e73030 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 3076ee44b74d4c1a05c0e2dbb3be9aaad286c93e Author: Sam James gentoo org> AuthorDate: Thu Oct 13 22:36:15 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 13 22:36:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3076ee44 app-arch/rpm: Stabilize 4.17.1 amd64, #877041 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild index ac7a9dc24a1f..4d288f743e70 100644 --- a/app-arch/rpm/rpm-4.17.1.ebuild +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 98690072dc3d0e0c2c7aa6c2077820dee7952c3f Author: Sam James gentoo org> AuthorDate: Fri Sep 23 05:17:06 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 23 05:17:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98690072 app-arch/rpm: add 4.18.0 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/rpm-4.18.0.ebuild | 165 + 2 files changed, 166 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 620e4e3efa8b..8bc829917e95 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1,3 @@ DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85 +DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec diff --git a/app-arch/rpm/rpm-4.18.0.ebuild b/app-arch/rpm/rpm-4.18.0.ebuild new file mode 100644 index ..a9fd82c33c5d --- /dev/null +++ b/app-arch/rpm/rpm-4.18.0.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"; +SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug #657500 +RESTRICT="test" + +IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" +REQUIRED_USE="${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + ${LUA_DEPS} + !app-arch/rpm5 + app-arch/libarchive:= + >=app-arch/bzip2-1.0.1 + app-arch/xz-utils + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + dev-libs/libgcrypt:= + >=dev-libs/popt-1.7 + sys-apps/file + >=sys-libs/zlib-1.2.3-r1 + virtual/libintl + acl? ( virtual/acl ) + audit? ( sys-process/audit ) + caps? ( >=sys-libs/libcap-2.0 ) + dbus? ( sys-apps/dbus ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + python? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + zstd? ( app-arch/zstd:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) + test? ( sys-apps/fakechroot ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.17.0-libdir.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # Added USE=openmp and this check for bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # bug #356769 + sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" + # bug #492642 + sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" + + # Prevent automake maintainer mode from kicking in (bug #450448). + #touch -r Makefile.am preinstall.am || die + + eautoreconf +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 + econf \ + --enable-libelf \ + --without-selinux \ + --disable-inhibit-plugin \ + --with-crypto=libgcrypt \ + $(use_enable berkdb bdb-ro) \ + $(use_enable python) \ + $(use_enable nls) \ + $(use_enable openmp)
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 188ca6ba0a28ffdcbb063d0bf126a2ed8769448b Author: Sam James gentoo org> AuthorDate: Tue Jul 5 01:13:04 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 5 01:13:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188ca6ba app-arch/rpm: add 4.17.1 Bug: https://bugs.gentoo.org/830380 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/rpm-4.17.1.ebuild | 161 + 2 files changed, 162 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 949c468c6cc6..620e4e3efa8b 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1 +1,2 @@ DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 +DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85 diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild new file mode 100644 index ..ac7a9dc24a1f --- /dev/null +++ b/app-arch/rpm/rpm-4.17.1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org + https://github.com/rpm-software-management/rpm"; +SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug 657500 +RESTRICT="test" + +IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" +REQUIRED_USE="${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="!app-arch/rpm5 + app-arch/libarchive:= + >=app-arch/bzip2-1.0.1 + app-arch/xz-utils + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + dev-libs/libgcrypt:= + >=dev-libs/popt-1.7 + sys-apps/file + >=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 ) + python? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + zstd? ( app-arch/zstd:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) + test? ( sys-apps/fakechroot ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.8.1-db-path.patch + "${FILESDIR}"/${PN}-4.17.0-libdir.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # Added USE=openmp and this check for bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # bug #356769 + sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" + # bug #492642 + sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" + + # Prevent automake maintainer mode from kicking in (bug #450448). + #touch -r Makefile.am preinstall.am || die + + eautoreconf +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # 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) \ + $(use_enable nls) \ + $(use_enable openmp) \ + $(use_enable dbus inhibit-plugin) \ + $(use_enable sqlite) \ + $(use_with caps cap) \ + $(use_with acl) \ + $(use_with audit) \ + $(use_enable zstd zstd $(usex zstd yes no)) +} + +src_test() { + # Known to fail with FEATURES=usersandbox (bug #657500) + if has usersandbox
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/, app-arch/rpm/files/
commit: 477d77eb969cdf4d11077c4d484d504078b048b7 Author: Sam James gentoo org> AuthorDate: Sun Apr 10 10:05:50 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 10 10:11:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477d77eb app-arch/rpm: drop 4.16.1.3 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/files/rpm-4.16.0-autotools.patch | 13 --- app-arch/rpm/files/rpm-4.16.1.3-libdir.patch | 34 -- app-arch/rpm/rpm-4.16.1.3.ebuild | 148 -- 4 files changed, 196 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 9473074a2a09..949c468c6cc6 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1 @@ -DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch deleted file mode 100644 index 9b1f71ad86e5.. --- a/app-arch/rpm/files/rpm-4.16.0-autotools.patch +++ /dev/null @@ -1,13 +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:02:21.605485875 +0100 -+++ rpm-4.16.0/configure.ac2020-10-01 11:05:34.077157904 +0100 -@@ -552,9 +552,6 @@ - - AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"]) - AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"]) --if test "x$have_bdb" = "xinternal"; then --AC_CONFIG_SUBDIRS(db3) --fi - - - #= diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch deleted file mode 100644 index a2c95ff064e2.. --- a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac rpm-4.16.1.3.ORIG/configure.ac 2021-04-13 19:32:35.630955569 +0100 -+++ rpm-4.16.1.3/configure.ac 2021-04-13 19:32:54.939623251 +0100 -@@ -957,13 +957,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.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am rpm-4.16.1.3.ORIG/rpm.am 2021-04-13 19:32:35.584956361 +0100 -+++ rpm-4.16.1.3/rpm.am2021-04-13 19:32:54.940623234 +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:3:1 diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild deleted file mode 100644 index 2603c2191f03.. --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{2..4} ) -PYTHON_COMPAT=( python3_{8,9} ) - -inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org - https://github.com/rpm-software-management/rpm"; -SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" - -# Tests are broken. See bug 657500 -RESTRICT="test" - -IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND="!app-arch/rpm5 - app-arch/libarchive - >=sys-libs/db-4.5:* - >=sys-libs/zlib-1.2.3-r1 - >=app-arch/bzip2-1.0.1 - >=dev-libs/popt-1.7 - >=app-crypt/gnupg-1.2 - dbus? ( sys-apps/dbus ) - dev-libs/elfutils - virtual/libintl - >=dev-lang/perl-5.8.8 - dev-libs/libgcrypt - python? (
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: fabce075778fc7117cc754f95baf706f829f18b9 Author: Sam James gentoo org> AuthorDate: Sun Mar 6 23:39:13 2022 + Commit: Sam James gentoo org> CommitDate: Sun Mar 6 23:39:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fabce075 app-arch/rpm: drop premature readline dep Next release, not now! Closes: https://bugs.gentoo.org/834668 Signed-off-by: Sam James gentoo.org> app-arch/rpm/{rpm-4.17.0-r1.ebuild => rpm-4.17.0-r2.ebuild} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app-arch/rpm/rpm-4.17.0-r1.ebuild b/app-arch/rpm/rpm-4.17.0-r2.ebuild similarity index 96% rename from app-arch/rpm/rpm-4.17.0-r1.ebuild rename to app-arch/rpm/rpm-4.17.0-r2.ebuild index c2e3e35fb19e..77e2508c4dd6 100644 --- a/app-arch/rpm/rpm-4.17.0-r1.ebuild +++ b/app-arch/rpm/rpm-4.17.0-r2.ebuild @@ -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 audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd" +IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" REQUIRED_USE="${LUA_REQUIRED_USE} python? ( ${PYTHON_REQUIRED_USE} )" @@ -43,7 +43,6 @@ DEPEND="!app-arch/rpm5 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 ) zstd? ( app-arch/zstd:= ) @@ -103,7 +102,6 @@ src_configure() { $(use_with caps cap) \ $(use_with acl) \ $(use_with audit) \ - $(use_with readline) \ $(use_enable zstd zstd $(usex zstd yes no)) }
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 8a4e5778b6ffb0ab2d7ddf1daac24a8312ae6d2d Author: Sam James gentoo org> AuthorDate: Sun Mar 6 08:56:03 2022 + Commit: Sam James gentoo org> CommitDate: Sun Mar 6 09:18:27 2022 + 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
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 6ec9ae7c35e520c1e9ed55be2279f77f5e5db2cc Author: Arthur Zamarin gentoo org> AuthorDate: Mon Dec 6 18:36:28 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Dec 6 18:36:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec9ae7c app-arch/rpm: Stabilize 4.17.0 arm, #828277 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 88a0006e2568..19b33b3904ef 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 95aca4c0657beca2d99148fa4c9e60a1fc938f8e Author: Sam James gentoo org> AuthorDate: Mon Dec 6 15:18:10 2021 + Commit: Sam James gentoo org> CommitDate: Mon Dec 6 15:18:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95aca4c0 app-arch/rpm: Stabilize 4.17.0 arm64, #828277 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index c3ba41520b44..88a0006e2568 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: d104bcf91a0e05f6822569cdbd1e534e7e0d4a72 Author: Sam James gentoo org> AuthorDate: Sun Dec 5 18:36:50 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 18:36:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d104bcf9 app-arch/rpm: Stabilize 4.17.0 ppc, #828277 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 9d4a13b07267..c3ba41520b44 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 04bcfafc82d33d824a5c18efed2554875d339984 Author: Sam James gentoo org> AuthorDate: Sun Dec 5 18:30:19 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 18:30:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bcfafc app-arch/rpm: Stabilize 4.17.0 x86, #828277 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 49552e700e68..68bb64546e93 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 61d287331cb9c3404329d5e20da68a298506149b Author: Sam James gentoo org> AuthorDate: Sun Dec 5 04:05:50 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 04:05:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d28733 app-arch/rpm: Stabilize 4.17.0 amd64, #828277 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 2bc134671182..49552e700e68 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 59768db2f96d3615d4a23295a52d7cf59ac679f3 Author: Sam James gentoo org> AuthorDate: Sat Oct 16 07:33:18 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 16 07:33:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59768db2 app-arch/rpm: fix doc installation Closes: https://bugs.gentoo.org/818427 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index a403bcc2344..2bc13467118 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -121,9 +121,10 @@ src_install() { dodoc CREDITS README* if use doc; then + local docname for docname in librpm; do docinto "html/${docname}" - dodoc -r "doc/${docname}/html/." + dodoc -r "docs/${docname}/html/." done fi
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 01810a917da8e1c065f016616744b0ee7ba72856 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 10:44:24 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 10:44:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01810a91 app-arch/rpm: use BDEPEND Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 9d4579d1f7f..a403bcc2344 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -25,7 +25,7 @@ IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" REQUIRED_USE="${LUA_REQUIRED_USE} python? ( ${PYTHON_REQUIRED_USE} )" -CDEPEND="!app-arch/rpm5 +DEPEND="!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils @@ -46,13 +46,13 @@ CDEPEND="!app-arch/rpm5 caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd:= ) " -DEPEND="${CDEPEND} +BDEPEND=" nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) virtual/pkgconfig test? ( sys-apps/fakechroot ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-rpm ) "
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: c893bf46f51b957cf91c85ce54cbbb0c818d6491 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 10:43:38 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 10:43:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c893bf46 app-arch/rpm: sort *DEPEND Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index 8111da577bf..9d4579d1f7f 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -27,14 +27,14 @@ REQUIRED_USE="${LUA_REQUIRED_USE} CDEPEND="!app-arch/rpm5 app-arch/libarchive:= - app-arch/xz-utils >=app-arch/bzip2-1.0.1 + app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= - sys-apps/file >=dev-libs/popt-1.7 + sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl ${LUA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 28dfdda3d5d0531627b5efa66d9c926aeeda0eb5 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 10:35:56 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 10:35:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28dfdda3 app-arch/rpm: drop unused flag-o-matic from 4.17.0 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild index ec6251d87d6..8111da577bf 100644 --- a/app-arch/rpm/rpm-4.17.0.ebuild +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-{3,4} ) PYTHON_COMPAT=( python3_{8,9,10} ) -inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs +inherit autotools lua-single perl-module python-single-r1 toolchain-funcs DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="https://rpm.org
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/files/, app-arch/rpm/
commit: e5cb423fce8e53b944d560e438a0455ea0f1d81d Author: Sam James gentoo org> AuthorDate: Thu Oct 14 10:34:09 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 10:35:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb423f app-arch/rpm: add 4.17.0 Signed-off-by: Sam James gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/files/rpm-4.17.0-libdir.patch | 32 ++ app-arch/rpm/rpm-4.17.0.ebuild | 154 + 3 files changed, 187 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 230ca396760..9473074a2a0 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1 +1,2 @@ DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e +DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8 diff --git a/app-arch/rpm/files/rpm-4.17.0-libdir.patch b/app-arch/rpm/files/rpm-4.17.0-libdir.patch new file mode 100644 index 000..5bff26b7129 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.17.0-libdir.patch @@ -0,0 +1,32 @@ +--- a/configure.ac b/configure.ac +@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir], + 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) +--- a/rpm.am b/rpm.am +@@ -1,10 +1,10 @@ + # 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 = 11:0:2 diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild new file mode 100644 index 000..ec6251d87d6 --- /dev/null +++ b/app-arch/rpm/rpm-4.17.0.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{3,4} ) +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org + https://github.com/rpm-software-management/rpm"; +SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2 + http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug 657500 +RESTRICT="test" + +IUSE="acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd" +REQUIRED_USE="${LUA_REQUIRED_USE} + python? ( ${PYTHON_REQUIRED_USE} )" + +CDEPEND="!app-arch/rpm5 + app-arch/libarchive:= + app-arch/xz-utils + >=app-arch/bzip2-1.0.1 + >=app-crypt/gnupg-1.2 + >=dev-lang/perl-5.8.8 + dev-libs/elfutils + dev-libs/libgcrypt:= + sys-apps/file + >=dev-libs/popt-1.7 + >=sys-libs/zlib-1.2.3-r1 + virtual/libintl + ${LUA_DEPS} + dbus? ( sys-apps/dbus ) + sqlite? ( dev-db/sqlite:3 ) + python? ( ${PYTHON_DEPS} ) + nls? ( virtual/libintl ) + acl? ( virtual/acl ) + caps? ( >=sys-libs/libcap-2.0 ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext ) + doc? ( app-doc/doxygen ) + virtual/pkgconfig + test? ( sys-apps/fakechroot ) +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + lua-single_pkg_setup + + use python && python-single-r1_pkg_setup + + # Added USE=openmp and this check for bug #779769 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch + eapply "${FILESDIR}"/${PN}-4.17.0-libdir.patch + + # fix #356769 + sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" +
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/files/, app-arch/rpm/
commit: 9517266013b80bf8e96445a63cf25e27831eb793 Author: John Helmert III gentoo org> AuthorDate: Sun Jul 25 21:25:01 2021 + Commit: John Helmert III gentoo org> CommitDate: Mon Jul 26 03:12:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95172660 app-arch/rpm: drop 4.14.2.1-r1, 4.16.0 Bug: https://bugs.gentoo.org/778533 Bug: https://bugs.gentoo.org/787944 Signed-off-by: John Helmert III gentoo.org> app-arch/rpm/Manifest | 2 - 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 -- app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 141 app-arch/rpm/rpm-4.16.0.ebuild| 153 -- 6 files changed, 375 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 4209654a205..230ca396760 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1 @@ -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 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e 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 2a2dcb129de..000 --- 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 c9f5f297233..000 --- 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.ac2020-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 22192649441..000 --- 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(OBJD
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f0b79f21217b92b02827bcd65de5ad7537095565 Author: Marek Szuba gentoo org> AuthorDate: Fri Jul 16 22:58:17 2021 + Commit: Marek Szuba gentoo org> CommitDate: Fri Jul 16 23:32:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b79f21 app-arch/rpm: keyword 4.16.1.3 for ~riscv Signed-off-by: Marek Szuba gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index ee7d55a49e0..2603c2191f0 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{2..4} ) -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: b47a304b84b12f54512e6a79b27472e8bf9c25a8 Author: Marek Szuba gentoo org> AuthorDate: Mon Jul 12 12:42:13 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Jul 12 12:42:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47a304b app-arch/rpm: support lua5-3 and lua5-4 Upstream build scripts look for 5.2 or newer. Builds and installs (tests are restricted) fine against both aforementioned versions. Signed-off-by: Marek Szuba gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 3e6a36bfe07..cdb8d7392a5 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-2 ) +LUA_COMPAT=( lua5-{2..4} ) PYTHON_COMPAT=( python3_{7,8,9} ) inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index 1302a5a779e..ee7d55a49e0 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-2 ) +LUA_COMPAT=( lua5-{2..4} ) PYTHON_COMPAT=( python3_{7,8,9} ) inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: b91dae1e6f9c56149fdd42522fee9dfde7711fde Author: Marek Szuba gentoo org> AuthorDate: Fri Jun 25 12:31:06 2021 + Commit: Marek Szuba gentoo org> CommitDate: Fri Jun 25 12:31:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91dae1e app-arch/rpm: fix dev-lang/lua dependency Newer versions have already been migrated to Lua eclasses so just switch this one from :0 to :5.1. Signed-off-by: Marek Szuba gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d75365d3603..2d63fdc6f20 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:0=[deprecated] ) + lua? ( dev-lang/lua:5.1=[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd )
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: cad4e83bcea836c9b826bc95d37e7b8001e4d5e9 Author: Sam James gentoo org> AuthorDate: Sat May 15 19:12:31 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 15 19:12:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad4e83b app-arch/rpm: Stabilize 4.16.1.3 arm, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index f058e1f4c02..1302a5a779e 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 62ea190f48614f66d85fabc33c4443af0d77d400 Author: Sam James gentoo org> AuthorDate: Fri May 14 08:15:36 2021 + Commit: Sam James gentoo org> CommitDate: Fri May 14 08:15:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ea190f app-arch/rpm: Stabilize 4.16.1.3 amd64, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index 759590cda17..f058e1f4c02 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 581e3a976391976a83a240bab5abb2ea627f3f19 Author: Sam James gentoo org> AuthorDate: Fri May 14 08:15:27 2021 + Commit: Sam James gentoo org> CommitDate: Fri May 14 08:15:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=581e3a97 app-arch/rpm: Stabilize 4.16.1.3 x86, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index 4ee26a5c924..759590cda17 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 278479c865ded090212bfd9cb0e83c7a8098bb65 Author: Sam James gentoo org> AuthorDate: Thu May 13 21:03:39 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 21:03:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278479c8 app-arch/rpm: Stabilize 4.16.1.3 arm64, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index e079a2b9850..4ee26a5c924 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 17a5d0e9801277d6697bdc3b309659838824d8f6 Author: Sam James gentoo org> AuthorDate: Thu May 13 16:23:55 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:23:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a5d0e9 app-arch/rpm: Stabilize 4.16.1.3 ppc, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index 414b0912fbc..e079a2b9850 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f174f7a48c77a42fd26397f5ec1bb463b2ccae12 Author: Sam James gentoo org> AuthorDate: Thu May 13 16:23:38 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:23:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f174f7a4 app-arch/rpm: Stabilize 4.16.1.3 ppc64, #778533 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild index 32b827a153f..414b0912fbc 100644 --- a/app-arch/rpm/rpm-4.16.1.3.ebuild +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/files/, app-arch/rpm/
commit: 46e2330f712a1c60bed71abc25eea1f4f499f150 Author: Tony Vroon gentoo org> AuthorDate: Tue Apr 13 19:16:21 2021 + Commit: Tony Vroon gentoo org> CommitDate: Tue Apr 13 19:17:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e2330f app-arch/rpm: Version bump to 4.16.1.3 Switch to new crypto provider libgcrypt, as NSS is deprecated. As flagged up by Sam James in bug #780684. This has potential to address some test suite failures, but even with -usersandbox I still drown in a sea of: mktemp: failed to create file via template '/var/tmp/portage/app-arch/rpm-4.16.1.3/temp/rpmXX': No such file or directory Addresses CVE-2021-20271, a security vulnerability in the signature check functionality. Also addresses undisclosed vulnerability CVE-2021-3421. As flagged up by John "ajak" Helmert III in bug #778533 Bug: https://bugs.gentoo.org/778533 Closes: https://bugs.gentoo.org/780684 Signed-Off-By: Tony Vroon gentoo.org> Package-Manager: Portage-3.0.17, Repoman-3.0.2 app-arch/rpm/Manifest| 1 + app-arch/rpm/files/rpm-4.16.1.3-libdir.patch | 34 ++ app-arch/rpm/rpm-4.16.1.3.ebuild | 148 +++ 3 files changed, 183 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 08fa264efdf..4209654a205 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1,3 @@ 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 +DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch new file mode 100644 index 000..a2c95ff064e --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch @@ -0,0 +1,34 @@ +diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac +--- rpm-4.16.1.3.ORIG/configure.ac 2021-04-13 19:32:35.630955569 +0100 rpm-4.16.1.3/configure.ac 2021-04-13 19:32:54.939623251 +0100 +@@ -957,13 +957,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.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am +--- rpm-4.16.1.3.ORIG/rpm.am 2021-04-13 19:32:35.584956361 +0100 rpm-4.16.1.3/rpm.am2021-04-13 19:32:54.940623234 +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:3:1 diff --git a/app-arch/rpm/rpm-4.16.1.3.ebuild b/app-arch/rpm/rpm-4.16.1.3.ebuild new file mode 100644 index 000..32b827a153f --- /dev/null +++ b/app-arch/rpm/rpm-4.16.1.3.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-2 ) +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org + https://github.com/rpm-software-management/rpm"; +SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug 657500 +RESTRICT="test" + +IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +CDEPEND="!app-arch/rpm5 + app-arch/libarchive + >=sys-libs/db-4.5:* + >=sys-libs/zlib-1.2.3-r1 + >=app-arch/bzip2-1.0.1 +
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 5f18ee25512686ce1959e169c55c32a9786fcf4a Author: Sam James gentoo org> AuthorDate: Wed Apr 7 02:36:59 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 7 05:24:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f18ee25 app-arch/rpm: add bug reference to OpenMP check Bug: https://bugs.gentoo.org/779769 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index af422db8c46..3e6a36bfe07 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -61,6 +61,7 @@ pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup + # Added USE=openmp and this check for bug #779769 [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp }
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 7be914d238d7bba1728477547008e4efdf9bb8d4 Author: Sam James gentoo org> AuthorDate: Wed Apr 7 01:52:26 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 7 01:57:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be914d2 app-arch/rpm: add note about NSS deprecation to ebuild 4.16.0 warns: "configure: WARNING: Using the nss library with rpm is deprecated and support will be removed in a future release!" Only libgcrypt (default) and openssl are not deprecated. Need to consider this for a revbump or future releases. Bug: https://bugs.gentoo.org/780684 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 071d60b3c1d..af422db8c46 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -83,6 +83,10 @@ src_prepare() { src_configure() { append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr" + # NOTE: 4.16.0 warns: + # "configure: WARNING: Using the nss library with rpm is deprecated and support will be removed in a future release!" + # Only libgcrypt (default) and openssl are not deprecated. We should consider this. + # bug #780684 econf \ --without-selinux \ --with-crypto=nss \
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 223280966bd899718c85a616f8baa0376c8d84bb Author: Sam James gentoo org> AuthorDate: Wed Apr 7 01:48:46 2021 + Commit: Sam James gentoo org> CommitDate: Wed Apr 7 01:57:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22328096 app-arch/rpm: make openmp optional Closes: https://bugs.gentoo.org/779769 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 1742df61ac5..071d60b3c1d 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 LUA_COMPAT=( lua5-2 ) PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools flag-o-matic lua-single perl-module python-single-r1 +inherit autotools flag-o-matic lua-single perl-module python-single-r1 toolchain-funcs DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="https://rpm.org @@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~ # Tests are broken. See bug 657500 RESTRICT="test" -IUSE="acl caps doc dbus lua nls python selinux test +zstd" +IUSE="acl caps doc dbus lua nls openmp python selinux test +zstd" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -53,9 +53,15 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-rpm ) " +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { @@ -69,7 +75,6 @@ src_prepare() { sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" eapply_user - eautoreconf # Prevent automake maintainer mode from kicking in (#450448). @@ -83,6 +88,7 @@ src_configure() { --with-crypto=nss \ $(use_enable python) \ $(use_enable nls) \ + $(use_enable openmp) \ $(use_enable dbus inhibit-plugin) \ $(use_with lua) \ $(use_with caps cap) \
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 03489ee07dcc614e5892bad112a92da66c2b7d43 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 31 14:08:09 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 31 14:08:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03489ee0 app-arch/rpm: s390 stable wrt bug #778500 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 1742df61ac5..444bf99227f 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 7352023b51fb48c4f941a5e2f37589fb65d9a5a6 Author: Sam James gentoo org> AuthorDate: Fri Mar 26 23:52:14 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 23:52:14 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7352023b app-arch/rpm: Stabilize 4.16.0 arm64, #778500 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 9dccb808606..1742df61ac5 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: df6cf8c697976402347d524ab394361ca609a8d6 Author: Sam James gentoo org> AuthorDate: Fri Mar 26 21:38:07 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 21:38:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df6cf8c6 app-arch/rpm: Stabilize 4.16.0 ppc64, #778500 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 2b673c15367..9dccb808606 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: c5337bdec5b725ca7f833160e4440c3784558483 Author: Sam James gentoo org> AuthorDate: Fri Mar 26 21:37:49 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 21:37:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5337bde app-arch/rpm: Stabilize 4.16.0 ppc, #778500 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index b431180b73a..2b673c15367 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 77823f6574513b9fb108e3552fdecb0cb097655a Author: Sam James gentoo org> AuthorDate: Fri Mar 26 21:34:42 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 21:34:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77823f65 app-arch/rpm: Stabilize 4.16.0 x86, #778500 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 5408cec1f1b..152c427d2ee 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 939f88b000e281977e75071e3bae2c80df019cf7 Author: Sam James gentoo org> AuthorDate: Fri Mar 26 21:35:23 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 26 21:35:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939f88b0 app-arch/rpm: Stabilize 4.16.0 amd64, #778500 Signed-off-by: Sam James gentoo.org> app-arch/rpm/rpm-4.16.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild index 152c427d2ee..b431180b73a 100644 --- a/app-arch/rpm/rpm-4.16.0.ebuild +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 0ceaf9ef9abf10d32e6a21cea95f4fec73be9c32 Author: Marek Szuba gentoo org> AuthorDate: Mon Dec 7 12:44:17 2020 + Commit: Marek Szuba gentoo org> CommitDate: Mon Dec 7 13:12:19 2020 + 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 }
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: d254075b8a27fce19ac1c650d2de75ffae940e8f Author: Marek Szuba gentoo org> AuthorDate: Thu Dec 3 22:21:14 2020 + Commit: Marek Szuba gentoo org> CommitDate: Thu Dec 3 22:55:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d254075b app-arch/rpm-4.14.2.1-r1: limit dev-lang/lua to slot 0, Signed-off-by: Marek Szuba gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4a6a46bc5e..22a48d51d44 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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/files/, app-arch/rpm/
commit: 3bfda681c33a63ebe64a04f5ef0084c3d07990aa Author: Tony Vroon gentoo org> AuthorDate: Thu Oct 1 11:15:19 2020 + Commit: Tony Vroon gentoo org> CommitDate: Thu Oct 1 11:17:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfda681 app-arch/rpm: Version bump to 4.16.0 This has USE="zstd" defaulted to on to ensure Fedora 31 packages are recognised without issue. Closes: https://bugs.gentoo.org/520312 Closes: https://bugs.gentoo.org/730354 Closes: https://bugs.gentoo.org/740078 Signed-Off-By: Tony Vroon gentoo.org> app-arch/rpm/Manifest | 1 + app-arch/rpm/files/rpm-4.16.0-autotools.patch | 13 +++ app-arch/rpm/files/rpm-4.16.0-libdir.patch| 34 +++ app-arch/rpm/rpm-4.16.0.ebuild| 139 ++ 4 files changed, 187 insertions(+) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 7529e899a90..08fa264efdf 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1 +1,2 @@ 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 diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch new file mode 100644 index 000..9b1f71ad86e --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.0-autotools.patch @@ -0,0 +1,13 @@ +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:02:21.605485875 +0100 rpm-4.16.0/configure.ac2020-10-01 11:05:34.077157904 +0100 +@@ -552,9 +552,6 @@ + + AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"]) + AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"]) +-if test "x$have_bdb" = "xinternal"; then +-AC_CONFIG_SUBDIRS(db3) +-fi + + + #= diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch new file mode 100644 index 000..c9f5f297233 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.0-libdir.patch @@ -0,0 +1,34 @@ +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.ac2020-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/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild new file mode 100644 index 000..67132e47a62 --- /dev/null +++ b/app-arch/rpm/rpm-4.16.0.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit autotools flag-o-matic perl-module python-single-r1 + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="https://rpm.org + https://github.com/rpm-software-management/rpm"; +SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# Tests are broken. See bug 657500 +RESTRICT="test" + +IUSE="acl caps doc dbus lua nls python selinux test +zstd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +CDEPEND="!app-arch/rpm5 + app-arch/libarchive + >=sys-libs/db-4.5:* + >=sys-libs/zlib-1.2.3-r1 + >=app-arch/bzip2-1.0.1 + >=dev-libs/popt-1.7 + >=app-crypt/gnupg-1.2 + dbus? ( sys-apps/dbus ) + dev-libs/elfutils + virtual/l
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f7537ce8b828fd19ec862bc3c1ae410b5290807e Author: Matt Turner gentoo org> AuthorDate: Mon Aug 24 22:23:26 2020 + Commit: Matt Turner gentoo org> CommitDate: Mon Aug 24 22:23:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7537ce8 app-arch/rpm: Add Python 3.9 compatibility Signed-off-by: Matt Turner gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c1b09818389..f4a6a46bc5e 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: dfee0dca2104da63d9705a8e1c8a9f866036f829 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 13 20:18:34 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Aug 13 20:25:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfee0dca app-arch/rpm: Remove old (py3.6) Signed-off-by: Michał Górny gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/rpm-4.14.1-r1.ebuild | 137 -- app-arch/rpm/rpm-4.14.1.ebuild| 135 - 3 files changed, 273 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 4757fa13f69..7529e899a90 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,2 +1 @@ -DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990 diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild deleted file mode 100644 index c2f5f37a528..000 --- a/app-arch/rpm/rpm-4.14.1-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="https://rpm.org - https://github.com/rpm-software-management/rpm"; -SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - -# Tests are broken. See bug 657500 -RESTRICT="test" - -IUSE="acl caps doc lua nls python selinux test zstd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND="!app-arch/rpm5 - app-arch/libarchive - >=sys-libs/db-4.5:* - >=sys-libs/zlib-1.2.3-r1 - >=app-arch/bzip2-1.0.1 - >=dev-libs/popt-1.7 - >=app-crypt/gnupg-1.2 - dev-libs/elfutils - virtual/libintl - >=dev-lang/perl-5.8.8 - dev-libs/nss - python? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) - acl? ( virtual/acl ) - caps? ( >=sys-libs/libcap-2.0 ) - zstd? ( app-arch/zstd ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext ) - doc? ( app-doc/doxygen ) - virtual/pkgconfig - test? ( sys-apps/fakechroot ) -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-rpm ) -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch - eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch - eapply "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch - - # fix #356769 - sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed" - # fix #492642 - sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed" - - eapply_user - - eautoreconf - - # Prevent automake maintainer mode from kicking in (#450448). - touch -r Makefile.am preinstall.am -} - -src_configure() { - append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr" - econf \ - --without-selinux \ - --with-external-db \ - --with-crypto=nss \ - $(use_enable python) \ - $(use_with doc hackingdocs) \ - $(use_enable nls) \ - $(use_with lua) \ - $(use_with caps cap) \ - $(use_with acl) \ - $(use_enable zstd zstd $(usex zstd yes no)) -} - -src_install() { - default - - # remove la files - find "${ED}" -name '*.la' -delete || die - - # fix symlinks to /bin/rpm (#349840) - for binary in rpmquery rpmverify;do - ln -sf rpm "${ED}"/usr/bin/${binary} || die - done - - if ! use nls; then - rm -rf "${ED}"/usr/share/man/?? || die - fi - - keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} - - dodoc CREDITS README* - if use doc; then - for docname in hacking librpm; do - docinto "html/${docname}" - dodoc -r "doc/${docname}/html/." - done - fi - - # Fix perllocal.pod file collision - perl_delete_
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 3543adb52bac8db1671ade8d3fb8b31ffbbb15b3 Author: Mike Gilbert gentoo org> AuthorDate: Tue May 26 03:08:14 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Tue May 26 03:10:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3543adb5 app-arch/rpm: python3.8 Signed-off-by: Mike Gilbert gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf860b516a0..c1b09818389 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 7ca0c9fcdc7cb16e57bdf681c306b8f447f06b61 Author: Mikle Kolyada gentoo org> AuthorDate: Tue May 12 08:53:44 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue May 12 08:53:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca0c9fc app-arch/rpm: x86 stable wrt bug #717916 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Mikle Kolyada gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8632fb15333..cf860b516a0 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: d407c7a82fe1d3c6cd1a5a5f1456367302fb26e7 Author: Mikle Kolyada gentoo org> AuthorDate: Tue May 12 08:53:14 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue May 12 08:53:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d407c7a8 app-arch/rpm: amd64 stable wrt bug #717916 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Mikle Kolyada gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f7082d549fe..8632fb15333 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 33ff32fb0f6610fa10b3c07f14672467645c643a Author: Michał Górny gentoo org> AuthorDate: Thu May 7 13:06:53 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu May 7 13:17:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ff32fb app-arch/rpm: Remove py2.7 Signed-off-by: Michał Górny gentoo.org> app-arch/rpm/rpm-4.14.1-r1.ebuild | 2 +- app-arch/rpm/rpm-4.14.1.ebuild | 2 +- app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild index 52ab90d9528..c2f5f37a528 100644 --- a/app-arch/rpm/rpm-4.14.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild index e611ac291b4..f0a7f10fd44 100644 --- a/app-arch/rpm/rpm-4.14.1.ebuild +++ b/app-arch/rpm/rpm-4.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver 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 6275cdc3a4c..f7082d549fe 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: bd7ed43b52f382e6dd7efa4ffd7e1fcc8b46fcdb Author: Mike Gilbert gentoo org> AuthorDate: Sun May 3 02:44:25 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Sun May 3 02:44:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7ed43b app-arch/rpm: don't call python-any-r1_pkg_setup when python is disabled Closes: https://bugs.gentoo.org/720754 Signed-off-by: Mike Gilbert gentoo.org> app-arch/rpm/rpm-4.14.1.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild index a0b7fb616cf..e611ac291b4 100644 --- a/app-arch/rpm/rpm-4.14.1.ebuild +++ b/app-arch/rpm/rpm-4.14.1.ebuild @@ -49,6 +49,10 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-rpm ) " +pkg_setup() { + use python && python-single-r1_pkg_setup +} + src_prepare() { eapply "${FILESDIR}"/${PN}-4.11.0-autotools.patch eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: f4bb77c7f978ab0150cceaec318a7d031907ce0a Author: Sam James (sam_c) cmpct info> AuthorDate: Mon Apr 20 12:36:28 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Apr 21 10:12:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bb77c7 app-arch/rpm: arm64 stable (bug #717916) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5f36103fbd4..6275cdc3a4c 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 3381308a8c2cb3a3cfdc248c35f19d397cc678e5 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 20 09:50:04 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 20 09:50:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3381308a app-arch/rpm: ppc64 stable wrt bug #717916 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dc6fd2f2d7e..5f36103fbd4 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: c57d772485a2e7f1581ffce6d60323853f63782f Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 20 09:47:39 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 20 09:47:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c57d7724 app-arch/rpm: ppc stable wrt bug #717916 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1c8b9ace3d4..dc6fd2f2d7e 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: e05bbe006fcf9be0c8e9f0e66af384d2d16492d2 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 20 09:45:59 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 20 09:45:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05bbe00 app-arch/rpm: arm stable wrt bug #717916 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d8e134b7540..1c8b9ace3d4 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 9e061f8cc56ee06da5b5a7b783f2bfec67958dea Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 20 09:29:09 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 20 09:29:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e061f8c app-arch/rpm: s390 stable wrt bug #717916 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/rpm/rpm-4.14.2.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d875370b14..d8e134b7540 100644 --- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # Tests are broken. See bug 657500 RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 4255cf61816a1c05751269561c72e3d7442e85e5 Author: Mike Gilbert gentoo org> AuthorDate: Wed Apr 15 02:32:29 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Apr 15 02:32:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4255cf61 app-arch/rpm: call python_optimize Package-Manager: Portage-2.3.99, Repoman-2.3.22_p29 Signed-off-by: Mike Gilbert gentoo.org> app-arch/rpm/{rpm-4.14.2.1.ebuild => rpm-4.14.2.1-r1.ebuild} | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild similarity index 99% rename from app-arch/rpm/rpm-4.14.2.1.ebuild rename to app-arch/rpm/rpm-4.14.2.1-r1.ebuild index 138f3de74f0..8d875370b14 100644 --- a/app-arch/rpm/rpm-4.14.2.1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild @@ -116,6 +116,8 @@ src_install() { # Fix perllocal.pod file collision perl_delete_localpod + + use python && python_optimize } src_test() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: 52a72514603ddf3d5a502be278a6dd00ef4ba8fd Author: Mike Gilbert gentoo org> AuthorDate: Fri Aug 23 15:07:02 2019 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Aug 23 15:07:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a72514 app-arch/rpm: fix configure switch for optional dbus-based plugin Closes: https://bugs.gentoo.org/676974 Package-Manager: Portage-2.3.71_p6, Repoman-2.3.17_p5 Signed-off-by: Mike Gilbert gentoo.org> app-arch/rpm/rpm-4.14.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild index ec73a8f530a..3988d03e449 100644 --- a/app-arch/rpm/rpm-4.14.2.1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1.ebuild @@ -82,7 +82,7 @@ src_configure() { $(use_enable python) \ $(use_with doc hackingdocs) \ $(use_enable nls) \ - $(use_with dbus) \ + $(use_enable dbus inhibit-plugin) \ $(use_with lua) \ $(use_with caps cap) \ $(use_with acl) \
[gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/
commit: ede5fcc288cd7d062c97447b2a3bdbf07d212c07 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Jun 1 15:38:37 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Tue Jun 18 00:35:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede5fcc2 app-arch/rpm: use HTTPS Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12148 Signed-off-by: Aaron Bauman gentoo.org> app-arch/rpm/rpm-4.14.1-r1.ebuild | 4 ++-- app-arch/rpm/rpm-4.14.1.ebuild| 2 +- app-arch/rpm/rpm-4.14.2.1.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild index c34b6839654..9e08501a7c0 100644 --- a/app-arch/rpm/rpm-4.14.1-r1.ebuild +++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="http://www.rpm.org +HOMEPAGE="https://rpm.org https://github.com/rpm-software-management/rpm"; SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild index 05513ac2d37..29d7e38050a 100644 --- a/app-arch/rpm/rpm-4.14.1.ebuild +++ b/app-arch/rpm/rpm-4.14.1.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="http://www.rpm.org +HOMEPAGE="https://rpm.org https://github.com/rpm-software-management/rpm"; SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2" diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild index 7d1e6c3e056..ec73a8f530a 100644 --- a/app-arch/rpm/rpm-4.14.2.1.ebuild +++ b/app-arch/rpm/rpm-4.14.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="http://www.rpm.org +HOMEPAGE="https://rpm.org https://github.com/rpm-software-management/rpm"; SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"