Use new patchset with amd64 patch for building mozilla component, ported from x86 patch. Fixes bug #172325.

(Portage version: 2.1.2.7)

5 files changed, 18 insertions, 15 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 5884c18e4919..5aa082377cae 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.65 2007/05/26 14:43:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.66 2007/05/28 19:41:59 caster Exp $
+
+  28 May 2007; Vlastimil Babka <caster@gentoo.org> swt-3.2.2.ebuild,
+  swt-3.2.2-r1.ebuild:
+  Use new patchset with amd64 patch for building mozilla component, ported
+  from x86 patch. Fixes bug #172325.
 
   26 May 2007; Christian Faulhammer <opfer@gentoo.org> swt-3.2.2.ebuild:
   x86 stable, bug 179815
diff --git a/dev-java/swt/files/digest-swt-3.2.2 b/dev-java/swt/files/digest-swt-3.2.2
index 5d856f4631c3..1ecebfbf7ec8 100644
--- a/dev-java/swt/files/digest-swt-3.2.2
+++ b/dev-java/swt/files/digest-swt-3.2.2
@@ -1,6 +1,6 @@
-MD5 769d0f2efa3894e56966783015862a33 swt-3.2.2-gentoo-patches.tar.bz2 6707
-RMD160 a35840a279f98b4199c25e6b28aadefa1138f843 swt-3.2.2-gentoo-patches.tar.bz2 6707
-SHA256 9f56edd328a5f000dce42c01ae83d1d9e4017dc7fd11ed2a8091ebece783d25e swt-3.2.2-gentoo-patches.tar.bz2 6707
+MD5 443b6d73f136694b8fe22f1fd19f9258 swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
+RMD160 4ca8206b35e35a98511e9bbd2bd43836b58c5b58 swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
+SHA256 ec3e1384a4a93de1d4639e67f0b9d2b6fd543f3707e8e3153297f2275e446bcc swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
 MD5 45d1f0ff0de9c95fcd92836fea79927c swt-3.2.2-gtk-linux-ppc.zip 3042753
 RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a swt-3.2.2-gtk-linux-ppc.zip 3042753
 SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450 swt-3.2.2-gtk-linux-ppc.zip 3042753
diff --git a/dev-java/swt/files/digest-swt-3.2.2-r1 b/dev-java/swt/files/digest-swt-3.2.2-r1
index 5d856f4631c3..1ecebfbf7ec8 100644
--- a/dev-java/swt/files/digest-swt-3.2.2-r1
+++ b/dev-java/swt/files/digest-swt-3.2.2-r1
@@ -1,6 +1,6 @@
-MD5 769d0f2efa3894e56966783015862a33 swt-3.2.2-gentoo-patches.tar.bz2 6707
-RMD160 a35840a279f98b4199c25e6b28aadefa1138f843 swt-3.2.2-gentoo-patches.tar.bz2 6707
-SHA256 9f56edd328a5f000dce42c01ae83d1d9e4017dc7fd11ed2a8091ebece783d25e swt-3.2.2-gentoo-patches.tar.bz2 6707
+MD5 443b6d73f136694b8fe22f1fd19f9258 swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
+RMD160 4ca8206b35e35a98511e9bbd2bd43836b58c5b58 swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
+SHA256 ec3e1384a4a93de1d4639e67f0b9d2b6fd543f3707e8e3153297f2275e446bcc swt-3.2.2-gentoo-patches-r1.tar.bz2 7994
 MD5 45d1f0ff0de9c95fcd92836fea79927c swt-3.2.2-gtk-linux-ppc.zip 3042753
 RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a swt-3.2.2-gtk-linux-ppc.zip 3042753
 SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450 swt-3.2.2-gtk-linux-ppc.zip 3042753
diff --git a/dev-java/swt/swt-3.2.2-r1.ebuild b/dev-java/swt/swt-3.2.2-r1.ebuild
index 86cd80f67f40..5355e4081ad1 100644
--- a/dev-java/swt/swt-3.2.2-r1.ebuild
+++ b/dev-java/swt/swt-3.2.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.2-r1.ebuild,v 1.1 2007/05/25 22:04:33 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.2-r1.ebuild,v 1.2 2007/05/28 19:41:59 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_DMF="R-${PV}-200702121330"
 # https://overlays.gentoo.org/svn/proj/java/other/swt-patches
-PATCHSET="${PN}-3.2.2-gentoo-patches"
+PATCHSET="${P}-gentoo-patches-r1"
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="x86? (
@@ -50,7 +50,6 @@ COMMON=">=dev-libs/glib-2.6
 				)"
 DEPEND=">=virtual/jdk-1.4
 		${COMMON}
-		dev-java/ant-core
 		app-arch/unzip
 		x11-libs/libX11
 		x11-libs/libXrender
@@ -161,7 +160,7 @@ src_compile() {
 
 	local gecko="$(get_gecko)"
 	if [[ ${gecko} ]]; then
-		einfo "Building the Mozilla component"
+		einfo "Building the Mozilla component against ${gecko}"
 		#local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
 		local inc="$(pkg-config ${gecko}-xpcom --cflags)"
 		GECKO_INCLUDES="${inc}" \
diff --git a/dev-java/swt/swt-3.2.2.ebuild b/dev-java/swt/swt-3.2.2.ebuild
index 50de7408554d..45a95c16e49b 100644
--- a/dev-java/swt/swt-3.2.2.ebuild
+++ b/dev-java/swt/swt-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.2.ebuild,v 1.5 2007/05/26 14:43:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.2.ebuild,v 1.6 2007/05/28 19:41:59 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
 
 MY_DMF="R-${PV}-200702121330"
 # https://overlays.gentoo.org/svn/proj/java/other/swt-patches
-PATCHSET="${PN}-3.2.2-gentoo-patches"
+PATCHSET="${P}-gentoo-patches-r1"
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="x86? (
@@ -50,7 +50,6 @@ COMMON=">=dev-libs/glib-2.6
 				)"
 DEPEND=">=virtual/jdk-1.4
 		${COMMON}
-		dev-java/ant-core
 		app-arch/unzip
 		x11-libs/libX11
 		x11-libs/libXrender
@@ -153,7 +152,7 @@ src_compile() {
 	use xulrunner && local gecko="xulrunner"
 
 	if [[ ${gecko} ]]; then
-		einfo "Building the Mozilla component"
+		einfo "Building the Mozilla component against ${gecko}"
 		#local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
 		local inc="$(pkg-config ${gecko}-xpcom --cflags)"
 		GECKO_INCLUDES="${inc}" \