diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-05-03 19:51:45 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-05-03 19:51:45 +0000 |
| commit | 99a3d787475c0e9f9c07ae028fc5f2f62095cea5 (patch) | |
| tree | 661710aa58e38d1ca1bcd91b3db48698aea6e222 /sys-libs | |
| parent | Drop ppc-macos keyword, upstream dropped support for building on 10.5. Up th... (diff) | |
| download | gentoo-2-99a3d787475c0e9f9c07ae028fc5f2f62095cea5.tar.gz gentoo-2-99a3d787475c0e9f9c07ae028fc5f2f62095cea5.tar.bz2 gentoo-2-99a3d787475c0e9f9c07ae028fc5f2f62095cea5.zip | |
New glibc now includes nss-db again, so block the old sys-libs/nss-db package.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.15-r1.ebuild | 5 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 5ed75656b077..772c2ec0600d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.845 2012/05/03 02:07:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.846 2012/05/03 19:51:45 robbat2 Exp $ + + 03 May 2012; Robin H. Johnson <robbat2@gentoo.org> glibc-2.15-r1.ebuild, + glibc-9999.ebuild: + New glibc now includes nss-db again, so block the old sys-libs/nss-db package. 03 May 2012; Mike Frysinger <vapier@gentoo.org> files/eblits/src_compile.eblit: diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild index 01785a6a50ee..c057d70c8e3d 100644 --- a/sys-libs/glibc/glibc-2.15-r1.ebuild +++ b/sys-libs/glibc/glibc-2.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.3 2012/05/02 04:47:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.4 2012/05/03 19:51:45 robbat2 Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker @@ -102,7 +102,8 @@ DEPEND=">=sys-devel/gcc-3.4.4 !<sys-devel/patch-2.6 selinux? ( sys-libs/libselinux )" RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + !sys-libs/nss-db" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 1f9c02b76930..3ee3dad6bb5e 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.6 2012/04/21 15:54:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.7 2012/05/03 19:51:45 robbat2 Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -101,7 +101,8 @@ DEPEND=">=sys-devel/gcc-3.4.4 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux )" RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux )" + selinux? ( sys-libs/libselinux ) + !sys-libs/nss-db" if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" |