From: Doug Goldstein Date: Tue, 30 Jan 2007 20:31:05 +0000 (+0000) Subject: gcc 3.4 does not provide libstdc++.so.5. Fixing this so it checks gcc 3.3 instead X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2431b5d21b40d149f1a8ff4ee16913423947a425;p=gentoo.git gcc 3.4 does not provide libstdc++.so.5. Fixing this so it checks gcc 3.3 instead Package-Manager: portage-2.1.2-r5 --- diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog index ded3a989ac5a..64ae001a80a3 100644 --- a/app-emulation/emul-linux-x86-compat/ChangeLog +++ b/app-emulation/emul-linux-x86-compat/ChangeLog @@ -1,6 +1,11 @@ # 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.14 2007/01/29 22:05:49 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-compat/ChangeLog,v 1.15 2007/01/30 20:31:05 cardoe Exp $ + + 30 Jan 2007; Doug Goldstein + emul-linux-x86-compat-1.0-r3.ebuild: + gcc 3.4 does not provide libstdc++.so.5. Fixing this so it checks gcc 3.3 + instead 29 Jan 2007; Timothy Redaelli emul-linux-x86-compat-1.0-r3.ebuild: diff --git a/app-emulation/emul-linux-x86-compat/Manifest b/app-emulation/emul-linux-x86-compat/Manifest index ae48e86a7a15..44d5d898dc52 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 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 +EBUILD emul-linux-x86-compat-1.0-r3.ebuild 1050 RMD160 fd4f071413aee3645f33dbc375d21da95b746e02 SHA1 9b8ccdab004a30c452b3dac026ae73ababaf7566 SHA256 c23ee1a138784ae6f914f493ac35935d1f80420b4e6fbaedfde1ba2276173c6f +MD5 28bd80dfb2e78ae3e98c435c3438de98 emul-linux-x86-compat-1.0-r3.ebuild 1050 +RMD160 fd4f071413aee3645f33dbc375d21da95b746e02 emul-linux-x86-compat-1.0-r3.ebuild 1050 +SHA256 c23ee1a138784ae6f914f493ac35935d1f80420b4e6fbaedfde1ba2276173c6f emul-linux-x86-compat-1.0-r3.ebuild 1050 +MISC ChangeLog 2590 RMD160 f186476a28371cf3fd1b9954118cfbbbd38c3ed6 SHA1 529cf91fb227541b5e27f83ab92f71ccd71c8ef6 SHA256 86b4c14a1c0c6f80cdc2eb1c01e0c152546bffa03a3b5bfcafbc01fdf29562fb +MD5 864e031a37779c64b95816785a0bb2c8 ChangeLog 2590 +RMD160 f186476a28371cf3fd1b9954118cfbbbd38c3ed6 ChangeLog 2590 +SHA256 86b4c14a1c0c6f80cdc2eb1c01e0c152546bffa03a3b5bfcafbc01fdf29562fb ChangeLog 2590 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) -iD8DBQFFvm/EGDyatLGpTbYRAiTxAJ9HokJBXM2rMqS/zch5q6P01G1DEACfca+d -CO57dGKGM86t0Y1/Y07aKcY= -=xHts +iD8DBQFFv6svoeSe8B0zEfwRAvamAJoDhcM2UzG/pugUr8OKqjgt8bvaUwCeO5e7 +B7UWQuBLmWdfKf10v0KUV8I= +=Oq4n -----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 9b4ff799b23f..9be880f3d40e 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.2 2007/01/29 22:05:49 drizzt Exp $ +# $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 $ 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/" @@ -23,7 +23,7 @@ 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.4*; then + if has_version =sys-devel/gcc-3.3*; then rm usr/lib32/libstdc++.so.5* || die "See bug #160335" fi }