diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-11-13 21:23:12 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-11-13 21:23:12 +0000 |
| commit | b1ebc96f13d6540e26c87f8e93cd3f198d3dfcfd (patch) | |
| tree | 821865d6a46d453772c03cb64f4a399bf1c58bf9 /sys-libs | |
| parent | avifile removed (diff) | |
| download | historical-b1ebc96f13d6540e26c87f8e93cd3f198d3dfcfd.tar.gz historical-b1ebc96f13d6540e26c87f8e93cd3f198d3dfcfd.tar.bz2 historical-b1ebc96f13d6540e26c87f8e93cd3f198d3dfcfd.zip | |
Only die for problem glibc's.
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.6.ebuild | 17 |
2 files changed, 14 insertions, 11 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d71ac2848a0b..bee2ac3785be 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -136,12 +136,12 @@ MD5 238cdafc41962e84dfbdf9dc3287e576 glibc-2.3.5-r3.ebuild 39000 MD5 1cb57f1757c26c0e0286cb0ef6c36171 glibc-2.3.5.20050421.ebuild 40152 MD5 48b60115273ba9fa755a6ef94fe8c3b6 glibc-2.3.5.20050722.ebuild 39299 MD5 9c15c32a0bbef91769c4fd0c0d7a66c3 glibc-2.3.5.ebuild 40143 -MD5 55310a7c134080d6f187719dd8f0a197 glibc-2.3.6.ebuild 39961 +MD5 cce846022375757eee9f74bcf43b1233 glibc-2.3.6.ebuild 40094 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDdkF41ZcsMnZjRyIRApWAAKChSfuE+XcFJut3ye609XpCMfOeswCfQroW -569t4yVA78hOLW6uoC6EFUU= -=dpcR +iD8DBQFDd6+41ZcsMnZjRyIRAuqIAKCxEVwhm4QAFqau0rmqgWnXDey86wCgoI7Z +k8l7txfSdYgEElAxyMIb51A= +=qcoA -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild index 3b8532ed71fb..be3203fa9c83 100644 --- a/sys-libs/glibc/glibc-2.3.6.ebuild +++ b/sys-libs/glibc/glibc-2.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.5 2005/11/12 19:20:35 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.6 2005/11/13 21:23:12 azarah Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -1066,12 +1066,15 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then fi pkg_setup() { - eerror "Portage have a serious bug in regards to symlinks, and merging" - eerror "this with current versions will fail! See:" - echo - eerror " http://bugs.gentoo.org/show_bug.cgi?id=112082" - echo - #die "Might break upgrading." + if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \ + portageq has_version / '<sys-libs/glibc-2.3.6' ; then + eerror "Portage have a serious bug in regards to symlinks, and merging" + eerror "this with current versions will fail! See:" + echo + eerror " http://bugs.gentoo.org/show_bug.cgi?id=112082" + echo + die "Might break upgrading." + fi if use nptlonly && ! use nptl ; then eerror "If you want nptlonly, add nptl to your USE too ;p" |