commit: f2325fbdb74ea4918d583927eea341df754a500b Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun Mar 2 05:05:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 02:23:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2325fbd
app-arch/rpm: drop 4.19.1.1 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40841 Signed-off-by: Sam James <sam <AT> gentoo.org> app-arch/rpm/Manifest | 1 - app-arch/rpm/files/rpm-4.19.0-libdir.patch | 13 --- app-arch/rpm/rpm-4.19.1.1.ebuild | 134 ----------------------------- 3 files changed, 148 deletions(-) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 630af384126a..d500b045cb3c 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -1,3 +1,2 @@ -DIST rpm-4.19.1.1.tar.bz2 5849649 BLAKE2B 66ed845007f3767fd92e2384962927b93cef7b825b8ea60f81f0a4b51b9d6a09d1cbec1668226fa85de675347d52635cb25c4d11204ada0eed6c898425b21536 SHA512 3364c453c29903c144a3680ceca7a17426eb085c288b6313fb7e857a42a5e0a965f623882e0f58e633f8b8770e839d9df9f7653d99c73759af5c89d0a981908d DIST rpm-4.20.0.tar.bz2 5984513 BLAKE2B c809e933cf7eb9ab63fa7693e634f7fcf744f94130199f674c5e76e77ead4de25b583daefdf651bbf0475012d262d1bdca605f19a520e160e90e3deb68c74f18 SHA512 b340c66cfda3abed38e81f91c4a789f2c6c0d3ce408de71d861fef27e180b607ae698e046b6925c7781a7177cde9df4075943714ed2aad7c62645eca348f5544 DIST rpm-4.20.1.tar.bz2 4534720 BLAKE2B 0d2c553be4cdb5c511c94c5d70a6f5d8ab350fbc7e29b91ea8ce7dd4c1d3f5f2db3a8d46305adc53083c8367b771588db185338cd04a769c54856a425f71bad5 SHA512 77979cb49dec5a8816fc5019cf5d0c817adddec10c0018c8ad9487db8ffc58613557fa21f8e2163b747197b55a6de202c29c88e19b70d1fa6b4c18d3a84bf681 diff --git a/app-arch/rpm/files/rpm-4.19.0-libdir.patch b/app-arch/rpm/files/rpm-4.19.0-libdir.patch deleted file mode 100644 index 9899827c985e..000000000000 --- a/app-arch/rpm/files/rpm-4.19.0-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/rpm-4.19.1.1.ebuild b/app-arch/rpm/rpm-4.19.1.1.ebuild deleted file mode 100644 index 79412f165585..000000000000 --- a/app-arch/rpm/rpm-4.19.1.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 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} - 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() { - # 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) - -DWITH_READLINE=$(usex readline) - $(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 -}
