Version bump, bug #189617.

Package-Manager: portage-2.1.3.5

6 files changed, 257 insertions, 25 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 4f0ac92a8e9b..bc462a781c62 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.71 2007/07/22 09:08:08 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.72 2007/08/20 17:58:51 caster Exp $
+
+*swt-3.3 (20 Aug 2007)
+
+  20 Aug 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/swt-3.3-callback-pointer-dereferencing.patch,
+  -files/swt-3.3_rc4-callback-pointer-dereferencing.patch,
+  swt-3.3_rc4.ebuild, +swt-3.3.ebuild:
+  Version bump, bug #189617.
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> swt-3.2-r2.ebuild:
   Drop virtual/x11 references.
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index fbeca8aa4d96..87343d3c3a4a 100644
--- 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
@@ -25,10 +22,10 @@ AUX swt-3.2.1-fbsd.patch 2545 RMD160 c9dd690a2e5f892d7614bf7efc461ab3a4549e57 SH
 MD5 984379c24b33ef9a5acd963254a14fc0 files/swt-3.2.1-fbsd.patch 2545
 RMD160 c9dd690a2e5f892d7614bf7efc461ab3a4549e57 files/swt-3.2.1-fbsd.patch 2545
 SHA256 4a89bfb108a231997b65bf6b6eb3ad393d41801692e5586f60aa79e25385fe9f files/swt-3.2.1-fbsd.patch 2545
-AUX swt-3.3_rc4-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
-MD5 870ebea6385f5161df108d610214c519 files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882
-RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882
-SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab files/swt-3.3_rc4-callback-pointer-dereferencing.patch 882
+AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
+MD5 870ebea6385f5161df108d610214c519 files/swt-3.3-callback-pointer-dereferencing.patch 882
+RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea files/swt-3.3-callback-pointer-dereferencing.patch 882
+SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab files/swt-3.3-callback-pointer-dereferencing.patch 882
 DIST swt-3.2-gtk-linux-ppc.zip 2913359 RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 SHA1 b0fb2ce02983be18d6d9d7df033a168a1c92d2a3 SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062
 DIST swt-3.2-gtk-linux-x86.zip 2935209 RMD160 d9560445852020e7d755594c60ba01c7904b9924 SHA1 1d6d0cd4624c93ae005053681731cbaf3d4a2e52 SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c
 DIST swt-3.2-gtk-linux-x86_64.zip 2841135 RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 SHA1 afd11534a90b2f547fb87c5cf6edea205c0a7d92 SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665
@@ -36,6 +33,9 @@ DIST swt-3.2.2-gentoo-patches-r1.tar.bz2 7994 RMD160 4ca8206b35e35a98511e9bbd2bd
 DIST swt-3.2.2-gtk-linux-ppc.zip 3042753 RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a SHA1 910e09675a7c56bac48d5d34471e11326d57690a SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450
 DIST swt-3.2.2-gtk-linux-x86.zip 3117432 RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 SHA1 b29f656dffdb4e85867455e04ff71f4ceb24befe SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28
 DIST swt-3.2.2-gtk-linux-x86_64.zip 2996317 RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 SHA1 0fea5ba09d2014d0eae13caf11cbcd445d6236d6 SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56
+DIST swt-3.3-gtk-linux-ppc.zip 4514372 RMD160 45401f9491d195f2f75670670b9bff0a67c3a39c SHA1 3fc7f04ffa73c712bcb3a0f2f41386d9fcebc92a SHA256 25342ec0205f90ecdec90a0f04855674c4f0e1ffda433c6023c65f5565c58f5a
+DIST swt-3.3-gtk-linux-x86.zip 4448296 RMD160 5b1e22a51418300cafe3df4794be258d13ed3321 SHA1 020983352a606ad24738cdaf47360b897efbc856 SHA256 08a3b6329c878c99025e9c9b530b65c4315a37ce52e796e89ae6dc62269df163
+DIST swt-3.3-gtk-linux-x86_64.zip 4622274 RMD160 f94b244dbda7b2aca7b9b554f2e3aad106fa6d0c SHA1 97a71cad4c822f5671cbaae278f09d0ea7e0a936 SHA256 f4357ed778da7f0b91b08b0ed67fe2bc907a2c6a1b5808442f6390f56fa85b50
 DIST swt-3.3RC4-gtk-linux-ppc.zip 4514325 RMD160 fd1494ff909781a4266390c711b72117096e0df8 SHA1 29021db401727a927f728f9334a20623ccba560a SHA256 89c3d3af00323bac47bf001b11c21b3b02b27d8c0f290cfbc7691de790ca01b7
 DIST swt-3.3RC4-gtk-linux-x86.zip 4448002 RMD160 1587f2a918de0ce5ee64055e43636982b9533e40 SHA1 78e1283482e0cfcf8a58e38588ea76d2e8017b7f SHA256 3ba284e1ff70e5c2895aafba9824e281bfdc5446ec733dd3eaf6f82fac26493e
 DIST swt-3.3RC4-gtk-linux-x86_64.zip 4622486 RMD160 ca19c8e0a358860e5997b7e638ed59da604d8db4 SHA1 b250f5c37db444b768e073464cdc9168094aae73 SHA256 628d8ad5b1b58d2d3cfc177edcefa9794a449f2080807f982d04dda6b2b8796f
