New eclipse

svn path=/trunk/overlay/; revision=132

6 files changed, 641 insertions, 1 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index fea6137..c57cc99 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,7 +1,9 @@
+AUX as-needed-and-flag-fixes-3.6.patch 7755 RMD160 6ba533af5e7692d632ab4b1430c38e083b6db33b SHA1 07319c70cb9c4944691717032494f6b777c6ad0c SHA256 4a33ab3b2f617d137977562b096c64a37600e48ceaee5e1f94f4c912efdcaaa3
 AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
 AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
 AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae
 AUX swt-3.4-manifest 753 RMD160 c56ff2fcaf42d35af618a60273c9f6580adc0d79 SHA1 052261ea0c4f6758959fcd4e2718feabbed4273e SHA256 6401f555a867cba47463a36d3c150f7cf5962ac85be53e14c43a88eadf74c94e
+AUX webkitbydefault.patch 888 RMD160 13aee6334fa1f8248ca53f8f05823386c8bc7ea6 SHA1 c771cfbb62c2aa64d73151af46417b55eed96ff6 SHA256 6137b374bf9f8d629aea94c2614a6529d05d8756ebcdf706062598ea18f52e1e
 DIST swt-3.4.1-gtk-linux-ppc.zip 4631702 RMD160 84d106fef906afbe537919f5d965eed309c5f960 SHA1 f3308bfb5dee4d4029e7c4eac4dcade568388b14 SHA256 97f2ee7873986d9e92d1f21bf02010023b562cb6f4d963fffa5bd7f0800dd84d
 DIST swt-3.4.1-gtk-linux-x86.zip 4563980 RMD160 bba99111e10eb372a319aa91f99fe6cf4b0d6f23 SHA1 d1fd22dce69153d6a0a34ecebba41a24e8bffbaa SHA256 12cc6ce1a17de34fc97943dd43f5593a4b28e09f85b9405487099496347cdae3
 DIST swt-3.4.1-gtk-linux-x86_64.zip 4746984 RMD160 a21facd6d949305ceace634c8a7aa036fb9e8527 SHA1 31f50178920b803b6a21420608dba184af78d2e3 SHA256 99ab9da4df47e93d458c155ba81dba3d1912f6e0f18ec07bd9914c87179e8ca0
@@ -14,6 +16,6 @@ DIST swt-3.6.2-gtk-linux-x86.zip 5236728 RMD160 ee0d8a5ccfde54fa694cf507596679c5
 DIST swt-3.6.2-gtk-linux-x86_64.zip 5531856 RMD160 9f0babeed72d1994c1d5df5299b7632028c9f6af SHA1 dbeeb832192974f82c013d965628621b750f1d69 SHA256 9459fbee1cab66fae9dabe085d911b6bfee52e41e1a236ac65bf0491fdbdb205
 EBUILD swt-3.4.1.ebuild 5963 RMD160 60cf61a9e7996b0d4a8b2748118adb9b1fb756c2 SHA1 e727232311da81ba86b5a2ef9dda688f9f0ef04c SHA256 02656504f6472835f39de6d37b344234ae3225048519fdf9c3822aec41e9cdc4
 EBUILD swt-3.4.2.ebuild 5962 RMD160 485042f03d0ce87dc72f338a6f381f44624cf62a SHA1 7ac829930d47cd795210577b0a2fedd598579f87 SHA256 4721ecd9396d9a13c62ff64f01f17556c8028d9e18fded4ceb8531cae7eedb2b
