cleanup on aisle 12

Package-Manager: portage-2.1.1_pre5-r3

7 files changed, 4 insertions, 891 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index b13b0532d7c1..b14198e1143e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -18,26 +18,12 @@ AUX swt-3.2-gcc-4.x-warning-fix.patch 3914 RMD160 a05d641b13f72046835766af76730d
 MD5 14e9503e21c0cb37f8e8e7c66ce9b27f files/swt-3.2-gcc-4.x-warning-fix.patch 3914
 RMD160 a05d641b13f72046835766af76730d6f219dec33 files/swt-3.2-gcc-4.x-warning-fix.patch 3914
 SHA256 8d70690af4b28e40bbd5b6dfd247ec2909c424dc3847697108fe27dfe88498b8 files/swt-3.2-gcc-4.x-warning-fix.patch 3914
-AUX swt-cairo-0.9.2-amd64.patch 8325 RMD160 658b6b620cbf202afd438f3d5d7f834444df2c67 SHA1 82a57ad5a5ab98b487f9474264d1524e82e4a473 SHA256 1e21b11b59618036099619fac480d3ed657f0b27fa4cac59230b4866241d641b
-MD5 b246c6ca2f33a241ab92d5a8c74da665 files/swt-cairo-0.9.2-amd64.patch 8325
-RMD160 658b6b620cbf202afd438f3d5d7f834444df2c67 files/swt-cairo-0.9.2-amd64.patch 8325
-SHA256 1e21b11b59618036099619fac480d3ed657f0b27fa4cac59230b4866241d641b files/swt-cairo-0.9.2-amd64.patch 8325
-AUX swt-cairo-0.9.2.patch 8692 RMD160 1f54b2869d37eeec074713959e7e1a87b2451508 SHA1 189c640764d7f71451cff74490bd086916a5e1aa SHA256 fc4b637d6bd1590593f00ded5c1d42c0235cd441751c891ec2608c0bd654bf6c
-MD5 86a056e193ce8f351e3b12d7f5751861 files/swt-cairo-0.9.2.patch 8692
-RMD160 1f54b2869d37eeec074713959e7e1a87b2451508 files/swt-cairo-0.9.2.patch 8692
-SHA256 fc4b637d6bd1590593f00ded5c1d42c0235cd441751c891ec2608c0bd654bf6c files/swt-cairo-0.9.2.patch 8692
 DIST swt-3.1-gtk-linux-ppc.zip 2525054 RMD160 4796a87735da329bcb9a3ed0678990ac8bd84237 SHA1 9b96ffb4be828cb51336c6bacde3facdf12c525b SHA256 31901755e2273afedc0b4722c2c7df2bf473aed29b6c39cc7497cd797f67826e
 DIST swt-3.1-gtk-linux-x86.zip 2643472 RMD160 c0082baccd6a8cb4c173eef81497455397727007 SHA1 6613c83394c4dc17db38519e37f83ff7ef7abec6 SHA256 9a12c6e0377836c277e0268b94d66b8f1a6dd46c5a51720353ec209a2956c25f
 DIST swt-3.1-gtk-linux-x86_64.zip 2702033 RMD160 77b14d72810615f43edb0193e54c8702714b9947 SHA1 73f2e5982958e02c651eeb86235bb9bf255b08d4 SHA256 5314bd993327ea6e6646a437dde034d574d2e4c66e96ca6a12815fca807458ce
 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
