Version bump. Thanks to Carlos Silva <r3pek@r3pek.org> for the ebuild. #424455

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

5 files changed, 459 insertions, 2 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index e3ebf25d9224..b4e1a024fe94 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.143 2012/06/01 06:45:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.144 2012/07/09 18:33:43 sera Exp $
+
+*swt-4.2 (09 Jul 2012)
+
+  09 Jul 2012; Ralph Sennhauser <sera@gentoo.org> +swt-4.2.ebuild,
+  +files/swt-4.2-as-needed-and-flag-fixes.patch, +files/swt-4.2-manifest:
+  Version bump. Thanks to Carlos Silva <r3pek@r3pek.org> for the ebuild.
+  #424455
 
   01 Jun 2012; Jeff Horelick <jdhore@gentoo.org> swt-3.7.2.ebuild:
   marked x86 per bug 418043
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 9ab5516c996d..4843455e3db3 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX as-needed-and-flag-fixes-3.6.patch 7755 SHA256 4a33ab3b2f617d137977562b096c64a37600e48ceaee5e1f94f4c912efdcaaa3 SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083 WHIRLPOOL 05cc1a58c1647dba3f3b6985ffd503f8b2af74fd6e07d6ee76afcb7d16b8279dcd9a89097c4c70f1f1569065a62ca1255c551b371c74d0f095f60eac98cf8a7c
 AUX as-needed-and-flag-fixes.patch 7229 SHA256 016a810cc9649235fcab73467a056240b712d5557663b7756d4de64c939256ee SHA512 1c4d217965bd8ee9a293095dcf8abca399277a103e523610340a6f3cc25291cc53c2e89b9fed396298e5f9e7b78221df5c4bc881d65713058f029810799f8010 WHIRLPOOL c2abc3a0dfb593f8f3ab2d2f2427cc6c817367ec0c73108dff238e1110bde39c6d98b5e0adeede7d89c9296f227970db17e23893318b60f2becfb352837a69ef
 AUX build.xml 458 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525 WHIRLPOOL e70d35ed0834e72c83818e346e4c40af55059de096fb6ef4c4f4927f13886e88925b9caa538306aa1ec9ece966f28782282139a60f2dbefc4aec53a0401db9a9
@@ -8,6 +11,8 @@ AUX swt-3.4-xulrunner-1.9.1.patch 12209 SHA256 08e4ed334b37347ad9ea267264b46fb67
 AUX swt-3.5-manifest 752 SHA256 8ad9d69aa58e533cc03b9ccf3d8e0356505c357aaeb14968bf146f94d8b79be9 SHA512 7021ce5766ff50b999ad3474de00a2f19490e5eaef1f811b95d3cf01a43467de3e8e4913b668d019d59513ca54a159b50fd0bda427c4efcb3fddc522fa2925a6 WHIRLPOOL 09ba77a4ef824120624b9d6122a9eb6a39004e643b7e95f5a7f0f3e934a985f1cef86c838f5663ae4f3149f1953ceee0231e0d86ae7c3b9ab47a62ddee9a16ec
 AUX swt-3.6-manifest 752 SHA256 f5a8e3db5c47d3b82541a73b5b0f172342efc5754adcc00b9b62a5abe4b30096 SHA512 6b9fb3e2dc5d3da9f7988e46409a9086108dc8cf5facfe5ff09791ff8782a6babbb6a517f8282671d0800f207f7aef518dc480ca8d56740fade218851d2822fb WHIRLPOOL 72224faab73cda56beb9feb93140537868b25298b0903fcbcacbac3460eb7c955414504f7eb669f9b0a27ca1cbf3f2b76c9c6ab90ce3840b582e575220421be0
 AUX swt-3.7-manifest 750 SHA256 4c911bfa6f4def901570ca715da547c1d13766915f3244e5d6282bee8be6564f SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f WHIRLPOOL b84f61067d00c864f1029718b560a33fd04d76e6cae8f5aa5e5aa0da31af752494277d759d909dc4a78f5412e963c21c95125ae01ac405fd72c7a8223032f558
+AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 SHA256 3aed5349c3c0cf1a2e63fdd4b40d053804ecbba7a5b798de73be36f64b42fb65 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1 WHIRLPOOL e9f21b6745422aa1ac74f25530f4ae829165b77c1843319a21aed59e8a7da27fdf803eaaad4acc49e5373ff7f2e7209f35bbe8cdc4ffe0e62ff576f03eb912c2
+AUX swt-4.2-manifest 739 SHA256 3c67656a0798cd6f464ce6db022fab04fa23ff3b07e7079d8c3364d950f8acc4 SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1 WHIRLPOOL 31f9e54ceb9640c0e3d1ac0c67bd290295a424997d8633be5d172b0467e9aac4b0b94420862864e29531ae3ef67610007729fba1b944bf22551cd8450d4326ff
 DIST swt-3.4-gtk-linux-ppc.zip 4616331 SHA256 227d3bdceba48cd245269cf689731dc3072898c34ed874501532c06ad3c5e9e8 SHA512 3d456cb0f7b0374382b1dba16a963d8a1f39f483ef385d35c26f15255b9fba2e45d50de644f68561be880c0983fe464e6877a5761555081b5e14125724aeb4b0 WHIRLPOOL 2c3785ec75d16f337159691fdd9d9b745eed9d24cee5e8deedcd9b0c1c9d192f4c148b856493c4fe41795036ef011d0dd2a6fb8cf7586c6ed127dfbb88ee9bcf
 DIST swt-3.4-gtk-linux-x86.zip 4548421 SHA256 c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4 SHA512 237cd5a5059da63348f68568f059503e8dafc77197d74270839f3cfc723de51308a9ae3133eac1028db86be173e68ab2b48347f1847e60fd9ee437fd1079179f WHIRLPOOL 96b84c48eddc8d6b85010ebafaae3571bd5f2da4cd7ba32c0a0b49bb232263bae381b6828eb4fa82a42f80a8a534433066bf7301721a3b0975758f72195622b4
 DIST swt-3.4-gtk-linux-x86_64.zip 4730884 SHA256 67013b409f21bcad6ba07c36977d526dd0642184d1068158da9cb9d23b95e34d SHA512 e5449ef57223653f486dbd6e0bbeec2ab86d3a39f87eef499eb1b439dfafee1afdfaf27dbc2225d73e9b42993efacec307e3e733a49a2cb87c98aa98b9d8678b WHIRLPOOL 0e3ac10e96a93a3e7b2c63b7639955b5975bb0c1189689501350b688b376d7aa7ebe4bb2031859202f0ff6309b96f273ac73974a4111405eeed9bae804640910
