summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-02-15 11:38:32 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-02-15 11:38:32 +0000
commita7003d00cc3c3892c6951232ea7c0bb4e537455b (patch)
tree844ff411d65354baa64c407e06cfeafb56cb85d0 /app-arch/rpm
parentFix underlinking - bug #456302 (diff)
downloadgentoo-2-a7003d00cc3c3892c6951232ea7c0bb4e537455b.tar.gz
gentoo-2-a7003d00cc3c3892c6951232ea7c0bb4e537455b.tar.bz2
gentoo-2-a7003d00cc3c3892c6951232ea7c0bb4e537455b.zip
Cleanup older.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-arch/rpm')
-rw-r--r--app-arch/rpm/ChangeLog6
-rw-r--r--app-arch/rpm/files/rpm-4.8.1-autotools.patch32
-rw-r--r--app-arch/rpm/rpm-4.10.0.ebuild123
3 files changed, 5 insertions, 156 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index cb68138d603f..b7108a6292b7 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/rpm
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.172 2013/02/08 14:46:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.173 2013/02/15 11:38:31 scarabeus Exp $
+
+ 15 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/rpm-4.8.1-autotools.patch, -rpm-4.10.0.ebuild:
+ Cleanup older.
08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> rpm-4.10.2.ebuild:
Stable for s390, wrt bug #450286
diff --git a/app-arch/rpm/files/rpm-4.8.1-autotools.patch b/app-arch/rpm/files/rpm-4.8.1-autotools.patch
deleted file mode 100644
index 21cf254b91b7..000000000000
--- a/app-arch/rpm/files/rpm-4.8.1-autotools.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8c2ef50..2fc75f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,14 +305,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
- # which we use too and hopefully is slightly more unique to NSS.
- WITH_NSS_INCLUDE=
- WITH_NSS_LIB=
--AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
-- AC_MSG_ERROR([missing required NSPR / NSS header])
--])
--AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
-- WITH_NSS_LIB=-lnss3
--], [
-- AC_MSG_ERROR([missing required NSS library 'nss3'])
--])
-+PKG_CHECK_MODULES(NSS, [ nss >= 3.0.0 ])
-+WITH_NSS_INCLUDE=$NSS_CFLAGS
-+WITH_NSS_LIB=$NSS_LIBS
- AC_SUBST(WITH_NSS_INCLUDE)
- AC_SUBST(WITH_NSS_LIB)
-
-@@ -1014,9 +1009,6 @@ AC_SUBST(RPMCONFIGDIR)
-
- AC_SUBST(OBJDUMP)
-
--if test "$with_external_db" = no; then
-- AC_CONFIG_SUBDIRS(db3)
--fi
-
- AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no])
- AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no])
diff --git a/app-arch/rpm/rpm-4.10.0.ebuild b/app-arch/rpm/rpm-4.10.0.ebuild
deleted file mode 100644
index 2c5c5599abe0..000000000000
--- a/app-arch/rpm/rpm-4.10.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.10 2013/01/07 03:02:00 floppym Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit eutils autotools flag-o-matic perl-module python 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"
-
-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? ( >=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 )
- selinux? ( sec-policy/selinux-rpm )"
-
-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
-
- # Prevent automake maintainer mode from kicking in (#450448).
- touch -r Makefile.am preinstall.am
-}
-
-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
-}