summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2007-01-29 22:05:49 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2007-01-29 22:05:49 +0000
commitd9c32fc95622bb472b7e6fb9dce6d42bff4fac87 (patch)
tree4034ac3aa69163306ab2e2cb95e422b42a92353a /app-emulation/emul-linux-x86-compat
parentImport from dev overlay for proxy maintaining (diff)
downloadgentoo-2-d9c32fc95622bb472b7e6fb9dce6d42bff4fac87.tar.gz
gentoo-2-d9c32fc95622bb472b7e6fb9dce6d42bff4fac87.tar.bz2
gentoo-2-d9c32fc95622bb472b7e6fb9dce6d42bff4fac87.zip
Install libstdc++.so.5 if gcc 3.4.* is not installed.
(Portage version: 2.1.2-r4)
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, 10 insertions, 3 deletions
diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index b1b3a8cfe57c..ded3a989ac5a 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.13 2007/01/29 16:22:26 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.14 2007/01/29 22:05:49 drizzt Exp $
+
+ 29 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
+ emul-linux-x86-compat-1.0-r3.ebuild:
+ Install libstdc++.so.5 if gcc 3.4.* is not installed.
*emul-linux-x86-compat-1.0-r3 (29 Jan 2007)
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 da35883b4bec..9b4ff799b23f 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.1 2007/01/29 16:22:26 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/emul-linux-x86-compat-1.0-r3.ebuild,v 1.2 2007/01/29 22:05:49 drizzt 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/"
@@ -22,7 +22,10 @@ src_unpack() {
rm emul/linux/x86/usr/lib32 || die
rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die
rm usr/lib32/libsmpeg* || die
- rm usr/lib32/libstdc++.so.[56]* || die "See bug #160335"
+ rm usr/lib32/libstdc++.so.6* || die "See bug #160335"
+ if has_version =sys-devel/gcc-3.4*; then
+ rm usr/lib32/libstdc++.so.5* || die "See bug #160335"
+ fi
}
src_install() {