@@ -51,14 +51,18 @@ EBUILD swt-3.2.2.ebuild 5548 RMD160 b798f8c5ca707ee9595e71aaa345716fe9dac3ac SHA
 MD5 7960bcfb43a76ea104dc7cb10584951f swt-3.2.2.ebuild 5548
 RMD160 b798f8c5ca707ee9595e71aaa345716fe9dac3ac swt-3.2.2.ebuild 5548
 SHA256 581df8331f7d9cdad104951058aa02145d096929108769085ee3ce1a885f6633 swt-3.2.2.ebuild 5548
-EBUILD swt-3.3_rc4.ebuild 6133 RMD160 3c735a8c97c87a1a4e35b36c1914e5c70d19cd31 SHA1 2adf7eb84d84983ec9e9bc9ead0d96fd79088bc7 SHA256 b815f5c672e7e54cf7f4a257df3d6766b39ef3d9f8a8c18b4c09c9faa4c5b2bf
-MD5 b86a6e23814944de1c63f349c85f5f95 swt-3.3_rc4.ebuild 6133
-RMD160 3c735a8c97c87a1a4e35b36c1914e5c70d19cd31 swt-3.3_rc4.ebuild 6133
-SHA256 b815f5c672e7e54cf7f4a257df3d6766b39ef3d9f8a8c18b4c09c9faa4c5b2bf swt-3.3_rc4.ebuild 6133
-MISC ChangeLog 12509 RMD160 ff84adeedb8981f5ee1053e3174b497e65f08d5f SHA1 d92f64a85860ae398bc1e3c0f4f94c380b5ebf22 SHA256 2c3e01cadd21199dbe98240b4a0f1ecae44963f322807a70c1fdffffd2f23f3e
-MD5 462bc4197efe714ffcbc9946c95e6515 ChangeLog 12509
-RMD160 ff84adeedb8981f5ee1053e3174b497e65f08d5f ChangeLog 12509
-SHA256 2c3e01cadd21199dbe98240b4a0f1ecae44963f322807a70c1fdffffd2f23f3e ChangeLog 12509
+EBUILD swt-3.3.ebuild 6092 RMD160 7ae828495bc9c5f00efa7204c2d07fa5b7008ba8 SHA1 0ece6ad79b1491e820aebc0e11d422b9cf1f1f9e SHA256 98337dc6afb72dec983b718f7824c8aa080dd6fc63bebeb02802bfbf065dc223
+MD5 34093f7c14f241b0affa796aaa47768a swt-3.3.ebuild 6092
+RMD160 7ae828495bc9c5f00efa7204c2d07fa5b7008ba8 swt-3.3.ebuild 6092
+SHA256 98337dc6afb72dec983b718f7824c8aa080dd6fc63bebeb02802bfbf065dc223 swt-3.3.ebuild 6092
+EBUILD swt-3.3_rc4.ebuild 6135 RMD160 bcfaddca9c145891513bf0606db8dd7d7bba8fb8 SHA1 5cd0e9c0e67c81601a6d37949f9e6f371055be31 SHA256 0cbefbd8e44b79d09864b083be14fa4b120070a7cedee70469b333b700653c9b
+MD5 42ae44d8d7ade1542c9e036637872679 swt-3.3_rc4.ebuild 6135
+RMD160 bcfaddca9c145891513bf0606db8dd7d7bba8fb8 swt-3.3_rc4.ebuild 6135
+SHA256 0cbefbd8e44b79d09864b083be14fa4b120070a7cedee70469b333b700653c9b swt-3.3_rc4.ebuild 6135
+MISC ChangeLog 12767 RMD160 274afc21b48aeb1211ee69e83311f3337d061ed7 SHA1 fb325bb850bf2cf462891c03c2d408a011c5e265 SHA256 d3309f2313c2aa7d1b44c2810a383eab250f6c9da8e45a2b101ec828b89cfb0a
+MD5 269683060f85840de5a65d99095e26c6 ChangeLog 12767
+RMD160 274afc21b48aeb1211ee69e83311f3337d061ed7 ChangeLog 12767
+SHA256 d3309f2313c2aa7d1b44c2810a383eab250f6c9da8e45a2b101ec828b89cfb0a ChangeLog 12767
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -72,13 +76,9 @@ SHA256 b3fe8fd2e9c3adf8a4ebd937d1943b87fc843cef1ac16e8e13e4bf6a76624de6 files/di
 MD5 f1f7369bc842ab6e4dd5b32df60abadb files/digest-swt-3.2.2-r1 1084
 RMD160 a6395c10d424d638b5318dcc61d10b5aadb6eb3c files/digest-swt-3.2.2-r1 1084
 SHA256 b3fe8fd2e9c3adf8a4ebd937d1943b87fc843cef1ac16e8e13e4bf6a76624de6 files/digest-swt-3.2.2-r1 1084
