From ea9f8aa8b51e2dfb97cb9ce08f6c986756fe9f1e Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 29 Jan 2007 22:05:49 +0000 Subject: [PATCH] Install libstdc++.so.5 if gcc 3.4.* is not installed. Package-Manager: portage-2.1.2-r4 --- app-emulation/emul-linux-x86-compat/ChangeLog | 6 ++++- app-emulation/emul-linux-x86-compat/Manifest | 22 +++++++++---------- .../emul-linux-x86-compat-1.0-r3.ebuild | 7 ++++-- 3 files changed, 21 insertions(+), 14 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 + 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/Manifest b/app-emulation/emul-linux-x86-compat/Manifest index b0217065ad15..ae48e86a7a15 100644 --- a/app-emulation/emul-linux-x86-compat/Manifest +++ b/app-emulation/emul-linux-x86-compat/Manifest @@ -14,14 +14,14 @@ EBUILD emul-linux-x86-compat-1.0-r2.ebuild 916 RMD160 fe8e31d18dbc32797bed1b5344 MD5 b844d8e50c57ef773f287e65e7f30dfe emul-linux-x86-compat-1.0-r2.ebuild 916 RMD160 fe8e31d18dbc32797bed1b53440959fca23a2e3d emul-linux-x86-compat-1.0-r2.ebuild 916 SHA256 2f6e4f8fa5650fec5b23605d09998ce78ec5ea12559feaf1f05b92ebaec5b75d emul-linux-x86-compat-1.0-r2.ebuild 916 -EBUILD emul-linux-x86-compat-1.0-r3.ebuild 951 RMD160 3a43cda180ea82c71983c41e5434e00c98c21ca8 SHA1 b94c19dfe8a6c396d5d295b47dbab711c16ad264 SHA256 f9f3fb300c6b255d6d0771a4a10c9f5e3e045a8b7d18ae5e19ad56941ffcca70 -MD5 ea276b206c3d74e4059bc714fbfba8f2 emul-linux-x86-compat-1.0-r3.ebuild 951 -RMD160 3a43cda180ea82c71983c41e5434e00c98c21ca8 emul-linux-x86-compat-1.0-r3.ebuild 951 -SHA256 f9f3fb300c6b255d6d0771a4a10c9f5e3e045a8b7d18ae5e19ad56941ffcca70 emul-linux-x86-compat-1.0-r3.ebuild 951 -MISC ChangeLog 2266 RMD160 95f12faafdd6d5f23e30b25dfc24e9338a2f6fd4 SHA1 5a4ef36509b72e654bfc3bd7d98975669e9d2b06 SHA256 d9df2530b9b824beb1b9ac3f394040df58f2f67393191ac4dbfc8b8f904f39aa -MD5 c038f5a1fac5369b96600764afef0b2a ChangeLog 2266 -RMD160 95f12faafdd6d5f23e30b25dfc24e9338a2f6fd4 ChangeLog 2266 -SHA256 d9df2530b9b824beb1b9ac3f394040df58f2f67393191ac4dbfc8b8f904f39aa ChangeLog 2266 +EBUILD emul-linux-x86-compat-1.0-r3.ebuild 1050 RMD160 a05e15723ab17b1ea196bacbc18e1166432512a5 SHA1 8f4d340e93cead027e75a1ffa2fccb105f315670 SHA256 eb18f690a2df2532a582c0fdfb9f67f6a9d45b721fcd5822f5e821038898362b +MD5 b04570be72158a01be956ef30a8c423d emul-linux-x86-compat-1.0-r3.ebuild 1050 +RMD160 a05e15723ab17b1ea196bacbc18e1166432512a5 emul-linux-x86-compat-1.0-r3.ebuild 1050 +SHA256 eb18f690a2df2532a582c0fdfb9f67f6a9d45b721fcd5822f5e821038898362b emul-linux-x86-compat-1.0-r3.ebuild 1050 +MISC ChangeLog 2414 RMD160 cc79fde012f3969bae373e5f060002fd599b0f11 SHA1 2da83cd13c6affa9749f88f6bf3a6d11ea8b02e7 SHA256 e70ff50de3f051221dcf6abe054e4a5040f6b0bccf3f57ca652d7fe0da6b143d +MD5 e6d541a0c49301d168af26329601ed43 ChangeLog 2414 +RMD160 cc79fde012f3969bae373e5f060002fd599b0f11 ChangeLog 2414 +SHA256 e70ff50de3f051221dcf6abe054e4a5040f6b0bccf3f57ca652d7fe0da6b143d ChangeLog 2414 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290 @@ -38,7 +38,7 @@ SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFvh9JGDyatLGpTbYRAv74AJ99FyJjuY47kGJhFJq8LDN3n2kvsQCgmTVf -gMVcsndg73r9uV51kS5Yulw= -=qpL8 +iD8DBQFFvm/EGDyatLGpTbYRAiTxAJ9HokJBXM2rMqS/zch5q6P01G1DEACfca+d +CO57dGKGM86t0Y1/Y07aKcY= +=xHts -----END PGP SIGNATURE----- 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() { -- 2.26.2