Apply previous patches only on x86 as a workaround for bug #155725.

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 578c6b3187c247e58e43551961c567a0cd32978c..bc6414865b3f0eae6f4d1a02e97ddc4355b33e92 100644 (file)
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.52 2006/11/19 18:59:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.53 2006/11/20 01:02:33 caster Exp $
+
+  20 Nov 2006; Vlastimil Babka <caster@gentoo.org> swt-3.2.1.ebuild:
+  Apply previous patches only on x86 as a workaround for bug #155725.
 
   19 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
   +files/swt-3.2.1-firefox.patch, +files/swt-3.2.1-libswt-xpcomgcc4.patch,

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 35e56e56ba2a2914284e4460ab5d6db284c97af7..8be9a22c69d8c5e8360447b4995dd19cbb43a132 100644 (file)
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
 MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458
 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458
@@ -43,14 +40,14 @@ EBUILD swt-3.2-r2.ebuild 5223 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf SH
 MD5 d3342ff6d0af3a1ac9c7aa29166167aa swt-3.2-r2.ebuild 5223
 RMD160 da996efcac704b5fda4fd71c6974d9252dd38fcf swt-3.2-r2.ebuild 5223
 SHA256 3515363ece683ebe30dfeac298ef951e9039b5ca93dcd1c2f23aee53696da65f swt-3.2-r2.ebuild 5223
-EBUILD swt-3.2.1.ebuild 5051 RMD160 9c390fce8d7fa1f5bb627eec73c3d7449da01c42 SHA1 7e41a9eebb64cff869df75d3537efc702f9da150 SHA256 4e2d1da402e556932462ab810cc4af73020ba3baf0d84acafa63d434d2bfe01a
-MD5 5964dc73f62bc8b59a3f4c5198c5ae5a swt-3.2.1.ebuild 5051
-RMD160 9c390fce8d7fa1f5bb627eec73c3d7449da01c42 swt-3.2.1.ebuild 5051
-SHA256 4e2d1da402e556932462ab810cc4af73020ba3baf0d84acafa63d434d2bfe01a swt-3.2.1.ebuild 5051
-MISC ChangeLog 9093 RMD160 0c28a9211f2de86cb47cbc3b6a31c61b23c790e0 SHA1 f2d365d53d40b2c8f47f0150cd9d51c11cc59c09 SHA256 86ebcaf9c549f392fd8e97c9a4265994c3bb6708ff75ee02e159c4b415b5fe43
-MD5 1eac09a568b52534ad8400d36073a65f ChangeLog 9093
-RMD160 0c28a9211f2de86cb47cbc3b6a31c61b23c790e0 ChangeLog 9093
-SHA256 86ebcaf9c549f392fd8e97c9a4265994c3bb6708ff75ee02e159c4b415b5fe43 ChangeLog 9093
+EBUILD swt-3.2.1.ebuild 5086 RMD160 5ca60e5250988a7171d2d7d59c289eb56528c570 SHA1 e29de3b347f778165919dc94e370916165136f97 SHA256 d3f1ff5c694d81bcf7ba80831ede9c7e7a0929af1d83763a9c430f51f90171bb
+MD5 6672072f1c2d53a8f7b8a0eca938891b swt-3.2.1.ebuild 5086
+RMD160 5ca60e5250988a7171d2d7d59c289eb56528c570 swt-3.2.1.ebuild 5086
+SHA256 d3f1ff5c694d81bcf7ba80831ede9c7e7a0929af1d83763a9c430f51f90171bb swt-3.2.1.ebuild 5086
+MISC ChangeLog 9229 RMD160 cd0545673653aa4dddc0b8e3de6f8c3a6d6999a5 SHA1 1cfafaa4a676310a0769a5b91feeca0cdf6d809d SHA256 9e51517d36e717afb7a18cb70c292d3d52d623939d9134da86a96721381909ae
+MD5 9cd446a751c1725a2a24eb8c833d6d76 ChangeLog 9229
+RMD160 cd0545673653aa4dddc0b8e3de6f8c3a6d6999a5 ChangeLog 9229
+SHA256 9e51517d36e717afb7a18cb70c292d3d52d623939d9134da86a96721381909ae ChangeLog 9229
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -61,10 +58,3 @@ SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/di
 MD5 66029eeb02848204a262a57b31418061 files/digest-swt-3.2.1 804
 RMD160 c037c4c830973c81fe4bafdd0b02bc75333d6492 files/digest-swt-3.2.1 804
 SHA256 c4b185231fb5aafd9b653a4915407eaedd7f216856ae38d380b8346ce5c3f83f files/digest-swt-3.2.1 804
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYKnccxLzpIGCsLQRAurmAJ9GWls2SmScsGEa102cRLwUBsX8IACgiDLZ
-cCYxI710DcW3Q4x7u+qsit4=
-=AgIv
------END PGP SIGNATURE-----

diff --git a/dev-java/swt/swt-3.2.1.ebuild b/dev-java/swt/swt-3.2.1.ebuild
index 69ed2c28399432896857f7d2d29c01c37be21de7..dd48d110db2e58e987d2c680ce5935d55c2fab0a 100644 (file)
--- a/dev-java/swt/swt-3.2.1.ebuild
+++ b/dev-java/swt/swt-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.2 2006/11/19 18:59:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.1.ebuild,v 1.3 2006/11/20 01:02:33 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -68,9 +68,12 @@ src_unpack() {
        # https://bugs.eclipse.org/bugs/show_bug.cgi?id=165097
        epatch "${FILESDIR}"/${PN}-3.2.1-remove-stripping.patch
 
-       epatch "${FILESDIR}"/${PN}-3.2.1-libswt-xpcomgcc4.patch
+       # bug #155725
+       if use x86; then
+               epatch "${FILESDIR}"/${PN}-3.2.1-libswt-xpcomgcc4.patch
 
-       epatch "${FILESDIR}"/${PN}-3.2.1-firefox.patch
+               epatch "${FILESDIR}"/${PN}-3.2.1-firefox.patch
+       fi
 
        if [[ ${ARCH} == "amd64" ]] ; then
                epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86_64.patch