From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFF5B15815E for ; Fri, 2 Feb 2024 03:58:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D28302BC046; Fri, 2 Feb 2024 03:58:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7A352BC046 for ; Fri, 2 Feb 2024 03:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 898FA343252 for ; Fri, 2 Feb 2024 03:58:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 230E514D0 for ; Fri, 2 Feb 2024 03:58:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1706846217.b19fda22ba177985a19d629c57ca27e4b819036f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/rpm/Manifest app-arch/rpm/rpm-4.18.0.ebuild X-VCS-Directories: app-arch/rpm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b19fda22ba177985a19d629c57ca27e4b819036f X-VCS-Branch: master Date: Fri, 2 Feb 2024 03:58:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a7a0625-510c-4c8f-b84b-d4a76d86cbc8 X-Archives-Hash: 8b89ae911c4b28e9fc4128c8d4c853ae commit: b19fda22ba177985a19d629c57ca27e4b819036f Author: Takuya Wakazono gmail com> AuthorDate: Thu Jan 18 15:03:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 2 03:56:57 2024 +0000 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..000000000000 --- 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) \ - $(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)) -} - -src_test() { - # Known to fail with FEATURES=usersandbox (bug #657500) - if has usersandbox ${FEATURES} ; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" - fi - - emake check -} - -src_install() { - default - - # Remove la files - find "${ED}" -name '*.la' -delete || die - - # Fix symlinks to /bin/rpm (bug #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 - local docname - for docname in librpm; do - docinto "html/${docname}" - dodoc -r "docs/${docname}/html/." - done - fi - - # Fix perllocal.pod file collision - perl_delete_localpod - - use python && python_optimize -} - -pkg_postinst() { - if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; 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 -}