-DIST swt-3.2M1-gtk-linux-ppc.zip 2542441 RMD160 c66c7adb5ae6e92721e8c5d5587d30ea2256b0a8 SHA1 9c81d578bf3779c516f850c69edc57a7babdb26c SHA256 704112b8774cad633e6d00d5a072c113628b34e7560fd878435c3928aee0dd7b
-DIST swt-3.2M1-gtk-linux-x86.zip 2666543 RMD160 5051883dad54fd3f2fcd18617e413811f84c0ad9 SHA1 00a07a81992dff6aaa646da28baba98f86d180c2 SHA256 0a5c46879990ba86439e56d1807e032e9eb1bc72923fbd72a66e18e37e2493f8
-DIST swt-3.2M1-gtk-linux-x86_64.zip 2725513 RMD160 02e96f91c5bd473b612b53b73f8a38a070d7df3e SHA1 28ec312a885362d76daffbfef6c3686f9339b137 SHA256 17ee4bed6440b0e76623e2498934539dc367ca00f5d211f87deeec214f34e7a8
-DIST swt-3.2RC2-gtk-linux-ppc.zip 2902121 RMD160 43b4e79796a2ae6b0726b7713b9267228cce5f29 SHA1 5b02850f5119f07c53749c889fb6182290c9f89d SHA256 0e5ca130872c9e9ad61a59cf35d4031198eb12e2a97c5edd44e382fff8c460e9
-DIST swt-3.2RC2-gtk-linux-x86.zip 2925435 RMD160 9b9f96c9cd3bf0be7fbf48fb5e214b712552bc10 SHA1 9c175bd4da154837765c1b6ec287be4ea72a2743 SHA256 c7f9bb6f1d6a019ffdc9dc0c486fd7f6d0eed1b528cbb05eb71468d403ac34e4
-DIST swt-3.2RC2-gtk-linux-x86_64.zip 2828002 RMD160 65246c119a51567fb0e1ac308536d4e50218a256 SHA1 f53ccec493fb90c97826978df1eefa45a9a4d1c1 SHA256 a39d7c62ab76fe73422bf1128dba7ae2e3d210c3a395d922a87c1872c33f8a6f
 EBUILD swt-3.1-r1.ebuild 5134 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 SHA1 f1cec1ae2eccb440cca5c98893426e4288d44ba9 SHA256 cf3dcba06645c17931a76cceed12b4b9fa7c5342efe8607fadb1237ba9193f54
 MD5 b4b7d6f6a73cc928573c5059606ed87c swt-3.1-r1.ebuild 5134
 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 swt-3.1-r1.ebuild 5134
@@ -50,18 +36,10 @@ EBUILD swt-3.2.ebuild 5016 RMD160 9b0764a9276b1301954ba578277a499a9dc22434 SHA1
 MD5 a43588bf08f3a460fd4fa7321dbb181d swt-3.2.ebuild 5016
 RMD160 9b0764a9276b1301954ba578277a499a9dc22434 swt-3.2.ebuild 5016
 SHA256 96fd3ef49716b980f5d424666d6d4c47caf3a4ace63c4e2e37a9f76c7534c166 swt-3.2.ebuild 5016
-EBUILD swt-3.2_pre1.ebuild 5245 RMD160 debe0e896d88db90135e05f9fe7805d0b3a5f724 SHA1 293ad77d7ca3c09511598af46e691d1f276696d7 SHA256 b37a0a9d5b88cc782ca95df7f0a464645347b4836d29ec2a5a469bef78880df9
-MD5 c2ba2580e8fd395f5b1056ef63215e6e swt-3.2_pre1.ebuild 5245
-RMD160 debe0e896d88db90135e05f9fe7805d0b3a5f724 swt-3.2_pre1.ebuild 5245
-SHA256 b37a0a9d5b88cc782ca95df7f0a464645347b4836d29ec2a5a469bef78880df9 swt-3.2_pre1.ebuild 5245
-EBUILD swt-3.2_rc2.ebuild 4595 RMD160 0952334e470de49936f4e50775ece01b508d753a SHA1 890f027a85cdfe58441e26925a495623ad4693b8 SHA256 6067d91c7a775fa025c65fcb3de0a494ce6de6c5b10aedd432ee359899ae7af9
-MD5 59af6e182f6b2d334b8d5b3dca5a774a swt-3.2_rc2.ebuild 4595
-RMD160 0952334e470de49936f4e50775ece01b508d753a swt-3.2_rc2.ebuild 4595
-SHA256 6067d91c7a775fa025c65fcb3de0a494ce6de6c5b10aedd432ee359899ae7af9 swt-3.2_rc2.ebuild 4595
-MISC ChangeLog 6871 RMD160 aae94874bc069e2fbdb80951e142e5d067dd5924 SHA1 cedc4d79df5f4d3a9aec296bba071bb5deb90aaa SHA256 45b598cc03cfd9700ad87293cde2b30f6f2072e2ff4c1be1ae41320f10f2ccb0
-MD5 370dd9c90fe2c6fc88b244baab5325d9 ChangeLog 6871
-RMD160 aae94874bc069e2fbdb80951e142e5d067dd5924 ChangeLog 6871
-SHA256 45b598cc03cfd9700ad87293cde2b30f6f2072e2ff4c1be1ae41320f10f2ccb0 ChangeLog 6871
+MISC ChangeLog 7061 RMD160 009c49ae9813a3fc249277808845dd0c7e843b10 SHA1 e954dba658fc5219da149f10d585ebfc58cc9b94 SHA256 6a57f754969dc4bbf029fcb4fc084b3679c1ec20f98fe559f7988e3e0e5f090b
+MD5 5daa40d305b91f6e4febdb8dd36c7faa ChangeLog 7061
+RMD160 009c49ae9813a3fc249277808845dd0c7e843b10 ChangeLog 7061
+SHA256 6a57f754969dc4bbf029fcb4fc084b3679c1ec20f98fe559f7988e3e0e5f090b ChangeLog 7061
 MISC metadata.xml 541 RMD160 33bb464b6275a77003697575eb0b7489136b8c3a SHA1 d8f32b4f5af20f823913c2568f104eb152e265ab SHA256 8b1a4fe91adab457d55e0ba84ad35f19c39a0fea87ac552168bd9cbe3c796aa7
 MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541
 RMD160 33bb464b6275a77003697575eb0b7489136b8c3a metadata.xml 541
