Make libstdc++ dependency x86-only - amd64 doesn't contain libdeploy.so, the only...

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 51322c7e57ac777937f3d80b57fc4fc2a9dae247..4067fcd371e20117c40d958708c23757d6a07397 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.180 2007/01/11 23:36:19 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.181 2007/01/12 13:40:19 caster Exp $
+
+  12 Jan 2007; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.6.0-r1.ebuild:
+  Make libstdc++ dependency x86-only - amd64 version doesn't contain
+  libdeploy.so, the only file linking to it. Bug #161536.
 
   11 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
   -sun-jdk-1.5.0.09-r1.ebuild, -sun-jdk-1.6.0.ebuild:

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 3dd39166764b91a3d887bb3c797105d8af5ad353..eea5505600a72b1bc83b59ca7d34d454c063e689 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932
 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932
@@ -37,14 +34,14 @@ EBUILD sun-jdk-1.5.0.10.ebuild 4609 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b
 MD5 0398222bf82947653361b77d469b66ef sun-jdk-1.5.0.10.ebuild 4609
 RMD160 eb9fcb85bea5e1661d0a008ce3f0da70db49b08a sun-jdk-1.5.0.10.ebuild 4609
 SHA256 1d8c680beb034af272bb74d08df9188d89c52dc5a9ea189a267af9ee478ab7c0 sun-jdk-1.5.0.10.ebuild 4609
-EBUILD sun-jdk-1.6.0-r1.ebuild 4824 RMD160 15a3ce002ae8dda240ffbbfa127e9f71f35991c8 SHA1 89ef03d0132d3292552a5834277dfecd981818ef SHA256 13895e542e43718c3497739ee71f25d5ac5e8ac87d7b1a0419118a0600d24dce
-MD5 9831e5ead1ed407c14cdab5decda9694 sun-jdk-1.6.0-r1.ebuild 4824
-RMD160 15a3ce002ae8dda240ffbbfa127e9f71f35991c8 sun-jdk-1.6.0-r1.ebuild 4824
-SHA256 13895e542e43718c3497739ee71f25d5ac5e8ac87d7b1a0419118a0600d24dce sun-jdk-1.6.0-r1.ebuild 4824
-MISC ChangeLog 35778 RMD160 1a4596f942f4761f332d4ff65dd70c6d2c776235 SHA1 279823b6ec409aca686919b5fdcc8ad5f56155ed SHA256 c255402c0a0395053ab97517b25d085f005245cad6a2105b90c0720abfaa28ad
-MD5 04de6693c7ba790f4c7caba319b0453d ChangeLog 35778
-RMD160 1a4596f942f4761f332d4ff65dd70c6d2c776235 ChangeLog 35778
-SHA256 c255402c0a0395053ab97517b25d085f005245cad6a2105b90c0720abfaa28ad ChangeLog 35778
+EBUILD sun-jdk-1.6.0-r1.ebuild 4829 RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f SHA1 176a5cfde85f19d1693756413f24c3f90e2634c6 SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184
+MD5 e4769c71f1d5c1f4f5fdd55fca98b14a sun-jdk-1.6.0-r1.ebuild 4829
+RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f sun-jdk-1.6.0-r1.ebuild 4829
+SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184 sun-jdk-1.6.0-r1.ebuild 4829
+MISC ChangeLog 35978 RMD160 4a31c2a52ac7fb9ddd8236d2416b9e832ed860ce SHA1 2c859383362d07a059a74764539132d50f34bd11 SHA256 67d730ae110909fd4634279e89bf7ef8825ae94773ea9d58a165b5574eb4c586
+MD5 67d2b0e88eb277c1eb3af460d9feda6e ChangeLog 35978
+RMD160 4a31c2a52ac7fb9ddd8236d2416b9e832ed860ce ChangeLog 35978
+SHA256 67d730ae110909fd4634279e89bf7ef8825ae94773ea9d58a165b5574eb4c586 ChangeLog 35978
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -61,10 +58,3 @@ SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/di
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFpx5rcxLzpIGCsLQRAqfbAJ9CHqB8vER8m2h2rK2l3JHn+uKVeACfb/cR
-w/Vk1kGJu3ZKaWEtN8G58iE=
-=t6VU
------END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index fc71397d7872714cac1172ea893cd2c89c556b6a..9dbd735f0701e685b3915362588860180a0effb5 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.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/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.4 2007/01/11 14:41:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.5 2007/01/12 13:40:19 caster Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -36,7 +36,7 @@ DEPEND="
 
 RDEPEND="
        ${DEPEND}
-       =virtual/libstdc++-3.3
+       x86? ( =virtual/libstdc++-3.3 )
        sys-libs/glibc
        alsa? ( media-libs/alsa-lib )
        X? ( || ( ( x11-libs/libX11