commit: 12c1bdd7ae9904e58156c2aa74e16dc83ee4e5f4 Author: ktrace <coyote <AT> bks <DOT> tv> AuthorDate: Sat Jul 14 22:21:41 2018 +0000 Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> CommitDate: Mon Jul 16 13:35:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c1bdd7
app-arch/rpm: fix automagic, add USE "zstd" Fix automagic dependency on app-arch/zstd, add USE zstd Bug: https://bugs.gentoo.org/658746 Closes: https://github.com/gentoo/gentoo/pull/9232 Package-Manager: Portage-2.3.40, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/9232 Closes: https://bugs.gentoo.org/658746 app-arch/rpm/metadata.xml | 6 ++ app-arch/rpm/rpm-4.14.1-r1.ebuild | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml index 7a38bb90096..e8a64db778c 100644 --- a/app-arch/rpm/metadata.xml +++ b/app-arch/rpm/metadata.xml @@ -2,4 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!-- maintainer-needed --> + <use> + <flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag> + </use> + <upstream> + <remote-id type="github">rpm-software-management/rpm</remote-id> + </upstream> </pkgmetadata> diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild new file mode 100644 index 00000000000..1afa7aeae2c --- /dev/null +++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 + 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 ~sh ~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 ) +" + +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_localpod +} + +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 +} + +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 +}