@@ -75,9 +53,3 @@ SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/di
 MD5 8bd1dc15426b016e6e25cd7af5143fa8 files/digest-swt-3.2-r1 786
 RMD160 606e3a5f2cd82b21193f5f444d2b5f2f46a8d710 files/digest-swt-3.2-r1 786
 SHA256 b4e2c4cf92d0606d20e53cbf52eb32e93be676595a5c1e0d48e2e0b95caddce5 files/digest-swt-3.2-r1 786
-MD5 2506579efc943516ed8099585d38181c files/digest-swt-3.2_pre1 804
-RMD160 1762ea2c201b0dfabb931a7f0f1c951fb7a0e75a files/digest-swt-3.2_pre1 804
-SHA256 a20bc6cbd867638b80f8295733bd06b79ec7bb14ed04bfc7b735512dfb3fcc9b files/digest-swt-3.2_pre1 804
-MD5 bf80eeca2f4fdf664b27174472696629 files/digest-swt-3.2_rc2 813
-RMD160 079814b8d4d4ee990258848ea2dea78e2f17d6b7 files/digest-swt-3.2_rc2 813
-SHA256 df635494127111ee5a9851fa28d829c814817c6d17542c23af6404086594eec4 files/digest-swt-3.2_rc2 813
diff --git a/dev-java/swt/files/digest-swt-3.2_pre1 b/dev-java/swt/files/digest-swt-3.2_pre1
deleted file mode 100644
index 2d8090695b19..000000000000
--- a/dev-java/swt/files/digest-swt-3.2_pre1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 c2d0daa2a480d2276e1f406ba28e57ed swt-3.2M1-gtk-linux-ppc.zip 2542441
-RMD160 c66c7adb5ae6e92721e8c5d5587d30ea2256b0a8 swt-3.2M1-gtk-linux-ppc.zip 2542441
-SHA256 704112b8774cad633e6d00d5a072c113628b34e7560fd878435c3928aee0dd7b swt-3.2M1-gtk-linux-ppc.zip 2542441
-MD5 907ad3012ec32beaa9662fcafb5aa669 swt-3.2M1-gtk-linux-x86.zip 2666543
-RMD160 5051883dad54fd3f2fcd18617e413811f84c0ad9 swt-3.2M1-gtk-linux-x86.zip 2666543
-SHA256 0a5c46879990ba86439e56d1807e032e9eb1bc72923fbd72a66e18e37e2493f8 swt-3.2M1-gtk-linux-x86.zip 2666543
-MD5 3c3cde2a01d3b59d57165b9fe0e6ed73 swt-3.2M1-gtk-linux-x86_64.zip 2725513
-RMD160 02e96f91c5bd473b612b53b73f8a38a070d7df3e swt-3.2M1-gtk-linux-x86_64.zip 2725513
-SHA256 17ee4bed6440b0e76623e2498934539dc367ca00f5d211f87deeec214f34e7a8 swt-3.2M1-gtk-linux-x86_64.zip 2725513
diff --git a/dev-java/swt/files/digest-swt-3.2_rc2 b/dev-java/swt/files/digest-swt-3.2_rc2
deleted file mode 100644
index 418b9117b6ff..000000000000
--- a/dev-java/swt/files/digest-swt-3.2_rc2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 88f0b44c44fa145a3bc9cb92e50836fd swt-3.2RC2-gtk-linux-ppc.zip 2902121
-RMD160 43b4e79796a2ae6b0726b7713b9267228cce5f29 swt-3.2RC2-gtk-linux-ppc.zip 2902121
-SHA256 0e5ca130872c9e9ad61a59cf35d4031198eb12e2a97c5edd44e382fff8c460e9 swt-3.2RC2-gtk-linux-ppc.zip 2902121
-MD5 e1b465bee8b7fc8cdc059e93861af799 swt-3.2RC2-gtk-linux-x86.zip 2925435
-RMD160 9b9f96c9cd3bf0be7fbf48fb5e214b712552bc10 swt-3.2RC2-gtk-linux-x86.zip 2925435
-SHA256 c7f9bb6f1d6a019ffdc9dc0c486fd7f6d0eed1b528cbb05eb71468d403ac34e4 swt-3.2RC2-gtk-linux-x86.zip 2925435
-MD5 a4dfa2251062ae21112a7ea4a07650c7 swt-3.2RC2-gtk-linux-x86_64.zip 2828002
-RMD160 65246c119a51567fb0e1ac308536d4e50218a256 swt-3.2RC2-gtk-linux-x86_64.zip 2828002
-SHA256 a39d7c62ab76fe73422bf1128dba7ae2e3d210c3a395d922a87c1872c33f8a6f swt-3.2RC2-gtk-linux-x86_64.zip 2828002
diff --git a/dev-java/swt/files/swt-cairo-0.9.2-amd64.patch b/dev-java/swt/files/swt-cairo-0.9.2-amd64.patch
deleted file mode 100644
index c2b6a82137cb..000000000000
--- a/dev-java/swt/files/swt-cairo-0.9.2-amd64.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- cairo.c.orig	2005-08-11 15:44:50.000000000 +0000
-+++ cairo.c	2005-09-10 21:45:59.747679632 +0000
-@@ -254,6 +254,62 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1font_1options_1create
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1font_1options_1create)
-+	(JNIEnv *env, jclass that)
-+{
-+	jlong rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1create_FUNC);
-+	rc = (jlong)cairo_font_options_create();
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1create_FUNC);
-+	return rc;
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1destroy
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1destroy)
-+	(JNIEnv *env, jclass that, jint arg0)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1destroy_FUNC);
-+	cairo_font_options_destroy((cairo_font_options_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1destroy_FUNC);
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1get_1antialias
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1font_1options_1get_1antialias)
-+	(JNIEnv *env, jclass that, jlong arg0)
-+{
-+	jlong rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1get_1antialias_FUNC);
-+	rc = (jlong)cairo_font_options_get_antialias((cairo_font_options_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1get_1antialias_FUNC);
-+	return rc;
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1set_1antialias
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1set_1antialias)
-+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1set_1antialias_FUNC);
-+	cairo_font_options_set_antialias((cairo_font_options_t *)arg0, (cairo_antialias_t)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1set_1antialias_FUNC);
-+}
-+#endif
-+
-+#ifndef NO_cairo_1get_1antialias
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1get_1antialias)
-+	(JNIEnv *env, jclass that, jlong arg0)
-+{
-+	jlong rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1get_1antialias_FUNC);
-+	rc = (jlong)cairo_get_antialias((cairo_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1get_1antialias_FUNC);
-+	return rc;
-+}
-+#endif
-+
- #ifndef NO_cairo_1get_1current_1point
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1current_1point)
- 	(JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
-@@ -972,12 +1028,14 @@
- #endif
- 
- #ifndef NO_cairo_1reference
--JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reference)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1reference)
- 	(JNIEnv *env, jclass that, jlong arg0)
- {
-+	jlong rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1reference_FUNC);
--	cairo_reference((cairo_t *)arg0);
-+	rc = (jlong)cairo_reference((cairo_t *)arg0);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1reference_FUNC);
-+	return rc;
- }
- #endif
- 
-@@ -1075,6 +1133,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1set_1antialias
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1antialias)
-+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1set_1antialias_FUNC);
-+	cairo_set_antialias((cairo_t *)arg0, (cairo_antialias_t)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1set_1antialias_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1set_1dash
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1dash)
- 	(JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
-@@ -1123,6 +1191,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1set_1font_1options
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1options)
-+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1options_FUNC);
-+	cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1options_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1set_1font_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size)
- 	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
-@@ -1133,6 +1211,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1get_1font_1options
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1options)
-+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1options_FUNC);
-+	cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1options_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1set_1line_1cap
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1line_1cap)
- 	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-@@ -1371,14 +1459,12 @@
- #endif
- 
- #ifndef NO_cairo_1surface_1finish
--JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1finish)
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1finish)
- 	(JNIEnv *env, jclass that, jlong arg0)
- {
--	jint rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1finish_FUNC);
--	rc = (jint)cairo_surface_finish((cairo_surface_t *)arg0);
-+	cairo_surface_finish((cairo_surface_t *)arg0);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1finish_FUNC);
--	return rc;
- }
- #endif
- 
-@@ -1526,11 +1612,11 @@
- 
- #ifndef NO_cairo_1xlib_1surface_1create_1for_1bitmap
- JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create_1for_1bitmap)
--	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
-+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4)
- {
- 	jlong rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
--	rc = (jlong)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, arg2, arg3);
-+	rc = (jlong)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
- 	return rc;
- }
-
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- cairo_stats.c	2005/07/11 21:28:17	1.6
-+++ cairo_stats.c	2005/08/15 20:22:55	1.7
-@@ -24,8 +24,8 @@
- 
- #ifdef NATIVE_STATS
- 
--int Cairo_nativeFunctionCount = 130;
--int Cairo_nativeFunctionCallCount[130];
-+int Cairo_nativeFunctionCount = 138;
-+int Cairo_nativeFunctionCallCount[138];
- char * Cairo_nativeFunctionNames[] = {
- 	"cairo_1append_1path",
- 	"cairo_1arc",
-@@ -46,10 +46,16 @@
- 	"cairo_1fill_1preserve",
- 	"cairo_1font_1extents",
- 	"cairo_1font_1extents_1t_1sizeof",
-+	"cairo_1font_1options_1create",
-+	"cairo_1font_1options_1destroy",
-+	"cairo_1font_1options_1get_1antialias",
-+	"cairo_1font_1options_1set_1antialias",
-+	"cairo_1get_1antialias",
- 	"cairo_1get_1current_1point",
- 	"cairo_1get_1fill_1rule",
- 	"cairo_1get_1font_1face",
- 	"cairo_1get_1font_1matrix",
-+	"cairo_1get_1font_1options",
- 	"cairo_1get_1line_1cap",
- 	"cairo_1get_1line_1join",
- 	"cairo_1get_1line_1width",
-@@ -114,10 +120,12 @@
- 	"cairo_1save",
- 	"cairo_1scale",
- 	"cairo_1select_1font_1face",
-+	"cairo_1set_1antialias",
- 	"cairo_1set_1dash",
- 	"cairo_1set_1fill_1rule",
- 	"cairo_1set_1font_1face",
- 	"cairo_1set_1font_1matrix",
-+	"cairo_1set_1font_1options",
- 	"cairo_1set_1font_1size",
- 	"cairo_1set_1line_1cap",
- 	"cairo_1set_1line_1join",
-
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- cairo_stats.h	2005/07/11 21:28:17	1.6
-+++ cairo_stats.h	2005/08/15 20:22:55	1.7
-@@ -50,10 +50,16 @@
- 	cairo_1fill_1preserve_FUNC,
- 	cairo_1font_1extents_FUNC,
- 	cairo_1font_1extents_1t_1sizeof_FUNC,
-+	cairo_1font_1options_1create_FUNC,
-+	cairo_1font_1options_1destroy_FUNC,
-+	cairo_1font_1options_1get_1antialias_FUNC,
-+	cairo_1font_1options_1set_1antialias_FUNC,
-+	cairo_1get_1antialias_FUNC,
- 	cairo_1get_1current_1point_FUNC,
- 	cairo_1get_1fill_1rule_FUNC,
- 	cairo_1get_1font_1face_FUNC,
- 	cairo_1get_1font_1matrix_FUNC,
-+	cairo_1get_1font_1options_FUNC,
- 	cairo_1get_1line_1cap_FUNC,
- 	cairo_1get_1line_1join_FUNC,
- 	cairo_1get_1line_1width_FUNC,
-@@ -118,10 +124,12 @@
- 	cairo_1save_FUNC,
- 	cairo_1scale_FUNC,
- 	cairo_1select_1font_1face_FUNC,
-+	cairo_1set_1antialias_FUNC,
- 	cairo_1set_1dash_FUNC,
- 	cairo_1set_1fill_1rule_FUNC,
- 	cairo_1set_1font_1face_FUNC,
- 	cairo_1set_1font_1matrix_FUNC,
-+	cairo_1set_1font_1options_FUNC,
- 	cairo_1set_1font_1size_FUNC,
- 	cairo_1set_1line_1cap_FUNC,
- 	cairo_1set_1line_1join_FUNC,
diff --git a/dev-java/swt/files/swt-cairo-0.9.2.patch b/dev-java/swt/files/swt-cairo-0.9.2.patch
deleted file mode 100644
index cac280ddbd4a..000000000000
--- a/dev-java/swt/files/swt-cairo-0.9.2.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-==================================================================
-RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c	2005/07/11 21:28:17	1.4
-+++ org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c	2005/08/15 20:22:55	1.5
-@@ -254,6 +254,62 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1font_1options_1create
-+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1create)
-+	(JNIEnv *env, jclass that)
-+{
-+	jint rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1create_FUNC);
-+	rc = (jint)cairo_font_options_create();
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1create_FUNC);
-+	return rc;
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1destroy
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1destroy)
-+	(JNIEnv *env, jclass that, jint arg0)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1destroy_FUNC);
-+	cairo_font_options_destroy((cairo_font_options_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1destroy_FUNC);
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1get_1antialias
-+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1get_1antialias)
-+	(JNIEnv *env, jclass that, jint arg0)
-+{
-+	jint rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1get_1antialias_FUNC);
-+	rc = (jint)cairo_font_options_get_antialias((cairo_font_options_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1get_1antialias_FUNC);
-+	return rc;
-+}
-+#endif
-+
-+#ifndef NO_cairo_1font_1options_1set_1antialias
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1set_1antialias)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1set_1antialias_FUNC);
-+	cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1set_1antialias_FUNC);
-+}
-+#endif
-+
-+#ifndef NO_cairo_1get_1antialias
-+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1antialias)
-+	(JNIEnv *env, jclass that, jint arg0)
-+{
-+	jint rc = 0;
-+	Cairo_NATIVE_ENTER(env, that, cairo_1get_1antialias_FUNC);
-+	rc = (jint)cairo_get_antialias((cairo_t *)arg0);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1get_1antialias_FUNC);
-+	return rc;
-+}
-+#endif
-+
- #ifndef NO_cairo_1get_1current_1point
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1current_1point)
- 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-@@ -309,6 +365,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1get_1font_1options
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1options)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1options_FUNC);
-+	cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1options_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1get_1line_1cap
- JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1line_1cap)
- 	(JNIEnv *env, jclass that, jint arg0)
-@@ -972,12 +1038,14 @@
- #endif
- 
- #ifndef NO_cairo_1reference
--JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reference)
-+JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1reference)
- 	(JNIEnv *env, jclass that, jint arg0)
- {
-+	jint rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1reference_FUNC);
--	cairo_reference((cairo_t *)arg0);
-+	rc = (jint)cairo_reference((cairo_t *)arg0);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1reference_FUNC);
-+	return rc;
- }
- #endif
- 
-@@ -1075,6 +1143,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1set_1antialias
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1antialias)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1set_1antialias_FUNC);
-+	cairo_set_antialias((cairo_t *)arg0, arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1set_1antialias_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1set_1dash
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1dash)
- 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
-@@ -1123,6 +1201,16 @@
- }
- #endif
- 
-+#ifndef NO_cairo_1set_1font_1options
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1options)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1)
-+{
-+	Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1options_FUNC);
-+	cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-+	Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1options_FUNC);
-+}
-+#endif
-+
- #ifndef NO_cairo_1set_1font_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size)
- 	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-@@ -1371,14 +1459,12 @@
- #endif
- 
- #ifndef NO_cairo_1surface_1finish
--JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1finish)
-+JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1finish)
- 	(JNIEnv *env, jclass that, jint arg0)
- {
--	jint rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1finish_FUNC);
--	rc = (jint)cairo_surface_finish((cairo_surface_t *)arg0);
-+	cairo_surface_finish((cairo_surface_t *)arg0);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1finish_FUNC);
--	return rc;
- }
- #endif
- 
-@@ -1526,11 +1612,11 @@
- 
- #ifndef NO_cairo_1xlib_1surface_1create_1for_1bitmap
- JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create_1for_1bitmap)
--	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
- 	jint rc = 0;
- 	Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
--	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, arg2, arg3);
-+	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
- 	Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
- 	return rc;
- }
-
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c	2005/07/11 21:28:17	1.6
-+++ org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c	2005/08/15 20:22:55	1.7
-@@ -24,8 +24,8 @@
- 
- #ifdef NATIVE_STATS
- 
--int Cairo_nativeFunctionCount = 130;
--int Cairo_nativeFunctionCallCount[130];
-+int Cairo_nativeFunctionCount = 138;
-+int Cairo_nativeFunctionCallCount[138];
- char * Cairo_nativeFunctionNames[] = {
- 	"cairo_1append_1path",
- 	"cairo_1arc",
-@@ -46,10 +46,16 @@
- 	"cairo_1fill_1preserve",
- 	"cairo_1font_1extents",
- 	"cairo_1font_1extents_1t_1sizeof",
-+	"cairo_1font_1options_1create",
-+	"cairo_1font_1options_1destroy",
-+	"cairo_1font_1options_1get_1antialias",
-+	"cairo_1font_1options_1set_1antialias",
-+	"cairo_1get_1antialias",
- 	"cairo_1get_1current_1point",
- 	"cairo_1get_1fill_1rule",
- 	"cairo_1get_1font_1face",
- 	"cairo_1get_1font_1matrix",
-+	"cairo_1get_1font_1options",
- 	"cairo_1get_1line_1cap",
- 	"cairo_1get_1line_1join",
- 	"cairo_1get_1line_1width",
-@@ -114,10 +120,12 @@
- 	"cairo_1save",
- 	"cairo_1scale",
- 	"cairo_1select_1font_1face",
-+	"cairo_1set_1antialias",
- 	"cairo_1set_1dash",
- 	"cairo_1set_1fill_1rule",
- 	"cairo_1set_1font_1face",
- 	"cairo_1set_1font_1matrix",
-+	"cairo_1set_1font_1options",
- 	"cairo_1set_1font_1size",
- 	"cairo_1set_1line_1cap",
- 	"cairo_1set_1line_1join",
-
-===================================================================
-RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h	2005/07/11 21:28:17	1.6
-+++ org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h	2005/08/15 20:22:55	1.7
-@@ -50,10 +50,16 @@
- 	cairo_1fill_1preserve_FUNC,
- 	cairo_1font_1extents_FUNC,
- 	cairo_1font_1extents_1t_1sizeof_FUNC,
-+	cairo_1font_1options_1create_FUNC,
-+	cairo_1font_1options_1destroy_FUNC,
-+	cairo_1font_1options_1get_1antialias_FUNC,
-+	cairo_1font_1options_1set_1antialias_FUNC,
-+	cairo_1get_1antialias_FUNC,
- 	cairo_1get_1current_1point_FUNC,
- 	cairo_1get_1fill_1rule_FUNC,
- 	cairo_1get_1font_1face_FUNC,
- 	cairo_1get_1font_1matrix_FUNC,
-+	cairo_1get_1font_1options_FUNC,
- 	cairo_1get_1line_1cap_FUNC,
- 	cairo_1get_1line_1join_FUNC,
- 	cairo_1get_1line_1width_FUNC,
-@@ -118,10 +124,12 @@
- 	cairo_1save_FUNC,
- 	cairo_1scale_FUNC,
- 	cairo_1select_1font_1face_FUNC,
-+	cairo_1set_1antialias_FUNC,
- 	cairo_1set_1dash_FUNC,
- 	cairo_1set_1fill_1rule_FUNC,
- 	cairo_1set_1font_1face_FUNC,
- 	cairo_1set_1font_1matrix_FUNC,
-+	cairo_1set_1font_1options_FUNC,
- 	cairo_1set_1font_1size_FUNC,
- 	cairo_1set_1line_1cap_FUNC,
- 	cairo_1set_1line_1join_FUNC,
diff --git a/dev-java/swt/swt-3.2_pre1.ebuild b/dev-java/swt/swt-3.2_pre1.ebuild
deleted file mode 100644
index b2ed151cf9a0..000000000000
--- a/dev-java/swt/swt-3.2_pre1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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_pre1.ebuild,v 1.8 2006/02/04 06:06:05 compnerd Exp $
-
-inherit eutils java-pkg
-
-MY_DMF="S-3.2M1-200508111530"
-MY_VERSION="3.2M1"
-
-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="accessibility cairo firefox gnome mozilla"
-RDEPEND=">=virtual/jre-1.4
-		 >=x11-libs/gtk+-2.6.8
-		 mozilla? (
-		 			 firefox?	(
-					 				>=www-client/mozilla-firefox-1.0.6
-									!>=www-client/mozilla-firefox-1.5
-								)
-					!firefox? ( >=www-client/mozilla-1.4 )
-				  )
-		 gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
-		 cairo? ( >=x11-libs/cairo-1.0.2 )"
-DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}
-		  dev-util/pkgconfig
-		  dev-java/ant-core
-		  app-arch/unzip"
-
-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
-	unpack ${A} || die "Unable to unpack sources"
-
-	# Clean up the directory structure
-	for f in $(ls); do
-		if [[ "${f}" != "src.zip" ]] ; then
-			rm -rf ${f}
-		fi
-	done
-
-	# Unpack the sources
-	echo "Unpacking src.zip to ${S}"
-	unzip src.zip &> /dev/null || die "Unable to extract sources"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/
-	rm -f .classpath .project
-
-	# CARIO 0.9.2 API Patch
-	if [[ ${ARCH} == 'amd64' ]] ; then
-		epatch ${FILESDIR}/swt-cairo-0.9.2-amd64.patch
-	else
-		epatch ${FILESDIR}/swt-cairo-0.9.2.patch
-	fi
-
-	# 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"
-}
-
-src_compile() {
-	JAVA_HOME=$(java-config -O)
-
-	# Identify the AWT path
-	if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then
-		export AWT_LIB_PATH=$JAVA_HOME/jre/bin
-	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
-
-	# Identity the XTEST library location
-	export XTEST_LIB_PATH=/usr/$(get_libdir)/X11
-
-	# 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"
-
-	if use accessibility ; then
-		einfo "Building JAVA-AT-SPI bridge"
-		emake -f make_linux.mak make_atk || die "Failed to build ATK support"
-	fi
-
-	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 mozilla ; then
-		if use firefox ; then
-			GECKO_SDK="$(pkg-config firefox-xpcom --variable=libdir)"
-		else
-			GECKO_SDK="$(pkg-config mozilla-xpcom --variable=libdir)"
-		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 -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
-
-	einfo "Building JNI libraries"
-	ant compile || die "Failed to compile JNI interfaces"
-
-	einfo "Creating missing files"
-	cp ${FILESDIR}/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
-
-	einfo "Packing JNI libraries"
-	ant 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_rc2.ebuild b/dev-java/swt/swt-3.2_rc2.ebuild
deleted file mode 100644
index af86f512c802..000000000000
--- a/dev-java/swt/swt-3.2_rc2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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_rc2.ebuild,v 1.1 2006/05/07 07:07:09 compnerd Exp $
-
-inherit eutils java-pkg
-
-MY_DMF="S-3.2RC2-200604281315"
-MY_VERSION="3.2RC2"
-
-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="accessibility cairo gnome mozilla opengl"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8
-		accessibility? ( >=dev-libs/atk-1.10.2 )
-		||	(
-				(
-					x11-libs/libX11
-					x11-libs/libXtst
-				)
-				virtual/x11
-			)
-		cairo? ( >=x11-libs/cairo-1.0.2 )
-		gnome?	(
-					=gnome-base/libgnome-2*
-					=gnome-base/gnome-vfs-2*
-					=gnome-base/libgnomeui-2*
-				)
-		mozilla? ( >=net-libs/gecko-sdk-1.7 )
-		opengl?	(
-					virtual/opengl
-					virtual/glu
-				)"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON}
-		>=dev-util/pkgconfig-0.9
-		  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"
-}
-
-src_compile() {
-	JAVA_HOME=$(java-config -O)
-
-	# 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"
-
-	if use accessibility ; then
-		einfo "Building JAVA-AT-SPI bridge"
-		emake -f make_linux.mak make_atk || die "Failed to build ATK support"
-	fi
-
-	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 mozilla ; then
-		export GECKO_INCLUDES="$(gecko-sdk-config --cflags)"
-
-		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"
-	ant compile || die "Failed to compile JNI interfaces"
-
-	einfo "Creating missing files"
-	cp ${FILESDIR}/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
-	echo -n "version 3.231" >> ${S}/build/version.txt
-
-	einfo "Packing JNI libraries"
-	ant 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
-}