Fixing SWT finally!

(Portage version: 2.0.51.22-r1)

18 files changed, 260 insertions, 613 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 7596659a9cad..8d3dea8a8cf3 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.13 2005/05/04 11:52:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.14 2005/05/24 17:52:54 compnerd Exp $
+
+*swt-3.1_pre5-r1 (24 May 2005)
+
+  24 May 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  -files/build-3.0.xml, -files/build-3.1_pre2.xml,
+  -files/build-3.1_pre5.xml, +files/build.xml, +files/cairo.patch,
+  -swt-3.0.ebuild, -swt-3.0-r1.ebuild, -swt-3.0-r2.ebuild,
+  -swt-3.1_pre2.ebuild, -swt-3.1_pre5.ebuild, +swt-3.1_pre5-r1.ebuild:
+  Dropped ALL versions prior to swt-3.1_pre5.  The compiled files were corrupt!
+  Ebuild rewritten to conform to upstream build and to build all files properly.
+  Builds on x86 and amd64.
 
 *swt-3.1_pre5 (04 May 2005)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index f00def161f00..50ac91b1ea63 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,25 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3902fac6587eb8d06f716b1752f5191e swt-3.1_pre5.ebuild 4283
-MD5 25ede423575048b79da0f2c310e43c66 swt-3.0-r2.ebuild 3084
-MD5 75071fc4c1a7ffd6beb2dc87a5a1a105 swt-3.1_pre2.ebuild 4245
-MD5 39de7935a662313cbc1aaae1144bfe54 swt-3.0.ebuild 3081
-MD5 ad887ee17423be97002117a0949781fb swt-3.0-r1.ebuild 3084
+MD5 aa17a072e856a23f398f0efa571e1ce4 swt-3.1_pre5-r1.ebuild 5135
 MD5 f7860e7aa37f655ecb046869cefabd56 ChangeLog 2324
 MD5 4dcb6dd494f5e369aed5a367e303aef4 metadata.xml 433
-MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.1_pre2.xml 437
-MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.1_pre5.xml 437
-MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0-r1 67
-MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0-r2 67
-MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.0.xml 437
-MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0 67
-MD5 4f82f20829e012ee55c8ecf16261d5e8 files/digest-swt-3.1_pre2 144
-MD5 bd191dfc71013927ffb09f1e464399e8 files/digest-swt-3.1_pre5 147
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCeLer06ebR+OMO78RAkckAJ95hTQdz4SsZEaQ256sCza52cBc8gCdED7Z
-mjlGq14nxrzza4q/UG52wsw=
-=Rw2S
------END PGP SIGNATURE-----
+MD5 bd191dfc71013927ffb09f1e464399e8 files/digest-swt-3.1_pre5-r1 147
+MD5 bb61f479853836959ad766e10161e80a files/build.xml 2106
+MD5 f33d8fd0bacf2ed4f835b70f6f7836b4 files/cairo.patch 302
diff --git a/dev-java/swt/files/build-3.0.xml b/dev-java/swt/files/build-3.0.xml
deleted file mode 100644
index 79a86eba692e..000000000000
--- a/dev-java/swt/files/build-3.0.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-	<property name="src" location="src"/>
-	<property name="bin" location="class"/>
-	
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${bin}" />
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="swt.jar" basedir="${bin}" />
-	</target>
-</project>
diff --git a/dev-java/swt/files/build-3.1_pre2.xml b/dev-java/swt/files/build-3.1_pre2.xml
deleted file mode 100644
index 79a86eba692e..000000000000
--- a/dev-java/swt/files/build-3.1_pre2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-	<property name="src" location="src"/>
-	<property name="bin" location="class"/>
-	
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${bin}" />
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="swt.jar" basedir="${bin}" />
-	</target>
-</project>
diff --git a/dev-java/swt/files/build-3.1_pre5.xml b/dev-java/swt/files/build-3.1_pre5.xml
deleted file mode 100644
index 79a86eba692e..000000000000
--- a/dev-java/swt/files/build-3.1_pre5.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-	<property name="src" location="src"/>
-	<property name="bin" location="class"/>
-	
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init" description="compile the source">
-		<javac srcdir="${src}" destdir="${bin}" />
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="swt.jar" basedir="${bin}" />
-	</target>
-</project>
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
new file mode 100644
index 000000000000..54cb6ec7e00c
--- /dev/null
+++ b/dev-java/swt/files/build.xml
@@ -0,0 +1,58 @@
+<project name="SWT" default="jar_all" basedir=".">
+   <property name="src" location="."/>
+   <property name="build" location="build"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+   </target>
+
+   <target name="compile" depends="init" description="Compile the SWT toolset">
+      <javac srcdir="${src}" destdir="${build}"/>
+   </target>
+
+   <target name="jar_cairo" depends="compile">
+      <jar destfile="swt-cairo.jar" basedir="${build}">
+         <fileset dir="${build}/org/eclipse/swt/internal/cairo"/>
+      </jar>
+   </target>
+
+   <target name="jar_mozilla" depends="compile">
+      <jar destfile="swt-mozilla.jar" basedir="${build}">
+         <fileset dir="${build}/org/eclipse/swt/internal/mozilla"/>
+      </jar>
+   </target>
+   
+   <target name="jar_swt-pi" depends="compile">
+      <jar destfile="swt-pi.jar" basedir="${build}">
+         <fileset dir="${build}/org/eclipse/swt/internal">
+            <include name="Library.class"/>
+            <include name="Lock.class"/>
+            <include name="Platform.class"/>
+         </fileset>
+         <fileset dir="${build}/org/eclipse/swt/internal/accessibility"/>
+         <fileset dir="${build}/org/eclipse/swt/internal/cde"/>
+         <fileset dir="${build}/org/eclipse/swt/internal/gnome"/>
+         <fileset dir="${build}/org/eclipse/swt/internal/gtk"/>
+         <fileset dir="${build}/org/eclipse/swt/internal/kde"/>
+      </jar>
+   </target>
+   
+   <target name="jar_swt" depends="compile">
+      <jar destfile="swt.jar" basedir="${build}">
+         <fileset dir="${build}/org/eclipse/swt/internal">
+            <exclude name="Library.class"/>
+            <exclude name="Lock.class"/>
+            <exclude name="Platform.class"/>
+            <exclude name="accessibility/**/*"/>
+            <exclude name="cairo/**/*"/>
+            <exclude name="cde/**/*"/>
+            <exclude name="gnome/**/*"/>
+            <exclude name="gtk/**/*"/>
+            <exclude name="kde/**/*"/>
+         </fileset>
+      </jar>
+   </target>
+
+   <target name="jar_all" depends="jar_cairo,jar_mozilla,jar_swt-pi,jar_swt"/>
+</project>
diff --git a/dev-java/swt/files/cairo.patch b/dev-java/swt/files/cairo.patch
new file mode 100644
index 000000000000..d6fbc25b027f
--- /dev/null
+++ b/dev-java/swt/files/cairo.patch
@@ -0,0 +1,10 @@
+--- cairo.c.org	2005-02-14 16:57:48.000000000 -0600
++++ cairo.c	      2005-03-26 00:20:17.000000000 -0600
+@@ -22,6 +22,7 @@
+ #include "swt.h"
+ #include "cairo_structs.h"
+ #include "cairo_stats.h"
++#include "cairo-xlib.h"
+ 
+ #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func
+ 
diff --git a/dev-java/swt/files/digest-swt-3.0 b/dev-java/swt/files/digest-swt-3.0
deleted file mode 100644
index cedefab664d8..000000000000
--- a/dev-java/swt/files/digest-swt-3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2ebcfdb917bdd380dc1a3fb33da5936 swt-3.0-linux-gtk.zip 2228684
diff --git a/dev-java/swt/files/digest-swt-3.0-r1 b/dev-java/swt/files/digest-swt-3.0-r1
deleted file mode 100644
index cedefab664d8..000000000000
--- a/dev-java/swt/files/digest-swt-3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2ebcfdb917bdd380dc1a3fb33da5936 swt-3.0-linux-gtk.zip 2228684
diff --git a/dev-java/swt/files/digest-swt-3.0-r2 b/dev-java/swt/files/digest-swt-3.0-r2
deleted file mode 100644
index cedefab664d8..000000000000
--- a/dev-java/swt/files/digest-swt-3.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f2ebcfdb917bdd380dc1a3fb33da5936 swt-3.0-linux-gtk.zip 2228684
diff --git a/dev-java/swt/files/digest-swt-3.1_pre2 b/dev-java/swt/files/digest-swt-3.1_pre2
deleted file mode 100644
index 7f7b083786d3..000000000000
--- a/dev-java/swt/files/digest-swt-3.1_pre2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1c50c1c49f29c76a9feb5d7dd9bb476a swt-3.1M2-linux-gtk.zip 2332510
-MD5 1165677ebf8dd5fd8eeac746e2d4b221 swt-3.1M2-linux-gtk-amd64.zip 2344204
diff --git a/dev-java/swt/files/digest-swt-3.1_pre5 b/dev-java/swt/files/digest-swt-3.1_pre5-r1
index 2543c56e1ad7..2543c56e1ad7 100644
--- a/dev-java/swt/files/digest-swt-3.1_pre5
+++ b/dev-java/swt/files/digest-swt-3.1_pre5-r1
diff --git a/dev-java/swt/swt-3.0-r1.ebuild b/dev-java/swt/swt-3.0-r1.ebuild
deleted file mode 100644
index 103e88841633..000000000000
--- a/dev-java/swt/swt-3.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0-r1.ebuild,v 1.3 2005/03/23 16:16:06 seemant Exp $
-
-inherit eutils java-pkg
-
-IUSE="gnome mozilla"
-DESCRIPTION="SWT library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0-200406251208/swt-3.0-linux-gtk.zip"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.5 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${S} && cd ${S}
-	unpack ${A}
-
-	# remove some files
-	rm -f *.so *.jar
-	use mozilla || rm -f swt-mozillasrc.zip
-
-	for i in *.zip
-	do
-		einfo "Unpacking ${i} to ${S}"
-		unzip ${i} &> /dev/null
-	done
-	use mozilla && mv library/xpcom.cpp ${S}
-
-	mkdir src && mv org src/
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
-
-	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
-
-	use mozilla ||
-		(
-		rm -rf ${S}/src/org/eclipse/swt/browser
-		rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
-		)
-}
-
-src_compile() {
-	if use gnome ; then
-	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	fi
-
-	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
-
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
-		-e "s:/mozilla/mozilla/1.6/linux_gtk2/mozilla/dist:$MOZILLA_FIVE_HOME:" \
-		-e "s:/usr/lib/mozilla-1.6:$MOZILLA_FIVE_HOME:" \
-		-e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-L\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME) -lgtkembedmoz:" \
-		-e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
-		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
-		make_gtk.mak > Makefile
-
-	make make_swt || die "Failed to build platform-independent SWT support"
-	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
-
-	if use mozilla ; then
-		einfo "Building Mozilla component"
-		make make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	einfo "Building java source"
-	ant jar
-}
-
-src_install() {
-	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
-
-	exeinto /usr/lib
-	doexe *.so ${D}/usr/lib || die "Install of .so-files failed"
-
-	dohtml about.html
-}
diff --git a/dev-java/swt/swt-3.0-r2.ebuild b/dev-java/swt/swt-3.0-r2.ebuild
deleted file mode 100644
index 7436137fe52e..000000000000
--- a/dev-java/swt/swt-3.0-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0-r2.ebuild,v 1.3 2005/03/23 16:16:06 seemant Exp $
-
-inherit eutils java-pkg
-
-IUSE="gnome mozilla"
-DESCRIPTION="SWT library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0-200406251208/swt-3.0-linux-gtk.zip"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.5 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${S} && cd ${S}
-	unpack ${A}
-
-	# remove some files
-	rm -f *.so *.jar
-	use mozilla || rm -f swt-mozillasrc.zip
-
-	for i in *.zip
-	do
-		einfo "Unpacking ${i} to ${S}"
-		unzip ${i} &> /dev/null
-	done
-	use mozilla && mv library/xpcom.cpp ${S}
-
-	mkdir src && mv org src/
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
-
-	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
-
-	use mozilla ||
-		(
-		rm -rf ${S}/src/org/eclipse/swt/browser
-		rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
-		)
-}
-
-src_compile() {
-	if use gnome ; then
-	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	fi
-
-	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
-
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
-		-e "s:/mozilla/mozilla/1.6/linux_gtk2/mozilla/dist:$MOZILLA_FIVE_HOME:" \
-		-e "s:/usr/lib/mozilla-1.6:$MOZILLA_FIVE_HOME:" \
-		-e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-L\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME) -lgtkembedmoz:" \
-		-e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
-		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
-		make_gtk.mak > Makefile
-
-	make make_swt || die "Failed to build platform-independent SWT support"
-	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
-
-	if use mozilla ; then
-		einfo "Building Mozilla component"
-		make make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	einfo "Building java source"
-	ant jar
-}
-
-src_install() {
-	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
-
-	exeinto /usr/lib
-	doexe *.so ${D}/usr/lib || die "Install of .so-files failed"
-
-	dohtml about.html
-}
diff --git a/dev-java/swt/swt-3.0.ebuild b/dev-java/swt/swt-3.0.ebuild
deleted file mode 100644
index 9078071d40b0..000000000000
--- a/dev-java/swt/swt-3.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0.ebuild,v 1.6 2005/03/23 16:16:06 seemant Exp $
-
-inherit eutils java-pkg
-
-IUSE="gnome mozilla"
-DESCRIPTION="SWT library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0-200406251208/swt-3.0-linux-gtk.zip"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.5 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${S} && cd ${S}
-	unpack ${A}
-
-	# remove some files
-	rm -f *.so *.jar
-	use mozilla || rm -f swt-mozillasrc.zip
-
-	for i in *.zip
-	do
-		einfo "Unpacking ${i} to ${S}"
-		unzip ${i} &> /dev/null
-	done
-	use mozilla && mv library/xpcom.cpp ${S}
-
-	mkdir src && mv org src/
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
-
-	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
-
-	use mozilla ||
-		(
-		rm -rf ${S}/src/org/eclipse/swt/browser
-		rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
-		)
-}
-
-src_compile() {
-	if use gnome ; then
-	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	fi
-
-	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
-
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
-		-e "s:/mozilla/mozilla/1.6/linux_gtk2/mozilla/dist:$MOZILLA_FIVE_HOME:" \
-		-e "s:/usr/lib/mozilla-1.6:$MOZILLA_FIVE_HOME:" \
-		-e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-L\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME) -lgtkembedmoz:" \
-		-e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
-		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
-		make_gtk.mak > Makefile
-
-	make make_swt || die "Failed to build platform-independent SWT support"
-	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
-
-	if use mozilla ; then
-		einfo "Building Mozilla component"
-		make make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	einfo "Building java source"
-	ant jar
-}
-
-src_install() {
-	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
-
-	exeinto /usr/lib
-	doexe *.so ${D}/usr/lib || die "Install of .so-files failed"
-
-	dohtml about.html
-}
diff --git a/dev-java/swt/swt-3.1_pre2.ebuild b/dev-java/swt/swt-3.1_pre2.ebuild
deleted file mode 100644
index 46230cc005e3..000000000000
--- a/dev-java/swt/swt-3.1_pre2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre2.ebuild,v 1.2 2005/05/04 11:52:54 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/S-3.1M2-200409240800/swt-3.1M2-linux-gtk.zip )
-	amd64? ( http://download.eclipse.org/downloads/drops/S-3.1M2-200409240800/swt-3.1M2-linux-gtk-amd64.zip )"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~x86 ~amd64"
-SLOT="3"
-
-IUSE="gnome mozilla"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.5 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${S} && cd ${S}
-	unpack ${A}
-
-	rm -f *.so *.jar
-	use mozilla || rm -f swt-mozillasrc.zip
-
-	for i in *.zip ; do
-		einfo "Unpacking ${i} to ${S}"
-		unzip ${i} &> /dev/null
-	done
-
-	if use mozilla; then
-		cp library/*.cpp ${S} || die "Failed copy *.cpp"
-	fi
-
-	mkdir src && mv org src/
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die "Failed to copy build.xml"
-
-	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
-
-	use mozilla ||
-		(
-			rm -rf ${S}/src/org/eclipse/swt/browser
-			rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
-		)
-
-}
-
-src_compile() {
-	if use gnome ; then
-	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	fi
-
-	gtk_libs=`pkg-config --libs gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-
-	sed -e :a -e '/\\$/N; s/\\\n//; ta' make_linux.mak > makefile.mak
-	moz_cflags="-O -fno-rtti -fno-exceptions -fPIC -Wall -Wno-non-virtual-dtor -DNO_nsEmbedString_1Equals \
-		-DXPCOM_GLUE=1 -DMOZILLA_STRICT_API=1 -DSWT_VERSION=\$(SWT_VERSION) \$(NATIVE_STATS) \
-		-include \$(MOZILLA_FIVE_HOME)/include/mozilla-config.h \
-		-I./ -I./library \
-		-I\$(MOZILLA_FIVE_HOME)/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/java \
-		-I\$(MOZILLA_FIVE_HOME)/include/nspr -I\$(MOZILLA_FIVE_HOME)/include/nspr/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/xpcom -I\$(MOZILLA_FIVE_HOME)/include/xpcom/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/string -I\$(MOZILLA_FIVE_HOME)/include/string/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/embed_base -I\$(MOZILLA_FIVE_HOME)/include/embed_base/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/embedstring -I\$(MOZILLA_FIVE_HOME)/include/embedstring/include"
-	moz_libs="-shared -Wl,--version-script=mozilla_exports -Bsymbolic -L\$(MOZILLA_FIVE_HOME) -lgtkembedmoz"
-
-	sed -e "s:\`pkg-config --libs gtk+-2.0\`:${gtk_libs}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_libs}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)/include\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:MOZILLACFLAGS = .*$:MOZILLACFLAGS = ${moz_cflags}:" \
-		-e "s:MOZILLALIBS = .*$:MOZILLALIBS = ${moz_libs}:" \
-		makefile.mak > Makefile
-
-	export XTEST_LIB_PATH=/usr/X11R6/lib
-	export AWT_LIB_PATH=$JAVA_HOME/jre/bin
-
-	# Fix for bug #91340
-	if use amd64 ; then
-		export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-	fi
-
-	make make_swt || die "Failed to build platform-independent SWT support"
-	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
-
-	if use mozilla ; then
-		einfo "Building Mozilla component"
-		make make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	einfo "Building java source"
-	ant jar || die "Failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
-
-	java-pkg_sointo /usr/lib
-	java-pkg_doso *.so || die "Install of .so-files failed"
-
-	dohtml about.html
-}
-
diff --git a/dev-java/swt/swt-3.1_pre5-r1.ebuild b/dev-java/swt/swt-3.1_pre5-r1.ebuild
new file mode 100644
index 000000000000..3d0de67305ef
--- /dev/null
+++ b/dev-java/swt/swt-3.1_pre5-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre5-r1.ebuild,v 1.1 2005/05/24 17:52:54 compnerd Exp $
+
+inherit eutils java-pkg
+
+MY_DMF="S-3.1M5a-200502191500"
+MY_VERSION="3.1M5a"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (  http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-linux-gtk.zip )
+		 amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-linux-gtk-x86_64.zip )"
+
+SLOT="3.1"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="accessibility cairo firefox gnome mozilla"
+DEPEND="${RDEPEND}
+		>=virtual/jdk-1.4
+		  dev-java/ant-core
+		  app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4
+		 mozilla? (
+		 			firefox? ( >=www-client/mozilla-firefox-1.0.3 )
+					!firefox? ( >=www-client/mozilla-1.4 )
+				  )
+		 gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
+		 cairo? ( >=x11-libs/cairo-0.3.0 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if use firefox ; then
+		if ! use mozilla ; then
+			echo
+			ewarn "You must enable the mozilla useflag to build the browser"
+			ewarn "component.  The firefox flag is used only to determine"
+			ewarn "what to build against."
+
+			die "Firefox useflag enabled without mozilla support"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Extract based on architecture
+	if [[ ${ARCH} == 'x86' ]] ; then
+		unpack swt-${MY_VERSION}-linux-gtk.zip
+	else
+		unpack swt-${MY_VERSION}-linux-gtk-x86_64.zip
+	fi
+
+	# Clean up the directory structure
+	rm -r *.so *.jar
+	rm cpl-v10.html lgpl-v21.txt mpl-v11.txt
+
+	# We still need to have the JNI interfaces for these
+	# use mozilla || rm -f swt-mozillasrc.zip
+	# use cairo || rm -f swt-cairosrc.zip
+
+	# Unpack the sources
+	for i in $(ls *.zip) ; do
+		einfo "Unpacking ${i} to ${S}"
+		unzip $i &> /dev/null || die "Unable to extract sources"
+	done
+
+	# Take the XPCOM objects from the library code if we build the Mozilla
+	# Component
+	if use mozilla ; then
+		cp library/xpcom* ${S} || die "Unable to find sources for mozilla component."
+	fi
+
+	# Copy the cairo sources for compiling the cairo component
+	if use cairo ; then
+		cp library/cairo* ${S} || die "Unable to find sources for CAIRO component."
+	fi
+
+	# Replace the build.xml to allow compilation without Eclipse tasks
+	cp ${FILESDIR}/build.xml ${S} || die "Unable to update build.xml"
+	mkdir ${S}/src && mv ${S}/org ${S}/src || die "Unable to restructure SWT sources"
+}
+
+src_compile() {
+	JAVA_HOME=$(java-config -O)
+
+	# Identify the AWT path
+	if [[ ${ARCH} == 'x86' ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+	else
+		export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+	fi
+
+	# Identity the XTEST library location
+	export XTEST_LIB_PATH=/usr/X11R6/lib
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+
+	# Apply the Cairo patch
+	use cairo && epatch ${FILESDIR}/cairo.patch
+
+	# Fix the Makefile
+	sed -e "s:-I\$(JAVA_HOME)/include\(.*\)$:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux \1:" \
+		-e "s:/usr/local:/usr:" \
+		-e "s:CAIROCFLAGS = \([^ ]*\) \(.*\)$:CAIROCFLAGS = \1 -I/usr/include/cairo \2:" \
+		make_linux.mak > Makefile
+
+	einfo "Building AWT library"
+	emake make_awt || die "Failed to build AWT support"
+
+	einfo "Building SWT library"
+	emake make_swt || die "Failed to build SWT support"
+
+	if use accessibility ; then
+		einfo "Building JAVA-AT-SPI bridge"
+		emake make_atk || die "Failed to build ATK support"
+	fi
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		emake make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use mozilla ; then
+		if use firefox ; then
+			GECKO_SDK=/usr/lib/MozillaFirefox
+		else
+			GECKO_SDK=/usr/lib/mozilla
+		fi
+
+		export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
+						-I${GECKO_SDK}/include \
+						-I${GECKO_SDK}/include/java \
+						-I${GECKO_SDK}/include/nspr -I${GECKO_SDK}/include/nspr/include \
+						-I${GECKO_SDK}/include/xpcom -I${GECKO_SDK}/include/xpcom/include \
+						-I${GECKO_SDK}/include/string -I${GECKO_SDK}/include/string/include \
+						-I${GECKO_SDK}/include/embed_base -I${GECKO_SDK}/include/embed_base/include \
+						-I${GECKO_SDK}/include/embedstring -I${GECKO_SDK}/include/embedstring/include"
+		export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
+
+		einfo "Building the Mozilla component"
+		emake make_mozilla || die "Failed to build Mozilla support"
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		emake make_cairo || die "Unable to build CAIRO support"
+	fi
+
+	einfo "Building JNI libraries"
+	local libs="jar_swt-pi jar_swt"
+	use cairo && libs="${libs} jar_cairo"
+	use mozilla && libs="${libs} jar_mozilla"
+	ant ${libs} || die "Failed to create JNI jars"
+}
+
+src_install() {
+	java-pkg_dojar *.jar || die "Unable to install SWT Java interfaces"
+
+	java-pkg_sointo /usr/lib
+	java-pkg_doso *.so || die "Unable to install SWT libraries"
+
+	dohtml about.html
+}
+
+pkg_postinst() {
+	if use gnome ; then
+		ewarn "Changes in the gnome-vfs API may cause warnings with SWT."
+		ewarn "Please comment about the warnings at the following location:"
+		ewarn "https://bugs.eclipse.org/bugs/show_bug.cgi?id=79268"
+
+		ebeep 5
+	fi
+}
diff --git a/dev-java/swt/swt-3.1_pre5.ebuild b/dev-java/swt/swt-3.1_pre5.ebuild
deleted file mode 100644
index 71b387ac9349..000000000000
--- a/dev-java/swt/swt-3.1_pre5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1_pre5.ebuild,v 1.1 2005/05/04 11:52:54 luckyduck Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-
-MY_PV="3.1M5a"
-MY_PVA="${MY_PV}-200502191500"
-
-SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/S-${MY_PVA}/swt-${MY_PV}-linux-gtk.zip )
-	amd64? ( http://download.eclipse.org/downloads/drops/S-${MY_PVA}/swt-${MY_PV}-linux-gtk-x86_64.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~x86 ~amd64"
-SLOT="3"
-
-IUSE="gnome mozilla"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.5 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${S} && cd ${S}
-	unpack ${A}
-
-	rm -f *.so *.jar
-	use mozilla || rm -f swt-mozillasrc.zip
-
-	for i in *.zip ; do
-		einfo "Unpacking ${i} to ${S}"
-		unzip ${i} &> /dev/null
-	done
-
-	if use mozilla; then
-		cp library/*.cpp ${S} || die "Failed copy *.cpp"
-	fi
-
-	mkdir src && mv org src/
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die "Failed to copy build.xml"
-
-	sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
-
-	use mozilla ||
-		(
-			rm -rf ${S}/src/org/eclipse/swt/browser
-			rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
-		)
-
-}
-
-src_compile() {
-	if use gnome ; then
-	    gnome_libs=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	fi
-
-	gtk_libs=`pkg-config --libs gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-	atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export-dynamic:--export-dynamic:"`
-
-	sed -e :a -e '/\\$/N; s/\\\n//; ta' make_linux.mak > makefile.mak
-	moz_cflags="-O -fno-rtti -fno-exceptions -fPIC -Wall -Wno-non-virtual-dtor -DNO_nsEmbedString_1Equals \
-		-DXPCOM_GLUE=1 -DMOZILLA_STRICT_API=1 -DSWT_VERSION=\$(SWT_VERSION) \$(NATIVE_STATS) \
-		-include \$(MOZILLA_FIVE_HOME)/include/mozilla-config.h \
-		-I./ -I./library \
-		-I\$(MOZILLA_FIVE_HOME)/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/java \
-		-I\$(MOZILLA_FIVE_HOME)/include/nspr -I\$(MOZILLA_FIVE_HOME)/include/nspr/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/xpcom -I\$(MOZILLA_FIVE_HOME)/include/xpcom/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/string -I\$(MOZILLA_FIVE_HOME)/include/string/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/embed_base -I\$(MOZILLA_FIVE_HOME)/include/embed_base/include \
-		-I\$(MOZILLA_FIVE_HOME)/include/embedstring -I\$(MOZILLA_FIVE_HOME)/include/embedstring/include"
-	moz_libs="-shared -Wl,--version-script=mozilla_exports -Bsymbolic -L\$(MOZILLA_FIVE_HOME) -lgtkembedmoz"
-
-	sed -e "s:\`pkg-config --libs gtk+-2.0\`:${gtk_libs}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_libs}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)/include\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:MOZILLACFLAGS = .*$:MOZILLACFLAGS = ${moz_cflags}:" \
-		-e "s:MOZILLALIBS = .*$:MOZILLALIBS = ${moz_libs}:" \
-		makefile.mak > Makefile
-
-	export XTEST_LIB_PATH=/usr/X11R6/lib
-	export AWT_LIB_PATH=$JAVA_HOME/jre/bin
-
-	# Fix for bug #91340
-	if use amd64 ; then
-		export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-	fi
-
-	make make_swt || die "Failed to build platform-independent SWT support"
-	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
-
-	if use mozilla ; then
-		einfo "Building Mozilla component"
-		make make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	einfo "Building java source"
-	ant jar || die "Failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
-
-	java-pkg_sointo /usr/lib
-	java-pkg_doso *.so || die "Install of .so-files failed"
-
-	dohtml about.html
-}
-