sochotnicky 14/07/11 19:25:21 Modified: ChangeLog Added: rpm-4.11.2-r1.ebuild Log: app-arch/rpm: Hacky fix for #492642 (force /usr/bin/python2 as %__python) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 7B087241)
Revision Changes Path 1.189 app-arch/rpm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?rev=1.189&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?rev=1.189&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/ChangeLog?r1=1.188&r2=1.189 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- ChangeLog 9 Jun 2014 07:33:34 -0000 1.188 +++ ChangeLog 11 Jul 2014 19:25:21 -0000 1.189 @@ -1,6 +1,12 @@ # ChangeLog for app-arch/rpm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.188 2014/06/09 07:33:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.189 2014/07/11 19:25:21 sochotnicky Exp $ + +*rpm-4.11.2-r1 (11 Jul 2014) + + 11 Jul 2014; Stanislav Ochotnicky <[email protected]> + +rpm-4.11.2-r1.ebuild: + Hacky fix for #492642 (force /usr/bin/python2 as %__python) *rpm-4.11.2 (09 Jun 2014) 1.1 app-arch/rpm/rpm-4.11.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/rpm-4.11.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rpm/rpm-4.11.2-r1.ebuild?rev=1.1&content-type=text/plain Index: rpm-4.11.2-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.11.2-r1.ebuild,v 1.1 2014/07/11 19:25:21 sochotnicky Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator DESCRIPTION="Red Hat Package Management Utils" HOMEPAGE="http://www.rpm.org"; SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="nls python doc caps lua acl selinux" RDEPEND="!app-arch/rpm5 >=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 ) selinux? ( sec-policy/selinux-rpm )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen )" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " src_prepare() { epatch \ "${FILESDIR}"/${PN}-4.11.0-autotools.patch \ "${FILESDIR}"/${PN}-4.8.1-db-path.patch \ "${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@:/usr/bin/python2:' macros.in || die "Fixing %__python failed" 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 \ --without-beecrypt \ $(use_enable python) \ $(use_with doc hackingdocs) \ $(use_enable nls) \ $(use_with lua) \ $(use_with caps cap) \ $(use_with acl) } src_compile() { default } src_install() { default # remove la files prune_libtool_files --all mv "${ED}"/bin/rpm "${ED}"/usr/bin rmdir "${ED}"/bin # fix symlinks to /bin/rpm (#349840) for binary in rpmquery rpmverify;do ln -sf rpm "${ED}"/usr/bin/${binary} done use nls || rm -rf "${ED}"/usr/share/man/?? keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} dodoc CHANGES CREDITS GROUPS README* if use doc; then pushd doc/hacking/html dohtml -p hacking -r . popd pushd doc/librpm/html dohtml -p librpm -r . popd fi # Fix perllocal.pod file collision fixlocalpod } 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}" else einfo "No RPM database found... Creating database..." "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}" fi }