-EBUILD swt-3.6.2.ebuild 6803 RMD160 2e16199c89d2f4e669f0ae18c9fec363d6382947 SHA1 e4b91bee8790041e13d304574466d72c99761e17 SHA256 9334e529996859714f1d893144f37b01c87fa0daade06b9096f4545f23b7afb5
+EBUILD swt-3.6.2.ebuild 6887 RMD160 6fdbe2be16164dddc85637850c13b854f430bfdc SHA1 ad65f5f85cd358d98af584b3d4c2b7a527c2147e SHA256 5da6753ca4d164a764a10655c0bcbeb6c15f946ddb90fadafa61c2ac93d02895
 MISC ChangeLog 16455 RMD160 209444c270dd9e4ab99ef7b9c056f1702fdb9cf2 SHA1 ec1447424442b16b52519dcd918879f7e7f60981 SHA256 3fa7133b6d56a104a93bfe65dd069163d9e67838d985a4ed4e41fd955ab950d3
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
new file mode 100644
index 0000000..16194fd
--- /dev/null
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -0,0 +1,243 @@
+--- make_linux.mak~	2010-06-08 17:30:58.000000000 +0000
++++ make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+@@ -66,7 +66,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS = $(CXXFLAGS) \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -107,7 +107,7 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -131,13 +131,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -156,7 +156,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -172,7 +172,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -180,7 +180,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -188,7 +188,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -205,7 +205,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -222,7 +222,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -242,7 +242,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -262,7 +262,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -279,7 +279,7 @@
+ make_webkit: $(WEBKIT_LIB)
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
+ 
+ webkit.o: webkitgtk.c 
+ 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
+@@ -296,7 +296,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
+--- make_freebsd.mak~	2010-06-08 17:30:58.000000000 +0000
++++ make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+@@ -64,7 +64,7 @@
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
+ 
+-MOZILLACFLAGS = -O \
++MOZILLACFLAGS += \
+ 	-DSWT_VERSION=$(SWT_VERSION) \
+ 	$(NATIVE_STATS) \
+ 	-DMOZILLA_STRICT_API=1 \
+@@ -91,7 +91,7 @@
+ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+ 
+-CFLAGS = -O -Wall \
++CFLAGS += \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DFREEBSD -DGTK \
+@@ -115,13 +115,13 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+ 
+ $(SWT_LIB): $(SWT_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+ 
+ callback.o: callback.c callback.h
+ 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
+ 
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+ 	$(CC) $(CFLAGS) -c swt.c
+@@ -140,7 +140,7 @@
+ make_cairo: $(CAIRO_LIB)
+ 
+ $(CAIRO_LIB): $(CAIRO_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
+ 
+ cairo.o: cairo.c cairo.h swt.h
+ 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
+@@ -156,7 +156,7 @@
+ make_cde: $(CDE_LIB)
+ 
+ $(CDE_LIB): $(CDE_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
+ 
+ #
+ # AWT lib
+@@ -164,7 +164,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -172,7 +172,7 @@
+ make_atk: $(ATK_LIB)
+ 
+ $(ATK_LIB): $(ATK_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
+ 
+ atk.o: atk.c atk.h
+ 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -189,7 +189,7 @@
+ make_gnome: $(GNOME_LIB)
+ 
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
+ 
+ gnome.o: gnome.c 
+ 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -206,7 +206,7 @@
+ make_mozilla:$(MOZILLA_LIB)
+ 
+ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
+-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
++	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
+ 
+ xpcom.o: xpcom.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+@@ -226,7 +226,7 @@
+ make_xulrunner:$(XULRUNNER_LIB)
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcomxul.o: xpcom.cpp
+ 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+@@ -252,7 +252,7 @@
+ make_xpcominit:$(XPCOMINIT_LIB)
+ 
+ $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
++	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
+ 
+ xpcominit.o: xpcominit.cpp
+ 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+@@ -269,7 +269,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+ 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/webkitbydefault.patch b/dev-java/swt/files/webkitbydefault.patch
new file mode 100644
index 0000000..8d7fe8c
--- /dev/null
+++ b/dev-java/swt/files/webkitbydefault.patch
@@ -0,0 +1,12 @@
+diff -ur work.orig/src/org/eclipse/swt/browser/Browser.java work/src/org/eclipse/swt/browser/Browser.java
+--- work.orig/src/org/eclipse/swt/browser/Browser.java	2011-02-10 17:29:10.000000000 +0000
++++ work/src/org/eclipse/swt/browser/Browser.java	2011-05-05 11:21:22.000000000 +0100
+@@ -95,7 +95,7 @@
+ 			classNames = new String[] {"org.eclipse.swt.browser.Mozilla"}; //$NON-NLS-1$
+ 		} else if ("gtk".equals (platform)) { //$NON-NLS-1$
+ 			String property = System.getProperty (PROPERTY_USEWEBKITGTK);
+-			if (property != null && property.equalsIgnoreCase ("true")) { //$NON-NLS-1$
++			if (property == null || property.equalsIgnoreCase ("true")) { //$NON-NLS-1$
+ 				classNames = new String[] {"org.eclipse.swt.browser.WebKit", "org.eclipse.swt.browser.Mozilla"}; //$NON-NLS-1$ //$NON-NLS-2$
+ 			} else {
+ 				classNames = new String[] {"org.eclipse.swt.browser.Mozilla"}; //$NON-NLS-1$
diff --git a/dev-java/swt/swt-3.6.2.ebuild b/dev-java/swt/swt-3.6.2.ebuild
index b8fb1dd..63116c7 100644
--- a/dev-java/swt/swt-3.6.2.ebuild
+++ b/dev-java/swt/swt-3.6.2.ebuild
@@ -89,6 +89,9 @@ java_prepare() {
 
 	# Fix Makefiles to respect flags and work with --as-needed
 	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+
+	use xulrunner || ( use webkit && \
+		epatch "${FILESDIR}"/webkitbydefault.patch )
 }
 
 src_compile() {
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 65ccdaa..e9dcb6a 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -4,7 +4,10 @@ AUX 3.6/gtk_makefile.patch 1541 RMD160 39738d224c8d6aa9683b6898c773cd0f72f9bd70
 AUX 3.6/hamcrest-junit-lib.patch 1123 RMD160 16a33e88295718a43931d54d1dd5f57ddfcfd4f7 SHA1 69697c2b3b430f47391896590f5ac10554b9190e SHA256 147c55f9cb222745f64d0711211f5f900352712c2df6e449c424fe5b7fba3fec
 AUX 3.6/iterators.patch 2058 RMD160 a91238c61510f16bc48bc9559e9c6e341def6dd0 SHA1 f0fcc75ec4827a1f2dbc65af65940beb7274864b SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b
 DIST eclipse-3.6.1-src.tar.bz2 62823517 RMD160 82d7d50d8f2be20116f55e6be086ae9dbac9bc0e SHA1 c95a21897da29b080e86b94c0298cc8b792af929 SHA256 6144cbcf3715a144d9be433c2a89f3f3bdce6ee3c33396e3e783d3b683cdc94f
+DIST eclipse-3.6.2-src.tar.bz2 62525869 RMD160 5c32204c99249db39a839c72753564fa63e3f3a0 SHA1 113b22702a26a88ff8736d6a232f6a41fe4eb00d SHA256 b72951cc75eba57c7d849210de38f69858ac4699eb3a69d4261a80d125f70d45
 DIST eclipse-build-0.6.0.tar.bz2 293428 RMD160 3ca7b8e8e4016cab251ef758ed533856aa31ced3 SHA1 2f0580bb2496bd299ad77ada48cb7d9e3ab5a4fd SHA256 a2dc16b9178d0416e01c52306c68b4a82c34a7cc163d86326dbcfbab16a68ef3
+DIST eclipse-build-0.6.1.tar.bz2 295425 RMD160 f0306941e0c2618dc3f0a0b2b5a2e30e935839bc SHA1 cc81b424934b4fff96d6cbc2967dd4bec4c30e86 SHA256 66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e
 EBUILD eclipse-sdk-3.6.1.ebuild 12488 RMD160 d2757dcdeee41fc84b47698be3368b2601feec8a SHA1 a30445590973ee8f6e05a419f9b5877c10a6d7e0 SHA256 b17bc05a2cd878bdb06becbe45313b50b12482e2e023dfd94396877967a3735b
+EBUILD eclipse-sdk-3.6.2.ebuild 12821 RMD160 0e63693d9d276a0a963d14bc6de2fa0ad099c51a SHA1 5f797a462331d6fe0ac5911d06508457081f4561 SHA256 3b55917d2e8370a78ac7fc3fd112e14de85ad8fd79a617872dc80696f9ba8260
 MISC NOTES 95 RMD160 8a25c8c280750c4369e7659cd990e70a55a8221e SHA1 19f635c381122e9f4ef91d3bff5654abc914eb7f SHA256 7a46f31a4ef7c84668092d04c333241ca6dc68c27113de95644fb3247c286e10
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.6.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.6.2.ebuild
new file mode 100644
index 0000000..da6527c
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.6.2.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+
+# eclipse-build is too complicated for automatic fixing
+# if there are any fixes we should create patches
+# and push them upstream
+JAVA_PKG_BSFIX="off"
+
+inherit java-pkg-2 java-ant-2 check-reqs
+
+BUILD_VER="3.6.2"
+BUILD_ID="I20110210-1200"
+ECLIPSE_BUILD_VER="0.6.1"
+S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse/"
+BASE_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/"
+SRC_URI="${BASE_URI}eclipse-${BUILD_VER}-src.tar.bz2 ${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
+
+LICENSE="EPL-1.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome source"
+
+CDEPEND=">=dev-java/swt-${PV%.0}:${SLOT}
+	>=dev-java/ant-1.7.1
+	>=dev-java/asm-3.2:3
+	>=dev-java/commons-codec-1.3
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/hamcrest-core-1.1
+	>=dev-java/icu4j-4.2.1:4.2
+	>=dev-java/jsch-0.1.41
+	>=dev-java/junit-3.8.2:0
+	>=dev-java/junit-4.8.1:4
+	>=dev-java/lucene-1.9.1:1.9
+	>=dev-java/lucene-analyzers-1.9.1:1.9
+	>=dev-java/sat4j-core-2.2.0:2
+	>=dev-java/sat4j-pseudo-2.2.0:2
+	dev-java/tomcat-servlet-api:2.5
+	>=www-servers/jetty-6.1.23:6
+	>=www-servers/tomcat-5.5.17:5.5
+	x86? ( gnome? ( gnome-base/gconf ) )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-antlr-1.7.1
+	>=dev-java/ant-apache-bcel-1.7.1
+	>=dev-java/ant-apache-bsf-1.7.1
+	>=dev-java/ant-apache-log4j-1.7.1
+	>=dev-java/ant-apache-oro-1.7.1
+	>=dev-java/ant-apache-regexp-1.7.1
+	>=dev-java/ant-apache-resolver-1.7.1
+	>=dev-java/ant-commons-logging-1.7.1
+	>=dev-java/ant-commons-net-1.7.1
+	>=dev-java/ant-core-1.7.1
+	>=dev-java/ant-javamail-1.7.1
+	>=dev-java/ant-jdepend-1.7.1
+	>=dev-java/ant-jsch-1.7.1
+	>=dev-java/ant-junit-1.7.1
+	>=dev-java/ant-nodeps-1.7.1
+	>=dev-java/ant-swing-1.7.1
+	>=dev-java/ant-trax-1.7.1
+	>=virtual/jdk-1.6"
+
+OSGI_DEPENDENCIES=(
+	'com.ibm.icu icu4j-4.2'
+	'com.jcraft.jsch jsch'
+	'javax.servlet tomcat-servlet-api-2.5 servlet-api'
+	'javax.servlet.jsp tomcat-servlet-api-2.5 jsp-api'
+	'org.apache.commons.codec commons-codec'
+	'org.apache.commons.el commons-el'
+	'org.apache.commons.httpclient commons-httpclient-3'
+	'org.apache.commons.logging commons-logging'
+	'org.apache.jasper tomcat-5.5 jasper-compiler jasper-runtime'
+	'org.apache.lucene lucene-1.9'
+	'org.apache.lucene.analysis lucene-analyzers-1.9'
+	'org.hamcrest.core hamcrest-core'
+	'org.mortbay.jetty.server jetty-6 jetty'
+	'org.mortbay.jetty.util jetty-6 jetty-util'
+	'org.objectweb.asm asm-3'
+	'org.sat4j.core sat4j-core-2'
+	'org.sat4j.pb sat4j-pseudo-2'
+)
+NONOSGI_DEPENDENCIES=(
+	'org.apache.ant ant-antlr'
+	'org.apache.ant ant-apache-bcel'
+	'org.apache.ant ant-apache-bsf'
+	'org.apache.ant ant-apache-log4j'
+	'org.apache.ant ant-apache-oro'
+	'org.apache.ant ant-apache-regexp'
+	'org.apache.ant ant-apache-resolver'
+	'org.apache.ant ant-commons-logging'
+	'org.apache.ant ant-commons-net'
+	'org.apache.ant ant-core ant ant-launcher'
+	'org.apache.ant ant-javamail'
+	'org.apache.ant ant-jdepend'
+	'org.apache.ant ant-jsch'
+	'org.apache.ant ant-junit'
+	'org.apache.ant ant-nodeps'
+	'org.apache.ant ant-swing'
+	'org.apache.ant ant-trax'
+	'org.junit_3.8.2.v3 junit'
+	'org.junit4 junit-4 junit'
+	'org.junit_4.8.1.v4 junit-4 junit'
+)
+
+ALL_OS='aix hpux linux macosx qnx solaris win32'
+ALL_WS='carbon cocoa gtk motif photon win32 wpf'
+ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
+
+buildDir="${S}/build/eclipse-${BUILD_VER}-src"
+
+pkg_setup() {
+	ws='gtk'
+	if use x86 ; then os='linux' ; arch='x86'
+	elif use amd64 ; then os='linux' ; arch='x86_64'
+	fi
+
+	java-pkg-2_pkg_setup
+
+	if use doc ; then
+		ewarn "Having the 'doc' USE flag enabled greatly increases the build time."
+		ewarn "You might want to disable it for ${PN} if you don't need it."
+	fi
+}
+
+src_unpack() {
+	CHECKREQS_MEMORY="1536"
+	if use doc ; then
+		CHECKREQS_DISK_BUILD="3072"
+	else
+		CHECKREQS_DISK_BUILD="1536"
+	fi
+	check_reqs
+
+	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
+	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}"/ || die
+
+	cd "${S}"
+	# building with ecj fails for some reason (polluted classpath probably)
+	java-pkg_force-compiler javac
+	sed -e 's/^\(label\|testsBuildLabel\)=.*$/\1='"${BUILD_VER}"'/' \
+			-e 's/^buildId=.*$/buildId='"${BUILD_ID}"'/' \
+			-i build.properties -i pdebuild.properties || die
+	eant unpack
+}
+
+src_prepare() {
+	# apply patches before we start cleaning junk out
+	eant applyPatches
+
+	# fix up hardcoded runtime class paths
+	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
+			-i {,pde}build.properties || die
+
+	# we'll handle our own dependency symlinking, so disable eclipse-build helper
+	sed -e 's/,symlinkDeps,/,/' -i build.xml || die
+	sed_xml_element 'target' -e '/name="provision.sdk"/ s|<symlinkInstalled.*\(<echo \)|\1|' \
+			-i build.xml || die
+
+	# disable building of libgnomeproxy on x86 if USE=-gnome
+	if ! use gnome ; then
+		sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die
+	fi
+
+	# skip compilation of SWT native libraries (we use the system-installed copies)
+	sed_xml_element 'ant' -e '/swt/d' -i build.xml || die
+
+	ebegin 'Removing plugins of irrelevant platforms'
+	local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / }
+	remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'}
+	local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / }
+	remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'}
+	local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / }
+	remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'}
+	sed_xml_element 'includes\|plugin' \
+			-e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \
+			-e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'remove irrelevant platforms failed'
+	eend
+
+	if ! use doc ; then
+		ebegin 'Removing documentation plugins'
+		rm -rf "${buildDir}"/plugins/*.doc{,.*}
+		eclipse_delete-plugins '.*\.doc\(\..*\|\)'
+		eend
+	fi
+
+	if ! use source ; then
+		ebegin 'Removing source plugins'
+		rm -rf "${buildDir}"/plugins/*.source{,_*}
+		eclipse_delete-plugins '.*\.source'
+		eend
+	fi
+
+	ebegin 'Linking dependencies'
+	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
+		eclipse_create-osgi-dep ${dep}
+	done
+	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
+		eclipse_create-nonosgi-dep ${dep}
+	done
+	eend
+
+	cd "${buildDir}" || die
+	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
+	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
+	epatch "${FILESDIR}/${SLOT}/iterators.patch"
+}
+
+src_compile() {
+	ANT_OPTS='-Xmx512M' eant -DbuildArch="${arch}"
+
+	# remove stray symlink
+	rm "${buildDir}"/installation/plugins/junit4.jar
+}
+
+src_install() {
+	local destDir="/usr/$(get_libdir)/eclipse-${SLOT}"
+
+	insinto "${destDir}"
+	shopt -s dotglob
+	doins -r "${buildDir}"/installation/* || die
+	shopt -u dotglob
+	chmod +x "${D}${destDir}"/eclipse
+	rm -f "${D}${destDir}"/libcairo-swt.so  # use the system-installed SWT libraries
+
+	# redo symlinks
+	ebegin 'Relinking dependencies'
+	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
+		eclipse_relink-osgi-dep ${dep}
+	done
+	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
+		eclipse_relink-nonosgi-dep ${dep}
+	done
+	eend
+
+	# Install Gentoo wrapper and config
+	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die
+	insinto /etc
+	doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die
+
+	# Create desktop entry
+	make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die
+}
+
+eclipse_create-osgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	bundle=$(basename "${S}/dependencyManifests/${bundle}"_*.jar .jar) || die
+	einfo "  ${bundle} => ${package}" "${@}"
+	mkdir -p "${buildDir}/plugins/${bundle}" || die
+	pushd "${buildDir}/plugins/${bundle}" > /dev/null || die
+	if (( ${#} )) ; then
+		local jar ; for jar in "${@}" ; do
+			java-pkg_jar-from "${package}" "${jar}.jar"
+		done
+	else
+		java-pkg_jar-from "${package}"
+	fi
+	mkdir META-INF || die
+	cp "${S}/dependencyManifests/${bundle}.jar/META-INF/MANIFEST.MF" META-INF/ || die
+	manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "$(echo *.jar | tr ' ' ',')"
+	manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+	# replace classpath refs to this bundle with refs to system-installed jars
+	sed_xml_element 'pathelement' -e '/path="\([^"]\+\/\)\?'"${bundle//./\.}"'\.jar"/c '"$(
+			for jar in *.jar ; do
+				echo -n '<pathelement path="'"$(readlink "${jar}")"'"/>'
+			done)" -i "${buildDir}"/plugins/*/build.xml || die
+	popd > /dev/null || die
+	# include unpacked bundle in copy to bootstrap plugins dir
+	sed_xml_element 'fileset' -e '/id="orbitDeps"/ s|</fileset>|<include name="'"${bundle}/"'"/>\0|' \
+			-i "${S}/pdebuild.xml" || die
+}
+
+eclipse_create-nonosgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	local pdir=${buildDir}/plugins
+	local jar ; for jar in "${@:-${package}}" ; do
+		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
+				"${S}"/{,jdt}nonosgidependencies.properties)") || die
+		einfo "  ${dir}/${jar}.jar => ${package}"
+		mkdir -p "${pdir}/${dir}" || die
+		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
+		dir=${dir%%/*}
+		manifest_delete "${pdir}/${dir}/META-INF/MANIFEST.MF" 'Name\|SHA1-Digest'
+		rm -f "${pdir}/${dir}"/META-INF/ECLIPSEF.{RSA,SF}
+	done
+}
+
+eclipse_relink-osgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	einfo "  ${bundle} => ${package}" "${@}"
+	pushd "${D}${destDir}/plugins/${bundle}"_* > /dev/null || die
+	if (( ${#} )) ; then
+		local jar ; for jar in "${@}" ; do
+			java-pkg_jar-from --build-only "${package}" "${jar}.jar"
+		done
+	else
+		java-pkg_jar-from --build-only "${package}"
+	fi
+	popd > /dev/null || die
+}
+
+eclipse_relink-nonosgi-dep() {
+	local bundle=${1} package=${2} ; shift 2
+	local pdir=${D}${destDir}/plugins
+	local jar ; for jar in "${@:-${package}}" ; do
+		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
+				"${S}"/{,jdt}nonosgidependencies.properties)") || die
+		einfo "  ${dir}/${jar}.jar => ${package}"
+		mkdir -p "${pdir}/${dir}" || die
+		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
+	done
+}
+
+# Removes feature.xml references to plugins matching ${1}.
+eclipse_delete-plugins() {
+	sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'eclipse_delete-plugins failed'
+}
+
+# Prints the first value from manifest file ${1} whose key matches regex ${2},
+# unfolding as necessary.
+manifest_get() {
+	sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \
+		|| die 'manifest_get failed'
+}
+
+# Deletes values from manifest file ${1} whose keys match regex ${2}, taking
+# into account folding.
+manifest_delete() {
+	sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \
+		|| die 'manifest_delete failed'
+}
+
+# Replaces the value for key ${2} in the first section of manifest file ${1}
+# with ${3}, or adds the key-value pair to that section if the key was absent.
+manifest_replace() {
+	LC_ALL='C' awk -v key="${2}" -v val="${3}" '
+function fold(s,  o, l, r) {
+	o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1)
+	while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 }
+	return r substr(s, o)
+}
+BEGIN { FS = ": " }
+f { print ; next }
+i { if ($0 !~ "^ ") { f = 1 ; print } ; next }
+$1 == key { print fold(key FS val) ; i = 1 ; next }
+/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next }
+{ print }
+END { if (!f) { print fold(key FS val) } }
+' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed'
+}
+
+# Executes sed over each XML element with a name matching ${1}, rather than
+# over each line. The entire element (and its children) may be removed with the
+# 'd' command, or they may be edited using all the usual sed foo. Basically,
+# the script argument will be executed only for elements matching ${1}, and the
+# sed pattern space will consist of the entire element, including any nested
+# elements. Note that this is not perfect and requires no more than one XML
+# element per line to be reliable.
+sed_xml_element() {
+	local elem=${1} ; shift
+	sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \
+			-e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}"
+}