version bump to latest, removing the oldest

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)

3 files changed, 20 insertions, 59 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index fc6ea283d201..1ab509092bdc 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.186 2013/06/30 18:04:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.187 2013/07/24 15:16:24 miska Exp $
+
+*rpm-4.11.1 (24 Jul 2013)
+
+  24 Jul 2013; Michal Hrusecky <miska@gentoo.org> +rpm-4.11.1.ebuild,
+  -files/rpm-4.10.2-autotools.patch, -rpm-4.10.2.ebuild:
+  version bump to latest, removing the oldest
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> rpm-4.11.0.1.ebuild:
   Stable for s390, wrt bug #471456
diff --git a/app-arch/rpm/files/rpm-4.10.2-autotools.patch b/app-arch/rpm/files/rpm-4.10.2-autotools.patch
deleted file mode 100644
index e3ae0f9721d2..000000000000
--- a/app-arch/rpm/files/rpm-4.10.2-autotools.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 19e32bc..c74221a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,18 +245,12 @@ 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_CHECK_LIB(nss3, NSS_InitContext, [
--    AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if NSS has NSS_InitContext])
--    AC_SUBST(HAVE_NSS_INITCONTEXT, [1])
--  ])
--], [
--  AC_MSG_ERROR([missing required NSS library 'nss3'])
--])
-+# NSS_InitContext() was added in 3.12.5
-+PKG_CHECK_MODULES(NSS, [ nss >= 3.12.5 ])
-+AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if NSS has NSS_InitContext])
-+AC_SUBST(HAVE_NSS_INITCONTEXT, [1])
-+WITH_NSS_INCLUDE=$NSS_CFLAGS
-+WITH_NSS_LIB=$NSS_LIBS
- AC_SUBST(WITH_NSS_INCLUDE)
- AC_SUBST(WITH_NSS_LIB)
- 
-@@ -797,10 +791,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])
- AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes])
diff --git a/app-arch/rpm/rpm-4.10.2.ebuild b/app-arch/rpm/rpm-4.11.1.ebuild
index 2caab8eaf492..5447018ae324 100644
--- a/app-arch/rpm/rpm-4.10.2.ebuild
+++ b/app-arch/rpm/rpm-4.11.1.ebuild
@@ -1,12 +1,12 @@
 # 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.2.ebuild,v 1.10 2013/02/08 14:46:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.11.1.ebuild,v 1.1 2013/07/24 15:16:24 miska Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils autotools flag-o-matic perl-module python versionator
+inherit eutils autotools flag-o-matic perl-module python-single-r1 versionator
 
 DESCRIPTION="Red Hat Package Management Utils"
 HOMEPAGE="http://www.rpm.org"
@@ -14,7 +14,7 @@ SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.t
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+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"
 
@@ -28,7 +28,7 @@ RDEPEND="!app-arch/rpm5
 	virtual/libintl
 	>=dev-lang/perl-5.8.8
 	dev-libs/nss
-	python? ( >=dev-lang/python-2.3 )
+	python? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
 	acl? ( virtual/acl )
@@ -39,14 +39,13 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${PN}-4.11.0-autotools.patch \
 		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
 		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
 
@@ -60,9 +59,11 @@ src_prepare() {
 }
 
 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) \
@@ -79,7 +80,7 @@ src_install() {
 	default
 
 	# remove la files
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 
 	mv "${ED}"/bin/rpm "${ED}"/usr/bin
 	rmdir "${ED}"/bin
@@ -114,10 +115,4 @@ pkg_postinst() {
 		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
 }