From 526cb2358ca64be332a06b20bc5ce6fc1a15e892 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 19 Apr 2012 10:37:02 +0000 Subject: Version bump the libexecdir patch as I forgot to update one more place that uses /usr/lib hardcoded. Resolves bug#409729. (Portage version: 2.2.0_alpha100/cvs/Linux x86_64) --- app-arch/rpm/ChangeLog | 9 ++- app-arch/rpm/files/rpm-4.9.1.2-libdir.patch | 22 +++++- app-arch/rpm/rpm-4.9.1.2-r1.ebuild | 118 ---------------------------- app-arch/rpm/rpm-4.9.1.2-r2.ebuild | 118 ++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 121 deletions(-) delete mode 100644 app-arch/rpm/rpm-4.9.1.2-r1.ebuild create mode 100644 app-arch/rpm/rpm-4.9.1.2-r2.ebuild (limited to 'app-arch') diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 7cabca6d26b2..264322b165a1 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/rpm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.137 2012/03/24 17:24:42 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.138 2012/04/19 10:37:02 scarabeus Exp $ + +*rpm-4.9.1.2-r2 (19 Apr 2012) + + 19 Apr 2012; Tomáš Chvátal +rpm-4.9.1.2-r2.ebuild, + -rpm-4.9.1.2-r1.ebuild, files/rpm-4.9.1.2-libdir.patch: + Version bump the libexecdir patch as I forgot to update one more place that + uses /usr/lib hardcoded. Resolves bug#409729. 24 Mar 2012; Pawel Hajdan jr rpm-4.9.1.2.ebuild: x86 stable wrt bug #406479 diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch index 2867de86e8e1..221926494411 100644 --- a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch +++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch @@ -1,6 +1,24 @@ +diff -urN rpm-4.9.1.2.old/configure.ac rpm-4.9.1.2/configure.ac +--- rpm-4.9.1.2.old/configure.ac 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/configure.ac 2012-04-19 12:34:50.302722933 +0200 +@@ -846,13 +846,7 @@ + AC_SUBST(RPMCANONGNU) + AC_DEFINE_UNQUOTED([RPMCANONVENDOR],["${RPMCANONVENDOR}"],[canonical vendor]) + +-if test X"$prefix" = XNONE ; then +- usrprefix="$ac_default_prefix" +-else +- usrprefix=$prefix +-fi +- +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`" + AC_SUBST(RPMCONFIGDIR) + + AC_SUBST(OBJDUMP) diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am ---- rpm-4.9.1.2.old/rpm.am 2012-03-21 19:57:33.942448288 +0100 -+++ rpm-4.9.1.2/rpm.am 2012-03-21 20:06:19.045419773 +0100 +--- rpm-4.9.1.2.old/rpm.am 2012-04-19 12:18:27.584725220 +0200 ++++ rpm-4.9.1.2/rpm.am 2012-04-19 12:24:49.035724332 +0200 @@ -1,7 +1,5 @@ # Internal binaries -## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm diff --git a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild b/app-arch/rpm/rpm-4.9.1.2-r1.ebuild deleted file mode 100644 index d8aa363d5294..000000000000 --- a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r1.ebuild,v 1.1 2012/03/21 19:19:35 scarabeus Exp $ - -EAPI=4 - -PYTHON_DEPEND="2" - -inherit eutils autotools flag-o-matic perl-module python - -DESCRIPTION="Red Hat Package Management Utils" -HOMEPAGE="http://www.rpm.org" -SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" - -IUSE="nls python doc caps lua acl" - -RDEPEND=">=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? ( >=dev-lang/python-2.3 ) - nls? ( virtual/libintl ) - lua? ( >=dev-lang/lua-5.1.0[deprecated] ) - acl? ( virtual/acl ) - caps? ( >=sys-libs/libcap-2.0 )" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - doc? ( app-doc/doxygen )" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-4.8.1-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" - - eautoreconf -} - -src_configure() { - econf \ - --without-selinux \ - --with-external-db \ - $(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 - find "${ED}" -name '*.la' -exec rm -f {} + - - 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 - - use python && python_mod_optimize rpm -} - -pkg_postrm() { - use python && python_mod_cleanup rpm -} diff --git a/app-arch/rpm/rpm-4.9.1.2-r2.ebuild b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild new file mode 100644 index 000000000000..deac8965f4cc --- /dev/null +++ b/app-arch/rpm/rpm-4.9.1.2-r2.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r2.ebuild,v 1.1 2012/04/19 10:37:02 scarabeus Exp $ + +EAPI=4 + +PYTHON_DEPEND="2" + +inherit eutils autotools flag-o-matic perl-module python + +DESCRIPTION="Red Hat Package Management Utils" +HOMEPAGE="http://www.rpm.org" +SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86" + +IUSE="nls python doc caps lua acl" + +RDEPEND=">=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? ( >=dev-lang/python-2.3 ) + nls? ( virtual/libintl ) + lua? ( >=dev-lang/lua-5.1.0[deprecated] ) + acl? ( virtual/acl ) + caps? ( >=sys-libs/libcap-2.0 )" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + doc? ( app-doc/doxygen )" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-4.8.1-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" + + eautoreconf +} + +src_configure() { + econf \ + --without-selinux \ + --with-external-db \ + $(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 + find "${ED}" -name '*.la' -exec rm -f {} + + + 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 + + use python && python_mod_optimize rpm +} + +pkg_postrm() { + use python && python_mod_cleanup rpm +} -- cgit v1.2.3-65-gdbad