summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-07 04:24:18 +0000
committerMike Frysinger <vapier@gentoo.org>2009-09-07 04:24:18 +0000
commitda4f5368e73a516b9344402206ffffcf17e41362 (patch)
tree69cb2c4e0120edf8da91eb868c78782d4f298dec /sys-libs/glibc
parentRemove old versions (diff)
downloadgentoo-2-da4f5368e73a516b9344402206ffffcf17e41362.tar.gz
gentoo-2-da4f5368e73a516b9344402206ffffcf17e41362.tar.bz2
gentoo-2-da4f5368e73a516b9344402206ffffcf17e41362.zip
Block sys-kernel/ps3-sources as it has custom patches which breaks glibc #271367 by Jean-Francis Roy.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog7
-rw-r--r--sys-libs/glibc/glibc-2.10.1.ebuild5
-rw-r--r--sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild5
3 files changed, 12 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 78cee7e13e1f..b6c81746f224 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.639 2009/09/07 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.640 2009/09/07 04:24:18 vapier Exp $
+
+ 07 Sep 2009; Mike Frysinger <vapier@gentoo.org>
+ glibc-2.9_p20081201-r3.ebuild, glibc-2.10.1.ebuild:
+ Block sys-kernel/ps3-sources as it has custom patches which breaks glibc
+ #271367 by Jean-Francis Roy.
07 Sep 2009; Mike Frysinger <vapier@gentoo.org> glibc-2.10.1.ebuild:
Include glibc ports addon again #283239 by Raúl Porcel.
diff --git a/sys-libs/glibc/glibc-2.10.1.ebuild b/sys-libs/glibc/glibc-2.10.1.ebuild
index 67119e3c251d..baa665b4b06f 100644
--- a/sys-libs/glibc/glibc-2.10.1.ebuild
+++ b/sys-libs/glibc/glibc-2.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1.ebuild,v 1.3 2009/09/07 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1.ebuild,v 1.4 2009/09/07 04:24:18 vapier Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -94,7 +94,8 @@ DEPEND=">=sys-devel/gcc-3.4.4
>=sys-apps/sandbox-1.2.18.1-r2
>=sys-apps/portage-2.1.2
selinux? ( sys-libs/libselinux )"
-RDEPEND="nls? ( sys-devel/gettext )
+RDEPEND="!sys-kernel/ps3-sources
+ nls? ( sys-devel/gettext )
selinux? ( sys-libs/libselinux )"
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
index 2839a46cdffa..a4b0d94203b4 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.2 2009/08/30 18:53:19 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.3 2009/09/07 04:24:18 vapier Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -93,7 +93,8 @@ DEPEND=">=sys-devel/gcc-3.4.4
>=sys-apps/sandbox-1.2.18.1-r2
>=sys-apps/portage-2.1.2
selinux? ( sys-libs/libselinux )"
-RDEPEND="nls? ( sys-devel/gettext )
+RDEPEND="!sys-kernel/ps3-sources
+ nls? ( sys-devel/gettext )
selinux? ( sys-libs/libselinux )"
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then