summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-02-11 23:04:41 +0000
committerSimon Stelling <blubb@gentoo.org>2007-02-11 23:04:41 +0000
commitdfdeeed593b19e80d79281c96cebfe72f987c9b9 (patch)
tree001d931248c33ed2798f5b3da99a60053b9bdeac /app-emulation/emul-linux-x86-compat
parentFix live detection, bug #160320 (diff)
downloadgentoo-2-dfdeeed593b19e80d79281c96cebfe72f987c9b9.tar.gz
gentoo-2-dfdeeed593b19e80d79281c96cebfe72f987c9b9.tar.bz2
gentoo-2-dfdeeed593b19e80d79281c96cebfe72f987c9b9.zip
block against gcc-3.3; bug 160335
(Portage version: 2.1.2-r7)
Diffstat (limited to 'app-emulation/emul-linux-x86-compat')
-rw-r--r--app-emulation/emul-linux-x86-compat/ChangeLog6
-rw-r--r--app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild7
2 files changed, 8 insertions, 5 deletions
diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index 64ae001a80a3..bb8a1e2b79ec 100644
--- a/app-emulation/emul-linux-x86-compat/ChangeLog
+++ b/app-emulation/emul-linux-x86-compat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/emul-linux-x86-compat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.15 2007/01/30 20:31:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.16 2007/02/11 23:04:41 blubb Exp $
+
+ 11 Feb 2007; Simon Stelling <blubb@gentoo.org>
+ emul-linux-x86-compat-1.0-r3.ebuild:
+ block against gcc-3.3; bug 160335
30 Jan 2007; Doug Goldstein <cardoe@gentoo.org>
emul-linux-x86-compat-1.0-r3.ebuild:
diff --git a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild
index 9be880f3d40e..969c535c7718 100644
--- a/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild
+++ b/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild,v 1.3 2007/01/30 20:31:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild,v 1.4 2007/02/11 23:04:41 blubb Exp $
DESCRIPTION="emul-linux-x86 version of lib-compat, with the addition of a 32bit libgcc_s and the libstdc++ versions provided by gcc 3.3 and 3.4 for non-multilib systems."
HOMEPAGE="http://www.gentoo.org/"
@@ -12,6 +12,8 @@ KEYWORDS="-* ~amd64"
IUSE=""
RESTRICT="nostrip"
+RDEPEND="!=sys-devel/gcc-3.3*"
+
S=${WORKDIR}
src_unpack() {
@@ -23,9 +25,6 @@ src_unpack() {
rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die
rm usr/lib32/libsmpeg* || die
rm usr/lib32/libstdc++.so.6* || die "See bug #160335"
- if has_version =sys-devel/gcc-3.3*; then
- rm usr/lib32/libstdc++.so.5* || die "See bug #160335"
- fi
}
src_install() {