block against gcc-3.3; bug 160335

Package-Manager: portage-2.1.2-r7

diff --git a/app-emulation/emul-linux-x86-compat/ChangeLog b/app-emulation/emul-linux-x86-compat/ChangeLog
index 64ae001a80a30f6ec73566ee2013c8989bb32d2c..bb8a1e2b79ec563ea4db3dcc5160807b458d259c 100644 (file)
--- 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/Manifest b/app-emulation/emul-linux-x86-compat/Manifest
index 44d5d898dc5211dda7e15d35d40704319d159e49..cfdbdca3a4afbca1a0a92157ea17e15d89824fb2 100644 (file)
--- a/app-emulation/emul-linux-x86-compat/Manifest
+++ b/app-emulation/emul-linux-x86-compat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 75emul-linux-x86-compat 51 RMD160 1c52b6d125a8ee61fb909a085a8c935096e2bcb4 SHA1 0254cfddb3a2653ccb61db5250d83bc0bbed6cbb SHA256 6d5b1311705d20d551fd993fcacef7237e818dcb39a757e00a0943c0a4b4dc24
 MD5 3ac141b3a5850345c246b5c4ce924ccc files/75emul-linux-x86-compat 51
 RMD160 1c52b6d125a8ee61fb909a085a8c935096e2bcb4 files/75emul-linux-x86-compat 51
@@ -14,14 +11,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 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
+EBUILD emul-linux-x86-compat-1.0-r3.ebuild 979 RMD160 8f92adb36f4929ce0f754e942b40c14c894fb483 SHA1 86b54f46cfbf7e7ca2f6a47177ae5245c5c6f805 SHA256 f2429d718b37ac2d1d2b20af3640ddc4db394f310206d42a77dc7148edd4ae1c
+MD5 6c87a0b71879ceb6c4da1e01bf591c29 emul-linux-x86-compat-1.0-r3.ebuild 979
+RMD160 8f92adb36f4929ce0f754e942b40c14c894fb483 emul-linux-x86-compat-1.0-r3.ebuild 979
+SHA256 f2429d718b37ac2d1d2b20af3640ddc4db394f310206d42a77dc7148edd4ae1c emul-linux-x86-compat-1.0-r3.ebuild 979
+MISC ChangeLog 2714 RMD160 0c8db62d629df6ef00b4d4b539e640d56ce23c81 SHA1 18b33d6f9975f52ba279510f0c8ff5bfd339083b SHA256 e17bc844a27dffe3a4af1de9b273153a616b21ba76ef57ce4eb09dba09998c09
+MD5 3446242c4ba400e0a12665b9c955745e ChangeLog 2714
+RMD160 0c8db62d629df6ef00b4d4b539e640d56ce23c81 ChangeLog 2714
+SHA256 e17bc844a27dffe3a4af1de9b273153a616b21ba76ef57ce4eb09dba09998c09 ChangeLog 2714
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -35,10 +32,3 @@ SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/di
 MD5 c9fb4a2c6f68ff747501a9169d19b328 files/digest-emul-linux-x86-compat-1.0-r3 283
 RMD160 bf7160a735daad1bc793a9d40b762e7e6b12b611 files/digest-emul-linux-x86-compat-1.0-r3 283
 SHA256 33b3c14488102a4d7d16130edac27a554d87c39bb9cf110f5eefb599f07f94fb files/digest-emul-linux-x86-compat-1.0-r3 283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-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 9be880f3d40ea625f9ff8ee8df3fc24235df5196..969c535c771893e58b67c6bbe455d47cbfdc46d9 100644 (file)