@@ -23,10 +28,25 @@ DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 WHIRLPOOL 44b3b19b425132a615026209d1b557ab099dec441a8c2fb7aadfd90d19cd56228385e8e4f0ce09d66ebdcb9870cc5a932c1e6c6b4e3c507ca5b687b3ec6e18f4
 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183 SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 WHIRLPOOL ff47a49df58f711c9ea9dcbc08ae6e5e78fcf11e9419a97a28a660af10172ba5b8eeff4e181794816c1b6aca9a6b3ea52b4f2cc855c0e399265a761c96b87296
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443 SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 WHIRLPOOL 2698abf1f6f50d6712d37e7b10ee6b0442f1db43b0d78814c3ee04a3922816c9f62247c55610f539c11dfd10c4f4fcf1ab2986eec81d2555144730c95ee381dd
+DIST swt-4.2-gtk-linux-ppc64.zip 5935799 SHA256 b853c9601ae0808634722976392319405bee53e6bc30864d0bfbf0507159d1db SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d WHIRLPOOL 8fe20ed46de94bb554205929fd142a2ac21aca543289a48cd6417f60f8a4d2d55062b7ebbda7f6712aabc6c7de8998c75c48eeffe73139c756e44e71c2ef84be
+DIST swt-4.2-gtk-linux-x86.zip 5561088 SHA256 e0e2977837c905b61219eb94544d89757ac3d01a88c3a81abff6d7446d48d9ac SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133 WHIRLPOOL ad4fd1113f6e4b2605433ac7a53aa416c29824164b97b2b3a3ceb61e6bc812108c38841b75c5ec6f9a093ed2b8a7c58bf883d701403e8399a18ccb2a8c214165
+DIST swt-4.2-gtk-linux-x86_64.zip 5867140 SHA256 f549bb8309e1523dd4d3867aaf6f0582cdbe5a504ae8aba52900fe6fdb63f336 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50 WHIRLPOOL 5f60bfe556d6551fdabe4184dfc5a4a9df250b10010d59200902017a9f9cbed379a557e5179232d05a8542d531542c3eb6d0afc57c752717dca7a9d7f4177e62
 EBUILD swt-3.4-r4.ebuild 5067 SHA256 0c9a46de38fc77c2dd14c5ef86a993a33342e2f31e57c15c17809e51339ca0eb SHA512 ced01aa0886104209e71213bfbe6379011d93ea6daebd826f92b9b5c9f23a824cab705aa6bdcc7443d357af46b6817c6338494c53834894da8d81a2375b5c5c8 WHIRLPOOL 1ac0a6af04807b60ce0491cc8512398e71dccf63e1bf270ad316707d65233750921ec31e9aa2e823898f10df3c8ab6c33fe854941da6c6c9ff254bbcf0677242
 EBUILD swt-3.5.2.ebuild 4766 SHA256 f9b0cabc4f2cd251e83d3ee092cf55e6fe4efa251b10d4809f43ed94e293aa9c SHA512 d64148196c59f811791851924ecd1d576ebf3faf589af7a57a77ee2973d5cbe9b75bb40fbd08855e93b51676de223c2215782e02403756044bced85984a08d9d WHIRLPOOL c8a232d15a2246f20d74209ec4a4bb748ad9746ef32830367e48c1cff088993cd46e34f778b49bd3b45ff1fcd10dc7a359f2e5485b94c9b07026986085d42910
 EBUILD swt-3.6.1.ebuild 4774 SHA256 2fa22bec72c95340565d8ae982a28ab646acf7d512ac42f724b2b034409808af SHA512 2f2a9433ee392a367324be0c56900fe89f3723e0095477fefb0e5a67fa806deeaafea72b1d7cfc9c850332ee5a7874d540d5b55b0556e3864d12729f201872d2 WHIRLPOOL ecb6e924a581d0652eac5d4dbee1ccebfa762182782d744d2f394782e46932704724cf27c7b67e0ff2c0057d353ebb3d139ee8393bf75c356a1a0fd37ee15aa5
 EBUILD swt-3.7.1.ebuild 4782 SHA256 f31f5bf1b5648d2d9b84961bc8dc9c7344f31b1a4f9526c8d60848641ac5881e SHA512 4f4224d34b3d4e1f64c4bae3c10b5721e4bee7b9c4f7ed7d5d117d1aa872b22fa833447b08ee321d80aafc35b54c310e362c63604d760a76a55133f943a07812 WHIRLPOOL c30705aa922aed6e12b9c57ee70902ceb89b5b3e2127730eea0ffd2b84743fec49000b482117c06b969c6452d81570611ca0a0d1dedd18b223ce3fe067c7f226
 EBUILD swt-3.7.2.ebuild 4780 SHA256 8116026fb485ab02e4b389507bc47b42288657c96fff3b70dac3126a3409b77c SHA512 62ccbd7e73e5b5e6de22381de73f02f1b43641423f1d5b8738031cba97b159c438d6c22744c117b707dc6e1f78cd03a881e6f693ac12a2e89ce68406dc2e8f4a WHIRLPOOL d87b37a92db73240703191d204db6f75118d5a69c8b044ae3b91df38d49b7a803f3bb2dc5ef81cef021a3580982c1860dc00cdb5204b94a0f240b61f989f3a12
