12 files changed, 9 insertions, 783 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 61c936ec7571..079e7fde11fa 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.77 2008/01/06 16:13:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.78 2008/01/09 22:32:46 caster Exp $
+
+  09 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  -files/swt-3.2-cairo-signedness-x86_64.patch, -files/swt-3.2.1-fbsd.patch,
+  -files/swt-3.2-cairo-signedness-x86.patch,
+  -files/swt-3.2-gcc-4.x-warning-fix.patch,
+  -files/swt-3.2-remove-stripping.patch, -swt-3.2-r2.ebuild,
+  -swt-3.2.2.ebuild, -swt-3.2.2-r1.ebuild:
+  Clean up 3.2* versions.
 
   06 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> swt-3.3.ebuild:
   Add DEPEND on dev-util/pkgconfig. Fixes bug #204618.
diff --git a/dev-java/swt/files/digest-swt-3.2-r2 b/dev-java/swt/files/digest-swt-3.2-r2
deleted file mode 100644
index f8f121537b2f..000000000000
--- a/dev-java/swt/files/digest-swt-3.2-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7128a79bbc837626d07f2c7264e784aa swt-3.2-gtk-linux-ppc.zip 2913359
-RMD160 558cddfbd3fb32091908c23a26db4f153bf36510 swt-3.2-gtk-linux-ppc.zip 2913359
-SHA256 13cda631e4ec522c9d10aa2edb5a38f104e40ad1f67f94513f932a9193167062 swt-3.2-gtk-linux-ppc.zip 2913359
-MD5 2cba80d9bd247fd6985509d96c1540cd swt-3.2-gtk-linux-x86.zip 2935209
-RMD160 d9560445852020e7d755594c60ba01c7904b9924 swt-3.2-gtk-linux-x86.zip 2935209
-SHA256 05701ceb02a4099e035571abb0d005947758de48c47b49cd38a5b3fd5670a13c swt-3.2-gtk-linux-x86.zip 2935209
-MD5 e373d904a4f67322b0c1419c22285a5b swt-3.2-gtk-linux-x86_64.zip 2841135
-RMD160 8764b1357a23a530c9e523b6f1364a7b7abfea01 swt-3.2-gtk-linux-x86_64.zip 2841135
-SHA256 fb00c97c488353a10d7842a50b9184851e90870c3ec1b0ee3bfa838e6ac9a665 swt-3.2-gtk-linux-x86_64.zip 2841135
diff --git a/dev-java/swt/files/digest-swt-3.2.2 b/dev-java/swt/files/digest-swt-3.2.2
deleted file mode 100644
index 1ecebfbf7ec8..000000000000
--- a/dev-java/swt/files/digest-swt-3.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-MD5 e1340b6c7cf9b617145667b15b02fd49 swt-3.2.2-gtk-linux-x86.zip 3117432
-RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 swt-3.2.2-gtk-linux-x86.zip 3117432
-SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28 swt-3.2.2-gtk-linux-x86.zip 3117432
-MD5 d678cedc336a58b0147081b56de6a1f3 swt-3.2.2-gtk-linux-x86_64.zip 2996317
-RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 swt-3.2.2-gtk-linux-x86_64.zip 2996317
-SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56 swt-3.2.2-gtk-linux-x86_64.zip 2996317
diff --git a/dev-java/swt/files/digest-swt-3.2.2-r1 b/dev-java/swt/files/digest-swt-3.2.2-r1
deleted file mode 100644
index 1ecebfbf7ec8..000000000000
--- a/dev-java/swt/files/digest-swt-3.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-MD5 e1340b6c7cf9b617145667b15b02fd49 swt-3.2.2-gtk-linux-x86.zip 3117432
-RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 swt-3.2.2-gtk-linux-x86.zip 3117432
-SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28 swt-3.2.2-gtk-linux-x86.zip 3117432
-MD5 d678cedc336a58b0147081b56de6a1f3 swt-3.2.2-gtk-linux-x86_64.zip 2996317
-RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 swt-3.2.2-gtk-linux-x86_64.zip 2996317
-SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56 swt-3.2.2-gtk-linux-x86_64.zip 2996317
diff --git a/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch b/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch
deleted file mode 100644
index e7bc1d505dda..000000000000
--- a/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairo.c	2006-07-16 19:16:27.000000000 -0500
-+++ cairo.c	2006-07-16 19:18:15.000000000 -0500
-@@ -533,7 +533,7 @@
- {
- 	jint rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC);
--	rc = (jint)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4);
-+	rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC);
- 	return rc;
- }
diff --git a/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch b/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch
deleted file mode 100644
index 1a560bf1e483..000000000000
--- a/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairo.c	2006-07-17 16:02:31.000000000 +0200
-+++ cairo.c	2006-07-17 16:02:46.000000000 +0200
-@@ -533,7 +533,7 @@
- {
- 	jlong rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC);
--	rc = (jlong)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4);
-+	rc = (jlong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC);
- 	return rc;
- }
diff --git a/dev-java/swt/files/swt-3.2-gcc-4.x-warning-fix.patch b/dev-java/swt/files/swt-3.2-gcc-4.x-warning-fix.patch
deleted file mode 100644
index afa12e7f95fe..000000000000
--- a/dev-java/swt/files/swt-3.2-gcc-4.x-warning-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/os.c	2006-07-16 17:14:17.000000000 -0500
-+++ src/os.c	2006-07-16 17:16:04.000000000 -0500
-@@ -2618,7 +2618,7 @@
- 	OS_NATIVE_ENTER(env, that, _1g_1object_1get_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
--	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3);
-+	g_object_get((GObject *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL);
- fail:
- 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-@@ -2669,7 +2669,7 @@
- 	jbyte *lparg1=NULL;
- 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
--	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
-+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL);
- fail:
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
-@@ -2683,7 +2683,7 @@
- 	jbyte *lparg1=NULL;
- 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
--	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
-+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL);
- fail:
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
-@@ -2697,7 +2697,7 @@
- 	jbyte *lparg1=NULL;
- 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
--	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
-+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL);
- fail:
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
-@@ -2711,7 +2711,7 @@
- 	jbyte *lparg1=NULL;
- 	OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
--	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
-+	g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, arg3, (char *)NULL);
- fail:
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- 	OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
-@@ -12197,7 +12197,7 @@
- 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
--	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3);
-+	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL);
- fail:
- 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-@@ -12214,7 +12214,7 @@
- 	OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
- 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- 	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
--	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3);
-+	gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, arg3, (char *)NULL);
- fail:
- 	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
diff --git a/dev-java/swt/files/swt-3.2-remove-stripping.patch b/dev-java/swt/files/swt-3.2-remove-stripping.patch
deleted file mode 100644
index f31cd8dc4abd..000000000000
--- a/dev-java/swt/files/swt-3.2-remove-stripping.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- make_linux.mak.old	2006-10-15 11:43:54.729350590 +0300
-+++ make_linux.mak	2006-10-15 11:44:59.741467245 +0300
-@@ -46,7 +46,7 @@
- 
- CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
- 
--AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared -s
-+AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared 
- 
- ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
- ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
-@@ -75,7 +75,7 @@
- 	-I$(JAVA_HOME)/include/linux \
- 	${GECKO_INCLUDES} \
- 	${SWT_PTR_CFLAGS}
--MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic \
-+MOZILLALIBS = -shared  -Wl,--version-script=mozilla_exports -Bsymbolic \
- 	${GECKO_LIBS}
- 	
- SWT_OBJECTS = swt.o callback.o
-@@ -96,7 +96,7 @@
- 		-I$(JAVA_HOME)/include/linux \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
--LIBS = -shared -fPIC -s
-+LIBS = -shared -fPIC 
- 
- 
- all: make_swt make_atk make_gnome make_glx
diff --git a/dev-java/swt/files/swt-3.2.1-fbsd.patch b/dev-java/swt/files/swt-3.2.1-fbsd.patch
deleted file mode 100644
index 298a5f232f69..000000000000
--- a/dev-java/swt/files/swt-3.2.1-fbsd.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: work/build.sh
-===================================================================
---- work.orig/build.sh
-+++ work/build.sh
-@@ -31,6 +31,10 @@ case $OS in
- 		SWT_OS=solaris
- 		MAKEFILE=make_solaris.mak
- 		;;
-+	"FreeBSD")
-+		SWT_OS=freebsd
-+		MAKEFILE=make_freebsd.mak
-+		;;
- 	*)
- 		SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
- 		MAKEFILE=make_linux.mak
-Index: work/make_freebsd.mak
-===================================================================
---- work.orig/make_freebsd.mak
-+++ work/make_freebsd.mak
-@@ -78,7 +78,7 @@ MOZILLACFLAGS = -march=athlon64 -O2 -ftr
- 	-fPIC \
- 	-I. \
- 	-I$(JAVA_HOME)/include \
--	-I$(JAVA_HOME)/include/linux \
-+	-I$(JAVA_HOME)/include/freebsd \
- 	${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
- 	
-@@ -98,9 +98,9 @@ GLX_OBJECTS = swt.o glx.o glx_structs.o 
- CFLAGS = -march=athlon64 -O2 -ftracer -pipe -ftree-vectorize -Wformat=2 -Wno-error -Wno-pointer-sign -g -ggdb -Wstrict-aliasing=2 -Wno-format-zero-length -Wall \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
--		-DLINUX -DGTK \
-+		-DFREEBSD -DGTK \
- 		-I$(JAVA_HOME)/include \
--		-I$(JAVA_HOME)/include/linux \
-+		-I$(JAVA_HOME)/include/freebsd \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
- LIBS = -shared -fPIC
-Index: work/src/org/eclipse/swt/internal/gtk/OS.java
-===================================================================
---- work.orig/src/org/eclipse/swt/internal/gtk/OS.java
-+++ work/src/org/eclipse/swt/internal/gtk/OS.java
-@@ -23,18 +23,20 @@ public class OS extends Platform {
- 	}
- 	
- 	/** OS Constants */
--	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX;
-+	public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD;
- 	static {
- 		
- 		/* Initialize the OS flags and locale constants */
-+		/* make bootstrap compatible with `uname -s` for FreeBSD */
- 		String osName = System.getProperty ("os.name");
--		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false;
-+		boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isFreeBSD = false;
- 		if (osName.equals ("Linux")) isLinux = true;
-+		if (osName.equals ("FreeBSD")) isFreeBSD = true;
- 		if (osName.equals ("AIX")) isAIX = true;
- 		if (osName.equals ("Solaris")) isSunOS = true;
- 		if (osName.equals ("SunOS")) isSunOS = true;
- 		if (osName.equals ("HP-UX")) isHPUX = true;
--		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsHPUX = isHPUX;
-+		IsAIX = isAIX;  IsSunOS = isSunOS;  IsLinux = isLinux;  IsFreeBSD = isFreeBSD;  IsHPUX = isHPUX;
- 	}
- 
- 	/** Constants */
diff --git a/dev-java/swt/swt-3.2-r2.ebuild b/dev-java/swt/swt-3.2-r2.ebuild
deleted file mode 100644
index 166c74885f97..000000000000
--- a/dev-java/swt/swt-3.2-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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-r2.ebuild,v 1.7 2007/07/22 09:08:08 graaff Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_DMF="R-3.2-200606291905"
-MY_VERSION="3.2"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86.zip )
-		amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86_64.zip )
-		ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-ppc.zip )"
-
-SLOT="3"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="cairo gnome seamonkey opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8
-		>=dev-libs/atk-1.10.2
-		x11-libs/libX11
-		x11-libs/libXtst
-		cairo? ( >=x11-libs/cairo-1.0.2 )
-		gnome?	(
-					=gnome-base/libgnome-2*
-					=gnome-base/gnome-vfs-2*
-					=gnome-base/libgnomeui-2*
-				)
-		seamonkey? (
-					>=www-client/seamonkey-1.0.2
-					>=dev-libs/nspr-4.6.2
-				)
-		opengl?	(
-					virtual/opengl
-					virtual/glu
-				)"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON}
-		dev-java/ant-core
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unzip -jq "${DISTDIR}/${A}" "*src.zip" || die "unable to extract distfile"
-
-	# Unpack the sources
-	einfo "Unpacking src.zip to ${S}"
-	unzip -q src.zip || die "Unable to extract sources"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/
-	rm -f .classpath .project
-
-	# 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"
-
-	# Patch for GCC 4.x warnings
-	epatch "${FILESDIR}"/${PN}-3.2-gcc-4.x-warning-fix.patch
-
-	epatch "${FILESDIR}"/${PN}-3.2-remove-stripping.patch
-
-	if [[ ${ARCH} == "amd64" ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86_64.patch
-	else
-		epatch "${FILESDIR}"/${PN}-3.2-cairo-signedness-x86.patch
-	fi
-}
-
-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 [[ ${ARCH} == 'x86' ]] ; then
-			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
-		elif [[ ${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 GTK+ Library path
-	export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) -lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
-
-	einfo "Building AWT library"
-	emake -f make_linux.mak make_awt || die "Failed to build AWT support"
-
-	einfo "Building SWT library"
-	emake -f make_linux.mak make_swt || die "Failed to build SWT support"
-
-	einfo "Building JAVA-AT-SPI bridge"
-	emake -f make_linux.mak make_atk || die "Failed to build ATK support"
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		emake -f make_linux.mak make_gnome || die "Failed to build GNOME VFS support"
-	fi
-
-	if use seamonkey ; then
-		export GECKO_SDK="$(pkg-config seamonkey-xpcom --variable=libdir)"
-		export GECKO_INCLUDES="-I/usr/$(get_libdir)/seamonkey/include/xpcom \
-								-I/usr/include/nspr \
-								-I/usr/$(get_libdir)/seamonkey/include/embed_base \
-								-I/usr/$(get_libdir)/seamonkey/include/string"
-		export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
-
-		einfo "Building the Mozilla component"
-		emake -f make_linux.mak make_mozilla || die "Failed to build Mozilla support"
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		emake -f make_linux.mak make_cairo || die "Unable to build CAIRO support"
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		emake -f make_linux.mak make_glx || die "Unable to build OpenGL component"
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile || die "Failed to compile JNI interfaces"
-
-	einfo "Copying missing files"
-	cp ${S}/version.txt ${S}/build/version.txt
-	cp ${S}/src/org/eclipse/swt/internal/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
-
-	einfo "Packing JNI libraries"
-	eant jar || die "Failed to create JNI jar"
-}
-
-src_install() {
-	java-pkg_dojar swt.jar
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html
-}
-
-pkg_postinst() {
-	if use cairo; then
-		ewarn
-		ewarn "CAIRO Support is experimental! We are not responsible if"
-		ewarn "enabling support for CAIRO corrupts your Gentoo install,"
-		ewarn "if it blows up your computer, or if it becomes sentient"
-		ewarn "and chases you down the street yelling random binary!"
-		ewarn
-		ebeep 5
-	fi
-}
diff --git a/dev-java/swt/swt-3.2.2-r1.ebuild b/dev-java/swt/swt-3.2.2-r1.ebuild
deleted file mode 100644
index bef4e71073cc..000000000000
--- a/dev-java/swt/swt-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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.3 2007/07/11 19:58:38 mr_bones_ 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="${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}/${P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${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 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? (
-					>=www-client/seamonkey-1.0.2
-					>=dev-libs/nspr-4.6.2
-				)
-		xulrunner? (
-					net-libs/xulrunner
-				)
-		opengl?	(
-					virtual/opengl
-					virtual/glu
-				)"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON}
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-proto/xextproto"
-
-# 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## }
-	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/
-	rm -f .classpath .project
-
-	# 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"
-
-	cp make_linux.mak make_freebsd.mak
-
-	#  https://bugs.eclipse.org/bugs/show_bug.cgi?id=167173
-	epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
-}
-
-get_gecko() {
-	local gecko
-	# Wasn't able to succesfully run test with this
-	# http://overlays.gentoo.org/proj/java/browser/testcases/dev-java/swt
-	#use firefox && local gecko="firefox"
-	use seamonkey && gecko="seamonkey"
-	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 GTK+ Library path
-	export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) \
-		-lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
-
-	# 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)"
-		GECKO_INCLUDES="${inc}" \
-		GECKO_LIBS="$(pkg-config ${gecko}-xpcom --libs)" \
-			${make} make_mozilla || die "Failed to build Mozilla support"
-	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)"
-	[[ -n "${gecko}" ]] && java-pkg_register-environment-variable \
-		MOZILLA_FIVE_HOME "/usr/$(get_libdir)/${gecko}/"
-
-	dohtml about.html || die
-}
diff --git a/dev-java/swt/swt-3.2.2.ebuild b/dev-java/swt/swt-3.2.2.ebuild
deleted file mode 100644
index 8fd708cfea8e..000000000000
--- a/dev-java/swt/swt-3.2.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# 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.9 2007/07/11 19:58:38 mr_bones_ 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="${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}/${P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://download.eclipse.org/downloads/drops/${MY_DMF}/${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 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? (
-					>=www-client/seamonkey-1.0.2
-					>=dev-libs/nspr-4.6.2
-				)
-		xulrunner? (
-					net-libs/xulrunner
-				)
-		opengl?	(
-					virtual/opengl
-					virtual/glu
-				)"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON}
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-proto/xextproto"
-
-RDEPEND=">=virtual/jre-1.4
-		x11-libs/libXtst
-		${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## }
-	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/
-	rm -f .classpath .project
-
-	# 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"
-
-	cp make_linux.mak make_freebsd.mak
-
-	#  https://bugs.eclipse.org/bugs/show_bug.cgi?id=167173
-	epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
-}
-
-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 GTK+ Library path
-	export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) \
-		-lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
-
-	# 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
-
-	# Wasn't able to succesfully run test with this
-	# http://overlays.gentoo.org/proj/java/browser/testcases/dev-java/swt
-	#use firefox && local gecko="firefox"
-	use seamonkey && local gecko="seamonkey"
-	use xulrunner && local gecko="xulrunner"
-
-	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)"
-		GECKO_INCLUDES="${inc}" \
-		GECKO_LIBS="$(pkg-config ${gecko}-xpcom --libs)" \
-			${make} make_mozilla || die "Failed to build Mozilla support"
-	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
-
-	dohtml about.html || die
-}