gentoo resync : 25.01.2018

6 files changed, 198 insertions, 294 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 6679b6866e39..33ba73ced9b7 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,7 +1,5 @@
 AUX as-needed-and-flag-fixes-3.6.patch 7755 BLAKE2B 8e15b6cba2fa403b63647eab5e9b1ffc293d6db67cac2c2ecdc437cbe540433ef4077a333e9290a36c9615204a8361864b322442be9030e66d4d8bfa1569a8ed SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083
-AUX as-needed-and-flag-fixes.patch 7229 BLAKE2B b1789b5eb28f1c05f640d6584b0aaa650d5513d8c316bd44ac54b7a04551199968f7347e479c5b98787769fea53c3d0879f22f656d3ad2f21ba70871d54700d3 SHA512 1c4d217965bd8ee9a293095dcf8abca399277a103e523610340a6f3cc25291cc53c2e89b9fed396298e5f9e7b78221df5c4bc881d65713058f029810799f8010
 AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
-AUX swt-3.5-manifest 752 BLAKE2B 6b6ce37d88343836605b7835770354f45ef2f38b42f2ef7a7f187467f9792ae7e61ceb28de002362695c41fd7fe765d9f15ad62e684411d05b1388f4a213d501 SHA512 7021ce5766ff50b999ad3474de00a2f19490e5eaef1f811b95d3cf01a43467de3e8e4913b668d019d59513ca54a159b50fd0bda427c4efcb3fddc522fa2925a6
 AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
 AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
 AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30330339da12ffac079eaf616cf1f2e9a3a8e984789d38c43019ade81d9a5a444b0a763df3026732dbc515a3a6b329efb5 SHA512 4954c7464bb2ab7b9c23fd771d3dd49dd826d4a919d3ee85914ca8360708f26d396aaaa6564cc826fcff6ea892d916097e118c4ed0a1ed60cb8217e5c3ebf94d
@@ -11,9 +9,6 @@ AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e8
 AUX swt-3.8.2-libwebkit-compat.patch 1104 BLAKE2B 4184e262dd2b21e6170b399222833e4a88299fa910f36aebd072ec1ee701fd3f23b8743cbcb263632c52983d0d5753fbd479129bee0d03b5923c979746a23852 SHA512 f063be5652b44b776f774a8e3d7f31be3018858322cbbe8b7c2e47a18bc705c4ff751ed239699c2014a5f51785a723a2d8f4fdc9804f4fe1961c861cecbe4117
 AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 BLAKE2B 96edb84193506ed8c4c293970def5c1c38fb0cd66561030e1e07f214a70f84c657260e1adbdf41f2eb404d4069794cca9b5422dea344ceaf028fbc75cf9aaa26 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1
 AUX swt-4.2-manifest 739 BLAKE2B 031d2e59e4b20c8aacdb4c5b03ff3bdfd14f9373386766993efeb833995d4858b09ac157bdc847820271bd0a354f5c0280aa0746eb0038413782c5cf59f7ba4c SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1
-DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 BLAKE2B b3ad008d8645de9a85c05801696bb65c32676e1482d873a5e6ba58a9915328526440960daa9f146fdc646aaa1d4ded8c72fefd9bebc1b2a1acaf05018e3b524d SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae
-DIST swt-3.5.2-gtk-linux-x86.zip 4881316 BLAKE2B fc6be0e041a4fb3decb602d1a0dbde0bd7f22c12a3fb869b364de663c3a870351a794ece2f2a2a73ffdee6ccac71390d70700ff609c1cf86320f9a14bdc70002 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82
-DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 BLAKE2B 410cc189b5625061e89a4550b2d0904bd3bbe68d2f0f71ed38cac146d2aa5dff99838173e0fe4499be9f9847c8c43b282df00f907ce54a84b0ea5c9880ef70c9 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
@@ -23,8 +18,9 @@ DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f6
 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.5.2.ebuild 4602 BLAKE2B 86045a4b24369f463dba178254a120f106a2d97b9bb64529f71858d0b0b62b3abed35529e2ae67194deb2ca7d0729217d287184e9340f54d482cf255b2f314f4 SHA512 cdff54906b1a7cfb98ca02cde97354cbaee4b34fe76724a9d9ee7720b6565e1dc1ba930ae060eed631f9db5891f20a96da567d1324436c381b3daecc7d80ddce
 EBUILD swt-3.7.2-r1.ebuild 4764 BLAKE2B bf0060e3d5029c81635a5c570b46ae6d781f8074f686242d3d7661eb6e520011749d7ec0ed3e1d8445422c279b222e6dbbc61bee1a916e5320f1e3da76eaf13f SHA512 2c11e4795f4aecd246e1128c81169fe6b3eb8283632fd4a371b7ee71a716da0469a86c8b5be9bd35ffd87eecfe87acaba95464d0ed31f2c79085a7c5562b2880
