diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2013-01-05 00:00:32 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2013-01-05 00:00:32 +0000 |
| commit | a0dfffcd4e26cafe6c48b6a4feec58ce85b1ec5e (patch) | |
| tree | aca1280fc3f6f5f51c2e23248836978998134e41 /app-arch | |
| parent | version bump, remove old (diff) | |
| download | gentoo-2-a0dfffcd4e26cafe6c48b6a4feec58ce85b1ec5e.tar.gz gentoo-2-a0dfffcd4e26cafe6c48b6a4feec58ce85b1ec5e.tar.bz2 gentoo-2-a0dfffcd4e26cafe6c48b6a4feec58ce85b1ec5e.zip | |
Version bump and fix #450286
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 7B087241)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 10 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.10.2-autotools.patch | 40 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.10.2.ebuild (renamed from app-arch/rpm/rpm-4.10.1.ebuild) | 6 |
3 files changed, 51 insertions, 5 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 9924b510e6b0..c846ea65da37 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,12 @@ # 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.162 2012/10/24 13:39:52 scarabeus Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.163 2013/01/05 00:00:32 sochotnicky Exp $ + +*rpm-4.10.2 (04 Jan 2013) + + 04 Jan 2013; Stanislav Ochotnicky <sochotnicky@gentoo.org> + -rpm-4.10.1.ebuild, +rpm-4.10.2.ebuild, +files/rpm-4.10.2-autotools.patch: + Version bump and fix #450286 *rpm-4.10.1 (24 Oct 2012) diff --git a/app-arch/rpm/files/rpm-4.10.2-autotools.patch b/app-arch/rpm/files/rpm-4.10.2-autotools.patch new file mode 100644 index 000000000000..e3ae0f9721d2 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.10.2-autotools.patch @@ -0,0 +1,40 @@ +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.1.ebuild b/app-arch/rpm/rpm-4.10.2.ebuild index 45d2afb1323a..3bc3164898c1 100644 --- a/app-arch/rpm/rpm-4.10.1.ebuild +++ b/app-arch/rpm/rpm-4.10.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.1.ebuild,v 1.1 2012/10/24 13:39:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.2.ebuild,v 1.1 2013/01/05 00:00:32 sochotnicky Exp $ EAPI=4 @@ -46,7 +46,7 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}"/${PN}-4.8.1-autotools.patch \ + "${FILESDIR}"/${P}-autotools.patch \ "${FILESDIR}"/${PN}-4.8.1-db-path.patch \ "${FILESDIR}"/${PN}-4.9.1.2-libdir.patch |