+MD5 fd7bfdd284019706ad24e37f61699813 files/digest-swt-3.3 786
+RMD160 c2431c272de4377699bd5a756ae10fd05f872eac files/digest-swt-3.3 786
+SHA256 4233ea9e6027d96b896f86253b85660fca71ecc2df5553e163a6c6b0e62afb8d files/digest-swt-3.3 786
 MD5 5d29d771cf22f442145b9c9a2d571aff files/digest-swt-3.3_rc4 813
 RMD160 a4c35b6efd2f7a003b4ed222e9c93b691a64c42b files/digest-swt-3.3_rc4 813
 SHA256 411a70fecb64a1b43245f8cb3e8580d9df87ed67fde601f3eb8be56b6148fcba files/digest-swt-3.3_rc4 813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGox520BM77Tkv120RAiupAKDA7ZgwRFtcqEH3SGpbDqKkYQoC6gCgkhvF
-fLOYWjx6vWkjlNMw1AbHzuU=
-=gDN3
------END PGP SIGNATURE-----
diff --git a/dev-java/swt/files/digest-swt-3.3 b/dev-java/swt/files/digest-swt-3.3
new file mode 100644
index 000000000000..19b22b8209ac
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.3
@@ -0,0 +1,9 @@
+MD5 aa551223c44af52ab543dab0821966a4 swt-3.3-gtk-linux-ppc.zip 4514372
+RMD160 45401f9491d195f2f75670670b9bff0a67c3a39c swt-3.3-gtk-linux-ppc.zip 4514372
+SHA256 25342ec0205f90ecdec90a0f04855674c4f0e1ffda433c6023c65f5565c58f5a swt-3.3-gtk-linux-ppc.zip 4514372
+MD5 7398cdf9340cb131b76ed98495239520 swt-3.3-gtk-linux-x86.zip 4448296
+RMD160 5b1e22a51418300cafe3df4794be258d13ed3321 swt-3.3-gtk-linux-x86.zip 4448296
+SHA256 08a3b6329c878c99025e9c9b530b65c4315a37ce52e796e89ae6dc62269df163 swt-3.3-gtk-linux-x86.zip 4448296
+MD5 b0a4b3442e61d2968acecfa18cdd3aa9 swt-3.3-gtk-linux-x86_64.zip 4622274
+RMD160 f94b244dbda7b2aca7b9b554f2e3aad106fa6d0c swt-3.3-gtk-linux-x86_64.zip 4622274
+SHA256 f4357ed778da7f0b91b08b0ed67fe2bc907a2c6a1b5808442f6390f56fa85b50 swt-3.3-gtk-linux-x86_64.zip 4622274
diff --git a/dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
index 92fbab779d1c..92fbab779d1c 100644
--- a/dev-java/swt/files/swt-3.3_rc4-callback-pointer-dereferencing.patch
+++ b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
diff --git a/dev-java/swt/swt-3.3.ebuild b/dev-java/swt/swt-3.3.ebuild
new file mode 100644
index 000000000000..8c532fb4f5b4
--- /dev/null
+++ b/dev-java/swt/swt-3.3.ebuild
@@ -0,0 +1,215 @@
+# 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.3.ebuild,v 1.1 2007/08/20 17:58:51 caster Exp $
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+#MY_PV="${PV/_rc/RC}"
+MY_PV="${PV}"
+MY_DMF="R-${MY_PV}-200706251500"
+MY_P="${PN}-${MY_PV}"
+# https://overlays.gentoo.org/svn/proj/java/other/swt-patches
+#PATCHSET="${P}-gentoo-patches-r1"
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
+		)"
+#		mirror://gentoo/${PATCHSET}.tar.bz2"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE="cairo firefox gnome seamonkey opengl xulrunner"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.0.2 )
+		gnome?	(
+					=gnome-base/libgnome-2*
+					=gnome-base/gnome-vfs-2*
+					=gnome-base/libgnomeui-2*
+				)
+		seamonkey? ( !firefox? ( !xulrunner? (
+			>=www-client/seamonkey-1.0.2
+			>=dev-libs/nspr-4.6.2
+		) ) )
+		firefox? ( !xulrunner? (
+			>=www-client/mozilla-firefox-2
+			>=dev-libs/nspr-4.6.2
+		) )
+		xulrunner? (
+			net-libs/xulrunner
+			>=dev-libs/nspr-4.6.2
+		)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-proto/xextproto
+		${COMMON}"
+
+# java-config for the env_var stuff, until it's stabled and forced by eclass
+RDEPEND=">=virtual/jre-1.4
+		x11-libs/libXtst
+		>=dev-java/java-config-2.0.33
+		${COMMON}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# determine the right file to unpack from $A
+#	local DISTFILE=${A/${PATCHSET}.tar.bz2/}
+	# just in case patchset is ordered before distfile
+#	DISTFILE=${DISTFILE## }
+	local DISTFILE="${A}"
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
+	unpack ./src.zip
+
+#	unpack "${PATCHSET}.tar.bz2"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp "${FILESDIR}"/build.xml ${S}/build.xml || die "Unable to update build.xml"
+	mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources"
+
+	# apply all the patches, including arch-specific
+#	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch
+
+	sed -i "s/CFLAGS = -O -Wall/CFLAGS = ${CFLAGS} -Wall/" \
+		make_linux.mak \
+		|| die "Failed to tweak make_linux.mak"
+
+	sed -i "s/MOZILLACFLAGS = -O/MOZILLACFLAGS = ${CXXFLAGS}/" \
+		make_linux.mak \
+		|| die "Failed to tweak make_linux.mak"
+
+	# kill some strict-aliasing warnings
+	epatch "${FILESDIR}/${P}-callback-pointer-dereferencing.patch"
+}
+
+get_gecko() {
+	local gecko
+
+	# order here match the logic in DEPEND and USE flag descriptions
+	use seamonkey && gecko="seamonkey"
+	use firefox && gecko="firefox"
+	use xulrunner && gecko="xulrunner"
+
+	echo ${gecko}
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	# Identify the AWT path
+	# The IBM VMs and the GNU GCC implementations do not store the AWT libraries
+	# in the same location as the rest of the binary VMs.
+	if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/jre/bin
+	elif [[ ! -z "$(java-config --java-version | grep 'GNU libgcj')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/$(get_libdir)
+	else
+		if [[ $(tc-arch) == 'x86' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+		elif [[ $(tc-arch) == 'ppc' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/ppc
+		else
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+		fi
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y"
+
+	einfo "Building AWT library"
+	${make} make_awt || die "Failed to build AWT support"
+
+	einfo "Building SWT library"
+	${make} make_swt || die "Failed to build SWT support"
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk || die "Failed to build ATK support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	local gecko="$(get_gecko)"
+	if [[ ${gecko} ]]; then
+		einfo "Building the Mozilla component against ${gecko}"
+		#local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
+		local inc="$(pkg-config ${gecko}-xpcom --cflags)"
+		local libs="$(pkg-config ${gecko}-xpcom --libs)"
+		MOZILLA_INCLUDES="${inc}" \
+		MOZILLA_LIBS="${libs}" \
+			${make} make_mozilla || die "Failed to build ${gecko} support"
+		if [[ "${gecko}" = "xulrunner" ]]; then
+			XULRUNNER_INCLUDES="${inc}" \
+			XULRUNNER_LIBS="${libs}" \
+				${make} make_xulrunner || die "Failed to build ${gecko} support"
+		fi
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo || die "Unable to build CAIRO support"
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx || die "Unable to build OpenGL component"
+	fi
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt"
+	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+		"${S}/build/org/eclipse/swt/internal/"
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	java-pkg_dojar swt.jar
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	local gecko="$(get_gecko)"
+	if [[ -n "${gecko}" ]]; then
+		local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	fi
+
+	dohtml about.html || die
+}
+
diff --git a/dev-java/swt/swt-3.3_rc4.ebuild b/dev-java/swt/swt-3.3_rc4.ebuild
index b445770ebf97..7fbff9205e26 100644
--- a/dev-java/swt/swt-3.3_rc4.ebuild
+++ b/dev-java/swt/swt-3.3_rc4.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/swt/swt-3.3_rc4.ebuild,v 1.2 2007/07/11 19:58:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3_rc4.ebuild,v 1.3 2007/08/20 17:58:51 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
 
@@ -103,7 +103,7 @@ src_unpack() {
 		|| die "Failed to tweak make_linux.mak"
 
 	# kill some strict-aliasing warnings
-	epatch "${FILESDIR}/${P}-callback-pointer-dereferencing.patch"
+	epatch "${FILESDIR}/${PN}-3.3-callback-pointer-dereferencing.patch"
 }
 
 get_gecko() {