diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-05-03 19:52:55 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-05-03 19:52:55 +0000 |
| commit | c9c2032ea1e7ce39b088c1fa1e8c079dba2b5c26 (patch) | |
| tree | 52e143bef8488bd2c3a67fa9b7d403e4c13ac14a | |
| parent | Create patchset tarball because of the valgrind patch filesize. (diff) | |
| download | gentoo-2-c9c2032ea1e7ce39b088c1fa1e8c079dba2b5c26.tar.gz gentoo-2-c9c2032ea1e7ce39b088c1fa1e8c079dba2b5c26.tar.bz2 gentoo-2-c9c2032ea1e7ce39b088c1fa1e8c079dba2b5c26.zip | |
New glibc now includes nss-db again, so block the new glibc here, and block nss-db in new glibc
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
| -rw-r--r-- | sys-libs/nss-db/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-libs/nss-db/nss-db-2.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild | 7 | ||||
| -rw-r--r-- | sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild | 7 |
4 files changed, 17 insertions, 10 deletions
diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog index df2bccdcd303..8e1f661094cd 100644 --- a/sys-libs/nss-db/ChangeLog +++ b/sys-libs/nss-db/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/nss-db -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.22 2010/06/18 06:23:55 robbat2 Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.23 2012/05/03 19:52:55 robbat2 Exp $ + + 03 May 2012; Robin H. Johnson <robbat2@gentoo.org> nss-db-2.2-r1.ebuild, + nss-db-2.2.3_pre1-r2.ebuild, nss-db-2.2.3_pre1-r3.ebuild: + New glibc now includes nss-db again, so block the new glibc here, and block + nss-db in new glibc *nss-db-2.2.3_pre1-r3 (18 Jun 2010) diff --git a/sys-libs/nss-db/nss-db-2.2-r1.ebuild b/sys-libs/nss-db/nss-db-2.2-r1.ebuild index 3f8dc9fa65e2..521112ee6f86 100644 --- a/sys-libs/nss-db/nss-db-2.2-r1.ebuild +++ b/sys-libs/nss-db/nss-db-2.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2-r1.ebuild,v 1.19 2007/02/26 09:12:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2-r1.ebuild,v 1.20 2012/05/03 19:52:55 robbat2 Exp $ inherit libtool eutils diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild index 4e5bb488e5b2..abba79f37a6d 100644 --- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild +++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild,v 1.8 2009/12/08 19:03:52 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r2.ebuild,v 1.9 2012/05/03 19:52:55 robbat2 Exp $ inherit eutils versionator multilib autotools @@ -25,7 +25,8 @@ IUSE="nls" RDEPEND=">=sys-libs/db-4 sys-apps/gawk sys-devel/make - >=sys-libs/glibc-2.3" + >=sys-libs/glibc-2.3 + !>=sys-libs/glibc-2.15" # We really do need gettext to compile always :-( DEPEND="${RDEPEND} sys-devel/gettext" diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild index 0d3af585600f..a5497b1eb76d 100644 --- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild +++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild,v 1.2 2010/06/21 21:09:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r3.ebuild,v 1.3 2012/05/03 19:52:55 robbat2 Exp $ inherit eutils versionator multilib autotools @@ -25,7 +25,8 @@ IUSE="nls" RDEPEND=">=sys-libs/db-4 sys-apps/gawk sys-devel/make - >=sys-libs/glibc-2.3" + >=sys-libs/glibc-2.3 + !>=sys-libs/glibc-2.15" # We really do need gettext to compile always :-( DEPEND="${RDEPEND} sys-devel/gettext" |