+EBUILD swt-3.7.2-r2.ebuild 4607 BLAKE2B a6801ff0d23257f51bf41c78412d27dbf2a8cbf450919b5b04a4a23efb8662ed87a7cdf4a82f0eb4680438e0da7ab52cff99f1956c35799a3e44b6931dc0e968 SHA512 b1df60b8cba4e09338d06f1a8aa809495a58f1a16878b522dfdaa381abd7f69a3c66dc97fe46bc6285cf2ad6741850a7b3e769eff6cd159f637eb7d805325121
 EBUILD swt-3.8.2-r1.ebuild 4645 BLAKE2B 4c699914d33580c55c5a512d098dc168766d7c64311274175c143e9253fad39cd67dddac324c857160411697a8ec236511354797dcd149756c2bb8b339448595 SHA512 b94a9b93af8431689e30d2e85388692a96e94b6dd624c9f2b5cf273e2edb5d24fc3994c625b098e7b1ce2be56d04a4c413b0cc374706d784daedf8d9ad76f062
-EBUILD swt-4.2-r2.ebuild 4839 BLAKE2B 26917b0d2e2fb40fef492154632c7e6b09801dd59afa6446910b223deb9aa9a15c61f1d20841a33ff6fa01e56e009fe0e39494e0002720f9decbb0f90ccb0f9a SHA512 0cc9aee2f5182070e882a150dabef7e0119519348d18e786ec259c1c211d9f5a3fce05dce5f8e73e2ddca7d6889514dc28366b18f536e7fdc189bad6c1d7855f
+EBUILD swt-3.8.2-r2.ebuild 4438 BLAKE2B 59f9d1843bd0679e7c9192eb5fd569e3fa9c86de0d735d9a54e824c52477e9df9438ec6e5d9c66ecc6a87dd12afe761271659a396642a67fab706d23a58ac676 SHA512 b8315c756dbeb3b47ba2c12b1d0e5f2588952fce9f422ef18315380ea8dc260b3841bac4e1493641b16c247bbf074d7f78d8b60fde3a8d3962c064354a1f42ec
+EBUILD swt-4.2-r3.ebuild 4683 BLAKE2B e2b9275589302ad282abbdf275441e9c53386e8e4d20c48e88010cf545e5e053045a29c508b46277401cf33a49a674e811c4447f268d1876c1a3276755b8c95d SHA512 8eefff1037692f3bed036627346ea91db6ab61c68c91be6f7a517774c2983024a0b7994bea1e4c359a9a082d813a2c9f692b4d63f7b1d9ae99b0ab13b94e7a13
 MISC metadata.xml 656 BLAKE2B a557635b1a3a5aeb1aaf70122648ad6deaad3cbb80533fd452b3f87e6cef39bacd48b4b2ebb012d661d2e1d1520ef024648feff9becf6440b71333d87173ae49 SHA512 1aa0b6b24df23fa95730ab3167ed5ad264305ee0dd73296c3816de3be9fdc965b70d84c930c21ec2baf8b4535a4fcafcd554b242dab2bf6b7fdaf75ecb3c1615
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes.patch b/dev-java/swt/files/as-needed-and-flag-fixes.patch
deleted file mode 100644
index 4cacaf61d671..000000000000
--- a/dev-java/swt/files/as-needed-and-flag-fixes.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- make_linux.mak	2009-05-24 18:38:39.000000000 +0300
-+++ make_linux.mak.fixed	2009-05-24 19:38:51.000000000 +0300
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -92,15 +92,14 @@
- 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 \
--		-DSWT_VERSION=$(SWT_VERSION) \
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
- 		-I$(JAVA_HOME)/include \
- 		-I$(JAVA_HOME)/include/linux \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
--LIBS = -shared -fPIC
-+LIBS = -shared -fPIC $(LDFLAGS)
- 
- ifndef NO_STRIP
- 	AWT_LIBS := $(AWT_LIBS) -s
-@@ -122,7 +121,7 @@
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
-+	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -141,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
-+	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -157,7 +156,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
-+	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -165,7 +164,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
-+	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -173,7 +172,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
-+	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -190,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
-+	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -207,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -227,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -247,7 +246,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -264,7 +263,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
-+	$(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak	2009-05-24 20:09:55.000000000 +0300
-+++ make_freebsd.mak.fixed	2009-05-24 20:15:03.000000000 +0300
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -91,15 +91,14 @@
- 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 \
--		-DSWT_VERSION=$(SWT_VERSION) \
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DFREEBSD -DGTK \
- 		-I$(JAVA_HOME)/include \
- 		-I$(JAVA_HOME)/include/freebsd \
- 		-fPIC \
- 		${SWT_PTR_CFLAGS}
--LIBS = -shared -fPIC
-+LIBS = -shared -fPIC $(LDFLAGS)
- 
- ifndef NO_STRIP
- 	AWT_LIBS := $(AWT_LIBS) -s
-@@ -121,7 +120,7 @@
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
-+	$(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +139,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS)
-+	$(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +155,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS)
-+	$(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -164,7 +163,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
-+	$(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -172,7 +171,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
-+	$(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +188,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
-+	$(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +205,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +225,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +251,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +268,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS)
-+	$(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-3.5-manifest b/dev-java/swt/files/swt-3.5-manifest
deleted file mode 100644
index 70be33fb8ef8..000000000000
--- a/dev-java/swt/files/swt-3.5-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.5
-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.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
-
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
index 8f9fb56f021b..63f3c11299f2 100644
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=4
 
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
 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-ppc.zip )
-	ppc64? ( ${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 )"
 
-SLOT="3.5"
+SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 KEYWORDS="amd64 ppc64 x86"
 
@@ -38,17 +38,12 @@ COMMON=">=dev-libs/glib-2.6
 		)
 		x11-libs/libXtst"
 
-# Use a blocker to avoid file collisions when upgrading to the slotted version
-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT
-# so this is the only way to prevent collisions
-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244
-
 DEPEND=">=virtual/jdk-1.4
 		app-arch/unzip
 		x11-libs/libX11
 		x11-libs/libXrender
 		x11-libs/libXt
-		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+		>=x11-libs/libXtst-1.1.0
 		x11-proto/inputproto
 		virtual/pkgconfig
 		${COMMON}"
@@ -76,7 +71,12 @@ java_prepare() {
 	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}"/as-needed-and-flag-fixes.patch
+	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+
+	case ${ARCH} in
+		ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+		*)       epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+	esac
 }
 
 src_compile() {
@@ -115,27 +115,27 @@ src_compile() {
 	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
-	${make} make_awt || die "Failed to build AWT support"
+	${make} make_awt
 
 	einfo "Building SWT library"
-	${make} make_swt || die "Failed to build SWT support"
+	${make} make_swt
 
 	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk || die "Failed to build ATK support"
+	${make} make_atk
 
 	if use gnome ; then
 		einfo "Building GNOME VFS support"
-		${make} make_gnome || die "Failed to build GNOME VFS support"
+		${make} make_gnome
 	fi
 
 	if use cairo ; then
 		einfo "Building CAIRO support"
-		${make} make_cairo || die "Unable to build CAIRO support"
+		${make} make_cairo
 	fi
 
 	if use opengl ; then
 		einfo "Building OpenGL component"
-		${make} make_glx || die "Unable to build OpenGL component"
+		${make} make_glx
 	fi
 
 	einfo "Building JNI libraries"
@@ -144,7 +144,7 @@ src_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/"
+		"${S}/build/org/eclipse/swt/internal/" || die
 
 	einfo "Packing JNI libraries"
 	eant jar
@@ -155,7 +155,11 @@ src_install() {
 	use amd64 && swtArch=x86_64
 	use x86-fbsd && swtArch=x86
 
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-3.5-manifest" > "MANIFEST_TMP.MF"
+	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"
+	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)
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild
new file mode 100644
index 000000000000..72289d111711
--- /dev/null
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+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 )"
+
+SLOT="3.8"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 ppc64 x86"
+
+IUSE="cairo gnome opengl"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8:2
+		>=dev-libs/atk-1.10.2
+		cairo? ( >=x11-libs/cairo-1.4.14 )
+		gnome?	(
+				gnome-base/gnome-vfs:2
+				gnome-base/libgnome
+				gnome-base/libgnomeui
+				)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)
+		x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		>=x11-libs/libXtst-1.1.0
+		x11-proto/inputproto
+		virtual/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+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 -p "${S}/src"
+	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
+	epatch "${FILESDIR}"/${P}-gthread.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
+
+	einfo "Building JNI libraries"
+	eant compile
+
+	einfo "Copying missing files"
+	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
+	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"
+	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
+}
diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r3.ebuild
index 10d4a3a0aa38..40625a0c8c8b 100644
--- a/dev-java/swt/swt-4.2-r2.ebuild
+++ b/dev-java/swt/swt-4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SRC_URI="
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.2"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl webkit"
+IUSE="cairo gnome opengl"
 
 COMMON_DEP="
 	>=dev-libs/atk-1.10.2
@@ -37,8 +37,7 @@ COMMON_DEP="
 	opengl?	(
 		virtual/glu
 		virtual/opengl
-	)
-	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
+	)"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.4
 	app-arch/unzip
@@ -139,12 +138,6 @@ src_compile() {
 		${make} make_glx
 	fi
 
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
 	einfo "Building JNI libraries"
 	eant compile
 
@@ -166,7 +159,7 @@ src_install() {
 	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"
+	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)