--- 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() {

diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index adcb0b14513fb8260e42bb76a9c8fc40895e2b3c..01d82ca24f71138d6744cda54989757ef267e3f3 100644 (file)
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST emul-linux-x86-xlibs-7.0-r2.tar.bz2 3232574 RMD160 84a00d0359e05f7e62259871bfd9106bfa25b946 SHA1 92555283cb7cb33e1dd0f49a0ec62131e8171618 SHA256 97a3bf82aa66ed71068dbeac5531dd763eb082b01cad956886b3291e769b6279
 DIST emul-linux-x86-xlibs-7.0-r3.tar.bz2 3221125 RMD160 a0acb4e4f67fe7a204e6f4ac74c517a942995fc3 SHA1 77758cfcccf34b795a41ce77aa526fce75ef5cae SHA256 b50346ea7f4d581c3bea982051936da3a3c9b4a66ea70f3f47af1bc6ad3c4b41
 DIST emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393 RMD160 e778ad9600bc573b650f87da440722ad680b9836 SHA1 2292dc98f4bea53dc794e5527b47b7a578cd2416 SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4
@@ -26,14 +23,14 @@ EBUILD emul-linux-x86-xlibs-7.0-r5.ebuild 2356 RMD160 26c3b366306d34466cb93aef16
 MD5 e4a952cd9db9abb054958a4a9bb917ae emul-linux-x86-xlibs-7.0-r5.ebuild 2356
 RMD160 26c3b366306d34466cb93aef16c4f2fdecd11366 emul-linux-x86-xlibs-7.0-r5.ebuild 2356
 SHA256 da2cb099b24827c202665c8ed9b7971677076d7adc507a23710a377178d33c95 emul-linux-x86-xlibs-7.0-r5.ebuild 2356
-EBUILD emul-linux-x86-xlibs-7.0-r8.ebuild 2437 RMD160 f73d0241f0f953ce0899aaaf5349ae6130218f97 SHA1 e90e401cbe9db638ef8049bc2a7e069579460459 SHA256 eb6f6f57707846700f3863894abf089db7774c1f89476f9499fb8e01723f9553
-MD5 45a472862db1550c3ec665a7c55c0d4f emul-linux-x86-xlibs-7.0-r8.ebuild 2437
-RMD160 f73d0241f0f953ce0899aaaf5349ae6130218f97 emul-linux-x86-xlibs-7.0-r8.ebuild 2437
-SHA256 eb6f6f57707846700f3863894abf089db7774c1f89476f9499fb8e01723f9553 emul-linux-x86-xlibs-7.0-r8.ebuild 2437
-MISC ChangeLog 10115 RMD160 adcef76f675321faaa533c1884e8033e81106f11 SHA1 cd3fad132832081217f5d4ddf9b62804ddc89618 SHA256 b5a40327af500d17a79ccb40a93d339f1eab03480d6bb04200ff2ada2f75717e
-MD5 8ab6c8a0ec5ee4ca5df2466efa683179 ChangeLog 10115
-RMD160 adcef76f675321faaa533c1884e8033e81106f11 ChangeLog 10115
-SHA256 b5a40327af500d17a79ccb40a93d339f1eab03480d6bb04200ff2ada2f75717e ChangeLog 10115
+EBUILD emul-linux-x86-xlibs-7.0-r8.ebuild 2590 RMD160 368732f6ccb8b54dc1c820eb04eaf854b99ea551 SHA1 9e4cc5dfa72af3bffea32f6d0ee68ad78dc99a27 SHA256 a68ac08589b79c9c9b44ffca9d3f0d3293d443ebf3f287a9a9fc54d070492ea3
+MD5 5bde1e9fdadc2986c778d5fdc03175ea emul-linux-x86-xlibs-7.0-r8.ebuild 2590
+RMD160 368732f6ccb8b54dc1c820eb04eaf854b99ea551 emul-linux-x86-xlibs-7.0-r8.ebuild 2590
+SHA256 a68ac08589b79c9c9b44ffca9d3f0d3293d443ebf3f287a9a9fc54d070492ea3 emul-linux-x86-xlibs-7.0-r8.ebuild 2590
+MISC ChangeLog 10242 RMD160 bb65f54297be28cc661c3cde4b701e3f3acc7f50 SHA1 5b439c425bca0450e214fdc996fdf1e00f447a8d SHA256 3d6255214b94cb7558bf323d7763b710b4fac7b31099fde1d707f44b3c2f8cb8
+MD5 9350720a5259ee8d8046899f11431730 ChangeLog 10242
+RMD160 bb65f54297be28cc661c3cde4b701e3f3acc7f50 ChangeLog 10242
+SHA256 3d6255214b94cb7558bf323d7763b710b4fac7b31099fde1d707f44b3c2f8cb8 ChangeLog 10242
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -50,10 +47,3 @@ SHA256 29ba1ff14bdbcc896053e01d170de02003d052a823870494b7316f2d5a8a2df4 files/di
 MD5 a55c4f343d9618bc1a4a150a5e8cb5b7 files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 RMD160 b2aa26190ce707dd4b76781411a330eb969fad6d files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 SHA256 d55a7ea48c2d304b9c92b8e50d8232e023aa53f2ba7b6a2cbbf33d4aa399d72a files/digest-emul-linux-x86-xlibs-7.0-r8 3347
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnie48bi6rjpTunYRAinfAKDgVqnySMNu9TEJsD/mi9upy1uvsACgmyUU
-+j288fduw1tF2PieN6VQIN8=
-=PVu7
------END PGP SIGNATURE-----