From 17e82681588151572e451b0daf68fd568531d3e4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2023 08:46:53 +0000 Subject: gentoo auto-resync : 15:12:2023 - 08:46:53 --- app-arch/Manifest.gz | Bin 17583 -> 17580 bytes app-arch/rpm/Manifest | 5 +- 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 +++++++++++++++++++++++++++++ app-arch/unrar/Manifest | 2 +- app-arch/unrar/unrar-6.2.12-r1.ebuild | 2 +- 7 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 app-arch/rpm/files/rpm-4.19.0-libdir.patch create mode 100644 app-arch/rpm/rpm-4.19.1.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index a708fb019fe0..1d05d50da7ae 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 183f9ebc9f5d..1212d39af35a 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,8 +1,11 @@ AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46 +AUX rpm-4.19.0-libdir.patch 578 BLAKE2B 643e4869b5770e98814a4787c66c3de516c0675648598164c4fe6e076e5a5c497ba897353260e5fb780af2d8b9b31693b4189704a145245cc0ee22ae3a6759a7 SHA512 b241e014c642ea70fdec4e12b3af512a00b5c408d9ecdd1c5bcd4aca9bd60f9af49ec8a599fbeb9f4d5a66c24450e082a0f199c27c15554855f3195d394de228 AUX rpm-4.8.1-clang.patch 1519 BLAKE2B 7338b739782296e8be1d4a0ce9cdbeae558831897585d9b0d3fee935a82ed68e4066e7bbb1e722f212277dd3ede8be2ebad65f4a3f1286911c64263034c8b766 SHA512 7e6400f1782d536a26f322338be798c675ca69e755df0cacb3af1c56b3dc6487ae1c813f3579cba007cefa5b62c5e474576a4b8fd9230bb29536d246db860795 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005 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 EBUILD rpm-4.18.0.ebuild 4096 BLAKE2B 371c8d3817a9d9046dd62dd333a6d95f93378fb5ae43cdf1ec51705caf85a94444b580f07cd32bdf9eb4779681f281328d8a651464975563c0d2291f676bd669 SHA512 91e71e8f963100fbafe72aa4b3119db70112398ed728e425df59e13dcf530c8856a55ac6d6ca9273a08588479765b669711b70d342bd7880b142e3c0eb5aef4d EBUILD rpm-4.18.1.ebuild 4119 BLAKE2B fdb015484110dbe4e8292a3b0a2ee2a4021d2f358b1a038cb96e46a66342204625c41fa8eacbca4877a25656c2aa5cfcafa61a3b42e79fff0de02134838cd7eb SHA512 777b10bc145d0761bb785174b2849ef00dfd4f0a8f1699053d70eecf9c83c7b02a71e4d9e4a9c919e668e6a106911edba2cf0a1c80ee76c0904938daefca443e -MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7 +EBUILD rpm-4.19.1.ebuild 3110 BLAKE2B 65e61065a048a0f1c443cd6d62aab5ccd33121e414bab7e68537cd6363adaa28054c4bc96ef87f9b680f388999f70fa0bf5d41e0dbb0abdbe4c2f034913dcf32 SHA512 2e0ec5a041b2f97657e54fafe0116bb162274ae70c953d297de03915fb2f314417fa85ce0e1c81ecd468a13bb0b092cb3ebfedf1c33a802d8b89e49df4201565 +MISC metadata.xml 616 BLAKE2B f0df64810f4eaf6b3fa7cdb09a892677404fa2d6d3bd36abb9c5f638be56200d1c83dfec4b6a3bd18ad9ae9b56eeaabdbce243eafad366f366c9157ddfb00ad8 SHA512 792c6c2476c7e928b1e1515b56e19ec83e3855aaaebd17aa66407f6a232f4680ba5d90da54c0a5af7d3db829124fa062015070a1ab82ebe91f5f8f2d1ebaff29 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 000000000000..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 @@ - + + pastalian46@gmail.com + Takuya Wakazono + + + proxy-maint@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 000000000000..978201150776 --- /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="~amd64" +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 + virtual/libintl + 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 ) + sequoia? ( app-crypt/rpm-sequoia ) + !sequoia? ( dev-libs/libgcrypt:= ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpm ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.19.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() { + cmake_src_prepare +} + +src_configure() { + # rpm no longer supports berkdb, but has readonly support. + # https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0 + local mycmakeargs=( + -DENABLE_TESTSUITE=OFF + -DWITH_FAPOLICYD=OFF + -DWITH_SELINUX=OFF + -DENABLE_BDB_RO=$(usex berkdb) + -DENABLE_NLS=$(usex nls) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_PYTHON=$(usex python) + -DENABLE_SQLITE=$(usex sqlite) + -DWITH_ACL=$(usex acl) + -DWITH_AUDIT=$(usex audit) + -DWITH_CAP=$(usex caps) + -DWITH_DBUS=$(usex dbus) + -DWITH_INTERNAL_OPENPGP=$(usex sequoia OFF ON) + $(cmake_use_find_package doc Doxygen) + ) + cmake_src_configure +} + +src_test() { + emake -C "${BUILD_DIR}" check +} + +src_install() { + cmake_src_install + + # Remove pre-built API docs. + use doc || rm -rf "${ED}/usr/share/doc/${PF}" || die + + dodoc CREDITS README + + keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} + + use python && python_optimize +} + +pkg_postinst() { + if [[ -f "${EROOT}"/var/lib/rpm/rpmdb.sqlite ]] ; then + einfo "RPM database found... Rebuilding database (may take a while)..." + "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die + else + einfo "No RPM database found... Creating database..." + "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die + fi +} diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index 1b2c4f019089..debe588fe10d 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -4,7 +4,7 @@ DIST unrar-6.2.12.tar.gz 246918 BLAKE2B 3c7744ee5839b4d87362625a03f30e3cac3d74df DIST unrar-6.2.8.tar.gz 246249 BLAKE2B 3766f7ebd0379835cff7cce8bb2deaf86d3de7c4a37d211d8a41effeb13a5a9efc53deabb5f10cd7f49d8e144cd9c1a93cce2ca3ae74e8a2142ab3ae97ab4759 SHA512 9b956d0c4b6a13f9ff4d9e57de7284dc879070746e3792e7640481a5b5b8336142b21c4d0c66c64627630cafbed0ff019a41b8f8536299ac7cbfdb933f92f75a DIST unrar-6.2.9.tar.gz 246388 BLAKE2B 495af1b78d2213c6bac0e75462b3d5e9fc3bfea809bcbb672216da47cd483bcc5867b504358125c51147a0e1869568c8a822946ca8148f204eeb087671029d9d SHA512 80424348946a56b47c107b2cd78c8bc7ce7f223a4d923b137860ec50678c4f279114dd7cdc9eb6a2fa6ff8c8a059ab8d35e16e3feae9dd1433fe51479501b61c EBUILD unrar-6.2.10.ebuild 1757 BLAKE2B c32e0b9eeeb17edd6da47b44c48bda3c80e4336b90bf72bdbb14ad832f0c606a9a9ed4db73fd9cb13754ee0642648463369c2b2bbcdac19e026449793f2894d4 SHA512 dd6d4fd175014f57cde71ee88e877f27a3aaabb8987a0e22f9c9ca1eb9a4de8103fb2bbcf3cee74c8cc59e8ac3b53f2dd87592d6ff4b0dfbb27a0f198932fa84 -EBUILD unrar-6.2.12-r1.ebuild 2698 BLAKE2B 56572705cb791e082039e32c8fb4f57b257882cbd24233666123da9faa055c2b479cb6f3826ea8ce59c7c40b1970ba655c07f1f50d6c1edceda949fe0941f933 SHA512 eb59e496411cd64d355bc02831bb5a9bdc95c06e34b3b446ef97883f99bc7cc378b6632cfbf8ebf686e58300e915e5c0da09d3b37f9932f0cc9eadf7150c8dc0 +EBUILD unrar-6.2.12-r1.ebuild 2693 BLAKE2B 600ac17cf65415f88c436fd9897036003fe7472297a45742b5bb140d61b797c09745b960fec59da0b7208fe8825b7cbd0c18f3d4e0e4a6e6b5b9ae4c272d6475 SHA512 279b2353fa722af100148c18ab4a847a75993466a5d5ba6585b1ed0e1fed8bab611c4a907ce0614903633c8ea742919a3e8ab703a4ff301e88a1d38d649e235c EBUILD unrar-6.2.12.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6 EBUILD unrar-6.2.8.ebuild 1757 BLAKE2B c32e0b9eeeb17edd6da47b44c48bda3c80e4336b90bf72bdbb14ad832f0c606a9a9ed4db73fd9cb13754ee0642648463369c2b2bbcdac19e026449793f2894d4 SHA512 dd6d4fd175014f57cde71ee88e877f27a3aaabb8987a0e22f9c9ca1eb9a4de8103fb2bbcf3cee74c8cc59e8ac3b53f2dd87592d6ff4b0dfbb27a0f198932fa84 EBUILD unrar-6.2.9.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6 diff --git a/app-arch/unrar/unrar-6.2.12-r1.ebuild b/app-arch/unrar/unrar-6.2.12-r1.ebuild index bb14028fb165..df34564ee34b 100644 --- a/app-arch/unrar/unrar-6.2.12-r1.ebuild +++ b/app-arch/unrar/unrar-6.2.12-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/unrar" LICENSE="unRAR" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" ) -- cgit v1.2.3