-MISC ChangeLog 24381 SHA256 730244d8f17093d93c4365ad03c91224b6631f53f7a0fb7b362fb7347c9ce4fc SHA512 9180139bc300874738ae504903fbb47be0a7c5d54368e7c6d93ba23b5d2ade3230ff5a7316efa1d9bae7fb6fbe2f946131b62b01459b498865eb001c8fd703fc WHIRLPOOL 1b6ad7c8fff48676459448aabcd00d28907d5cd0d505696a3ec45971b5caa26d665b7b25291643095b533dc4d74cf2400ab444f57eaef931db042767c245d42f
+EBUILD swt-4.2.ebuild 4710 SHA256 6885c522f436c3a9a305c4bb19fda4bc5ffc10a248b670f7ff7a9d1acdcdac38 SHA512 6a60a8216de7d3106abeb3e673b9bc458ec6d39e6ae57a46870e326d2000984dd2f059e112b499a252baefe3dc71711a0e3e2121e3a707003a6c5202081e1d34 WHIRLPOOL d5afcaebc5b297fc7c0dfd4c3c7d35e6d1842e870758907ff5be295aa5c8c8d8f9acf8fbadedbc9a592857131b801277c7e79ec3f3fc4e9487e145a7ee237687
+MISC ChangeLog 24628 SHA256 0029c181f133bf687a98194763668424846ba8a03d9665bd64c55b615f8b15f7 SHA512 749f6eef3151d6fbd3018a4d775a9b109724a99013da6d40a670ecdcd8bb2dba162aab09f342d5fe65a1b2d3a70b9479f2b2c6e1220b51d152c9f5ee9e0beee3 WHIRLPOOL 4c18d346162fbf7b6e67ab5ece62ea670d0e369bc7f0c79bf2ea1e954d834dbbfe8eb01bbaa16f904fccc7cab7c83e4dbf6c5f0c491e6baa779ba8012543bf73
 MISC metadata.xml 578 SHA256 1e4845acfd81dc03aba0b504ac5c3307bf8d8a3bf666ece773fc483e458eaea0 SHA512 2b9ed1965582b5cd8371b473a296d620005273c82b393f5f32c3c45ce65926330bb75e4a312256c21bdb3f69a9c2a4b99f18e9396a349ba17ba94ebe647e5b8a WHIRLPOOL a32177b01a02581a0b4762e31cdf8029a88fc7e57ec9809c9a8156326a843e604a861e8f5f7bb44d8adc9e1c0c09eebb58d8d6ffd613ae531f99d6f1113cf044
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP+yQZAAoJEIUJ+svaV163bP8H/0rkCV/rx2/+aP1JNCKc41NA
+fBWxwA/JTEu9qRcbXgTq1P+/QyJ5x5CizcDh4cr3ymYDF6l4Om55HdM2tqc4y+5B
+Ux8GVEjE5PvByU41qCbsVTRRgm7uq3nH8/i3NP2wPY5yF3JYTw/+E+QoXTVarvkN
+Fr/TwYkF+GLC9CahySZON1BTkn1SoX5Gp6jMcrvR8RueEoM0Jk++ZwrQcoY1Dwy5
+OTq5gZsJkFe9xu92HX8bm9kFP7M/ZTzyXok+A0KGRBVMa+fBwjFBg8CpJomkZ7A4
+q4OT1dr1uKKrvojcpyNT3th69OIvLcOgmtrdltsZ5EPbrzjDHLN/GCcOWvNtle8=
+=s56h
+-----END PGP SIGNATURE-----
diff --git a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
new file mode 100644
index 000000000000..98773c155697
--- /dev/null
+++ b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
@@ -0,0 +1,243 @@
+--- make_linux.mak-	2012-07-02 00:49:48.729100052 +0000
++++ make_linux.mak	2012-07-02 00:53:16.753499389 +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 \
+@@ -106,7 +106,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 \
+@@ -130,13 +130,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
+@@ -155,7 +155,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
+@@ -171,7 +171,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
+@@ -179,7 +179,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
+@@ -187,7 +187,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
+@@ -204,7 +204,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
+@@ -221,7 +221,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 @@
+ 
+ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ 	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
+-	$(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)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
+ 
+ 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-	2012-07-02 00:53:28.553351871 +0000
++++ make_freebsd.mak	2012-07-02 00:55:37.369741444 +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/swt-4.2-manifest b/dev-java/swt/files/swt-4.2-manifest
new file mode 100644
index 000000000000..36736a0db72d
--- /dev/null
+++ b/dev-java/swt/files/swt-4.2-manifest
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version=4.2.0
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 4.2
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
diff --git a/dev-java/swt/swt-4.2.ebuild b/dev-java/swt/swt-4.2.ebuild
new file mode 100644
index 000000000000..ce21c2ef2f80
--- /dev/null
+++ b/dev-java/swt/swt-4.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-4.2.ebuild,v 1.1 2012/07/09 18:33:43 sera Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cairo gnome opengl webkit"
+
+COMMON_DEP="
+	>=dev-libs/atk-1.10.2
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( >=x11-libs/cairo-1.4.14 )
+	gnome?	(
+		=gnome-base/gnome-vfs-2*
+		=gnome-base/libgnome-2*
+		=gnome-base/libgnomeui-2*
+	)
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	app-arch/unzip
+	virtual/pkgconfig
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/libXtst-1.1.0
+	x11-proto/inputproto"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+	local DISTFILE=${A}
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+	unpack "./src.zip"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/ || die
+}
+
+java_prepare() {
+	# 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"
+
+	# Fix Makefiles to respect flags and work with --as-needed
+	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'x86' ]] ; then
+		AWT_ARCH="i386"
+	elif [[ $(tc-arch) == 'ppc' ]] ; then
+		AWT_ARCH="ppc"
+	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+		AWT_ARCH="ppc64"
+	else
+		AWT_ARCH="amd64"
+	fi
+	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	else
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local platform="linux"
+
+	use elibc_FreeBSD && platform="freebsd"
+
+	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		${make} make_gnome
+	fi
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building the WebKitGTK+ component"
+
+		${make} make_webkit
+	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/" || die
+
+	einfo "Packing JNI libraries"
+	eant jar
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+	use x86-fbsd && swtArch=x86
+
+	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	dohtml about.html || die
+}