| 1 |
commit: 122241651e6870263a7533f3fd1a4b9bbfdd6d34 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 24 22:11:03 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 24 22:11:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12224165 |
| 7 |
|
| 8 |
dev-java/swt: Drop ye olde 3.5.2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-java/swt/Manifest | 3 - |
| 13 |
dev-java/swt/files/as-needed-and-flag-fixes.patch | 238 ---------------------- |
| 14 |
dev-java/swt/files/swt-3.5-manifest | 17 -- |
| 15 |
dev-java/swt/swt-3.5.2.ebuild | 165 --------------- |
| 16 |
4 files changed, 423 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest |
| 19 |
index fc87bffcbf4..a4c8e92cbd1 100644 |
| 20 |
--- a/dev-java/swt/Manifest |
| 21 |
+++ b/dev-java/swt/Manifest |
| 22 |
@@ -1,6 +1,3 @@ |
| 23 |
-DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 BLAKE2B b3ad008d8645de9a85c05801696bb65c32676e1482d873a5e6ba58a9915328526440960daa9f146fdc646aaa1d4ded8c72fefd9bebc1b2a1acaf05018e3b524d SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae |
| 24 |
-DIST swt-3.5.2-gtk-linux-x86.zip 4881316 BLAKE2B fc6be0e041a4fb3decb602d1a0dbde0bd7f22c12a3fb869b364de663c3a870351a794ece2f2a2a73ffdee6ccac71390d70700ff609c1cf86320f9a14bdc70002 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 |
| 25 |
-DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 BLAKE2B 410cc189b5625061e89a4550b2d0904bd3bbe68d2f0f71ed38cac146d2aa5dff99838173e0fe4499be9f9847c8c43b282df00f907ce54a84b0ea5c9880ef70c9 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 |
| 26 |
DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 |
| 27 |
DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 |
| 28 |
DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 |
| 29 |
|
| 30 |
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes.patch b/dev-java/swt/files/as-needed-and-flag-fixes.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index 4cacaf61d67..00000000000 |
| 33 |
--- a/dev-java/swt/files/as-needed-and-flag-fixes.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,238 +0,0 @@ |
| 36 |
---- make_linux.mak 2009-05-24 18:38:39.000000000 +0300 |
| 37 |
-+++ make_linux.mak.fixed 2009-05-24 19:38:51.000000000 +0300 |
| 38 |
-@@ -64,7 +64,7 @@ |
| 39 |
- # Uncomment for Native Stats tool |
| 40 |
- #NATIVE_STATS = -DNATIVE_STATS |
| 41 |
- |
| 42 |
--MOZILLACFLAGS = -O \ |
| 43 |
-+MOZILLACFLAGS = $(CXXFLAGS) \ |
| 44 |
- -DSWT_VERSION=$(SWT_VERSION) \ |
| 45 |
- $(NATIVE_STATS) \ |
| 46 |
- -DMOZILLA_STRICT_API=1 \ |
| 47 |
-@@ -92,15 +92,14 @@ |
| 48 |
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o |
| 49 |
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
| 50 |
- |
| 51 |
--CFLAGS = -O -Wall \ |
| 52 |
-- -DSWT_VERSION=$(SWT_VERSION) \ |
| 53 |
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \ |
| 54 |
- $(NATIVE_STATS) \ |
| 55 |
- -DLINUX -DGTK \ |
| 56 |
- -I$(JAVA_HOME)/include \ |
| 57 |
- -I$(JAVA_HOME)/include/linux \ |
| 58 |
- -fPIC \ |
| 59 |
- ${SWT_PTR_CFLAGS} |
| 60 |
--LIBS = -shared -fPIC |
| 61 |
-+LIBS = -shared -fPIC $(LDFLAGS) |
| 62 |
- |
| 63 |
- ifndef NO_STRIP |
| 64 |
- AWT_LIBS := $(AWT_LIBS) -s |
| 65 |
-@@ -122,7 +121,7 @@ |
| 66 |
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
| 67 |
- |
| 68 |
- $(SWTPI_LIB): $(SWTPI_OBJECTS) |
| 69 |
-- $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) |
| 70 |
-+ $(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| 71 |
- |
| 72 |
- swt.o: swt.c swt.h |
| 73 |
- $(CC) $(CFLAGS) -c swt.c |
| 74 |
-@@ -141,7 +140,7 @@ |
| 75 |
- make_cairo: $(CAIRO_LIB) |
| 76 |
- |
| 77 |
- $(CAIRO_LIB): $(CAIRO_OBJECTS) |
| 78 |
-- $(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) |
| 79 |
-+ $(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| 80 |
- |
| 81 |
- cairo.o: cairo.c cairo.h swt.h |
| 82 |
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
| 83 |
-@@ -157,7 +156,7 @@ |
| 84 |
- make_cde: $(CDE_LIB) |
| 85 |
- |
| 86 |
- $(CDE_LIB): $(CDE_OBJECTS) |
| 87 |
-- $(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) |
| 88 |
-+ $(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
| 89 |
- |
| 90 |
- # |
| 91 |
- # AWT lib |
| 92 |
-@@ -165,7 +164,7 @@ |
| 93 |
- make_awt:$(AWT_LIB) |
| 94 |
- |
| 95 |
- $(AWT_LIB): $(AWT_OBJECTS) |
| 96 |
-- $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) |
| 97 |
-+ $(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| 98 |
- |
| 99 |
- # |
| 100 |
- # Atk lib |
| 101 |
-@@ -173,7 +172,7 @@ |
| 102 |
- make_atk: $(ATK_LIB) |
| 103 |
- |
| 104 |
- $(ATK_LIB): $(ATK_OBJECTS) |
| 105 |
-- $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) |
| 106 |
-+ $(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| 107 |
- |
| 108 |
- atk.o: atk.c atk.h |
| 109 |
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
| 110 |
-@@ -190,7 +189,7 @@ |
| 111 |
- make_gnome: $(GNOME_LIB) |
| 112 |
- |
| 113 |
- $(GNOME_LIB): $(GNOME_OBJECTS) |
| 114 |
-- $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) |
| 115 |
-+ $(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
| 116 |
- |
| 117 |
- gnome.o: gnome.c |
| 118 |
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
| 119 |
-@@ -207,7 +206,7 @@ |
| 120 |
- make_mozilla:$(MOZILLA_LIB) |
| 121 |
- |
| 122 |
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
| 123 |
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| 124 |
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| 125 |
- |
| 126 |
- xpcom.o: xpcom.cpp |
| 127 |
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp |
| 128 |
-@@ -227,7 +226,7 @@ |
| 129 |
- make_xulrunner:$(XULRUNNER_LIB) |
| 130 |
- |
| 131 |
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
| 132 |
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 133 |
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 134 |
- |
| 135 |
- xpcomxul.o: xpcom.cpp |
| 136 |
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
| 137 |
-@@ -247,7 +246,7 @@ |
| 138 |
- make_xpcominit:$(XPCOMINIT_LIB) |
| 139 |
- |
| 140 |
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
| 141 |
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 142 |
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 143 |
- |
| 144 |
- xpcominit.o: xpcominit.cpp |
| 145 |
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
| 146 |
-@@ -264,7 +263,7 @@ |
| 147 |
- make_glx: $(GLX_LIB) |
| 148 |
- |
| 149 |
- $(GLX_LIB): $(GLX_OBJECTS) |
| 150 |
-- $(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS) |
| 151 |
-+ $(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| 152 |
- |
| 153 |
- glx.o: glx.c |
| 154 |
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |
| 155 |
---- make_freebsd.mak 2009-05-24 20:09:55.000000000 +0300 |
| 156 |
-+++ make_freebsd.mak.fixed 2009-05-24 20:15:03.000000000 +0300 |
| 157 |
-@@ -64,7 +64,7 @@ |
| 158 |
- # Uncomment for Native Stats tool |
| 159 |
- #NATIVE_STATS = -DNATIVE_STATS |
| 160 |
- |
| 161 |
--MOZILLACFLAGS = -O \ |
| 162 |
-+MOZILLACFLAGS = $(CXXFLAGS) \ |
| 163 |
- -DSWT_VERSION=$(SWT_VERSION) \ |
| 164 |
- $(NATIVE_STATS) \ |
| 165 |
- -DMOZILLA_STRICT_API=1 \ |
| 166 |
-@@ -91,15 +91,14 @@ |
| 167 |
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o |
| 168 |
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
| 169 |
- |
| 170 |
--CFLAGS = -O -Wall \ |
| 171 |
-- -DSWT_VERSION=$(SWT_VERSION) \ |
| 172 |
-+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \ |
| 173 |
- $(NATIVE_STATS) \ |
| 174 |
- -DFREEBSD -DGTK \ |
| 175 |
- -I$(JAVA_HOME)/include \ |
| 176 |
- -I$(JAVA_HOME)/include/freebsd \ |
| 177 |
- -fPIC \ |
| 178 |
- ${SWT_PTR_CFLAGS} |
| 179 |
--LIBS = -shared -fPIC |
| 180 |
-+LIBS = -shared -fPIC $(LDFLAGS) |
| 181 |
- |
| 182 |
- ifndef NO_STRIP |
| 183 |
- AWT_LIBS := $(AWT_LIBS) -s |
| 184 |
-@@ -121,7 +120,7 @@ |
| 185 |
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
| 186 |
- |
| 187 |
- $(SWTPI_LIB): $(SWTPI_OBJECTS) |
| 188 |
-- $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) |
| 189 |
-+ $(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| 190 |
- |
| 191 |
- swt.o: swt.c swt.h |
| 192 |
- $(CC) $(CFLAGS) -c swt.c |
| 193 |
-@@ -140,7 +139,7 @@ |
| 194 |
- make_cairo: $(CAIRO_LIB) |
| 195 |
- |
| 196 |
- $(CAIRO_LIB): $(CAIRO_OBJECTS) |
| 197 |
-- $(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) |
| 198 |
-+ $(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| 199 |
- |
| 200 |
- cairo.o: cairo.c cairo.h swt.h |
| 201 |
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
| 202 |
-@@ -156,7 +155,7 @@ |
| 203 |
- make_cde: $(CDE_LIB) |
| 204 |
- |
| 205 |
- $(CDE_LIB): $(CDE_OBJECTS) |
| 206 |
-- $(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) |
| 207 |
-+ $(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
| 208 |
- |
| 209 |
- # |
| 210 |
- # AWT lib |
| 211 |
-@@ -164,7 +163,7 @@ |
| 212 |
- make_awt:$(AWT_LIB) |
| 213 |
- |
| 214 |
- $(AWT_LIB): $(AWT_OBJECTS) |
| 215 |
-- $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) |
| 216 |
-+ $(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| 217 |
- |
| 218 |
- # |
| 219 |
- # Atk lib |
| 220 |
-@@ -172,7 +171,7 @@ |
| 221 |
- make_atk: $(ATK_LIB) |
| 222 |
- |
| 223 |
- $(ATK_LIB): $(ATK_OBJECTS) |
| 224 |
-- $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) |
| 225 |
-+ $(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| 226 |
- |
| 227 |
- atk.o: atk.c atk.h |
| 228 |
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
| 229 |
-@@ -189,7 +188,7 @@ |
| 230 |
- make_gnome: $(GNOME_LIB) |
| 231 |
- |
| 232 |
- $(GNOME_LIB): $(GNOME_OBJECTS) |
| 233 |
-- $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) |
| 234 |
-+ $(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
| 235 |
- |
| 236 |
- gnome.o: gnome.c |
| 237 |
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
| 238 |
-@@ -206,7 +205,7 @@ |
| 239 |
- make_mozilla:$(MOZILLA_LIB) |
| 240 |
- |
| 241 |
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
| 242 |
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| 243 |
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| 244 |
- |
| 245 |
- xpcom.o: xpcom.cpp |
| 246 |
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp |
| 247 |
-@@ -226,7 +225,7 @@ |
| 248 |
- make_xulrunner:$(XULRUNNER_LIB) |
| 249 |
- |
| 250 |
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
| 251 |
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 252 |
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 253 |
- |
| 254 |
- xpcomxul.o: xpcom.cpp |
| 255 |
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
| 256 |
-@@ -252,7 +251,7 @@ |
| 257 |
- make_xpcominit:$(XPCOMINIT_LIB) |
| 258 |
- |
| 259 |
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
| 260 |
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 261 |
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| 262 |
- |
| 263 |
- xpcominit.o: xpcominit.cpp |
| 264 |
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
| 265 |
-@@ -269,7 +268,7 @@ |
| 266 |
- make_glx: $(GLX_LIB) |
| 267 |
- |
| 268 |
- $(GLX_LIB): $(GLX_OBJECTS) |
| 269 |
-- $(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS) |
| 270 |
-+ $(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| 271 |
- |
| 272 |
- glx.o: glx.c |
| 273 |
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |
| 274 |
|
| 275 |
diff --git a/dev-java/swt/files/swt-3.5-manifest b/dev-java/swt/files/swt-3.5-manifest |
| 276 |
deleted file mode 100644 |
| 277 |
index 70be33fb8ef..00000000000 |
| 278 |
--- a/dev-java/swt/files/swt-3.5-manifest |
| 279 |
+++ /dev/null |
| 280 |
@@ -1,17 +0,0 @@ |
| 281 |
-Manifest-Version: 1.0 |
| 282 |
-Bundle-ManifestVersion: 2 |
| 283 |
-Bundle-Name: %pluginName |
| 284 |
-Bundle-Vendor: %providerName |
| 285 |
-Bundle-Localization: plugin |
| 286 |
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" |
| 287 |
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true |
| 288 |
-Bundle-Version: 3.5 |
| 289 |
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH)) |
| 290 |
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true, |
| 291 |
- org.eclipse.swt.internal.cairo; x-internal:=true, |
| 292 |
- org.eclipse.swt.internal.cde; x-internal:=true, |
| 293 |
- org.eclipse.swt.internal.gnome; x-internal:=true, |
| 294 |
- org.eclipse.swt.internal.gtk; x-internal:=true, |
| 295 |
- org.eclipse.swt.internal.mozilla; x-internal:=true, |
| 296 |
- org.eclipse.swt.internal.opengl.glx; x-internal:=true |
| 297 |
- |
| 298 |
|
| 299 |
diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild |
| 300 |
deleted file mode 100644 |
| 301 |
index 8f9fb56f021..00000000000 |
| 302 |
--- a/dev-java/swt/swt-3.5.2.ebuild |
| 303 |
+++ /dev/null |
| 304 |
@@ -1,165 +0,0 @@ |
| 305 |
-# Copyright 1999-2016 Gentoo Foundation |
| 306 |
-# Distributed under the terms of the GNU General Public License v2 |
| 307 |
- |
| 308 |
-EAPI=2 |
| 309 |
- |
| 310 |
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi |
| 311 |
- |
| 312 |
-MY_PV="${PV/_rc/RC}" |
| 313 |
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343" |
| 314 |
-MY_P="${PN}-${MY_PV}" |
| 315 |
- |
| 316 |
-DESCRIPTION="GTK based SWT Library" |
| 317 |
-HOMEPAGE="http://www.eclipse.org/" |
| 318 |
-SRC_URI=" |
| 319 |
- amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) |
| 320 |
- ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc.zip ) |
| 321 |
- ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) |
| 322 |
- x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) |
| 323 |
- x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" |
| 324 |
- |
| 325 |
-SLOT="3.5" |
| 326 |
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" |
| 327 |
-KEYWORDS="amd64 ppc64 x86" |
| 328 |
- |
| 329 |
-IUSE="cairo gnome opengl" |
| 330 |
-COMMON=">=dev-libs/glib-2.6 |
| 331 |
- >=x11-libs/gtk+-2.6.8:2 |
| 332 |
- >=dev-libs/atk-1.10.2 |
| 333 |
- cairo? ( >=x11-libs/cairo-1.4.14 ) |
| 334 |
- gnome? ( |
| 335 |
- =gnome-base/libgnome-2* |
| 336 |
- =gnome-base/gnome-vfs-2* |
| 337 |
- =gnome-base/libgnomeui-2* |
| 338 |
- ) |
| 339 |
- opengl? ( |
| 340 |
- virtual/opengl |
| 341 |
- virtual/glu |
| 342 |
- ) |
| 343 |
- x11-libs/libXtst" |
| 344 |
- |
| 345 |
-# Use a blocker to avoid file collisions when upgrading to the slotted version |
| 346 |
-# We cannot use slotmove, java packages are expected to be in /usr/share/PN-SLOT |
| 347 |
-# so this is the only way to prevent collisions |
| 348 |
-# libXtst/xextproto is done like this due to the XTest.h move - bug #292244 |
| 349 |
- |
| 350 |
-DEPEND=">=virtual/jdk-1.4 |
| 351 |
- app-arch/unzip |
| 352 |
- x11-libs/libX11 |
| 353 |
- x11-libs/libXrender |
| 354 |
- x11-libs/libXt |
| 355 |
- || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 ) |
| 356 |
- x11-proto/inputproto |
| 357 |
- virtual/pkgconfig |
| 358 |
- ${COMMON}" |
| 359 |
- |
| 360 |
-RDEPEND=">=virtual/jre-1.4 |
| 361 |
- ${COMMON}" |
| 362 |
- |
| 363 |
-S="${WORKDIR}" |
| 364 |
- |
| 365 |
-# JNI libraries don't need SONAME, bug #253756 |
| 366 |
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so" |
| 367 |
- |
| 368 |
-src_unpack() { |
| 369 |
- local DISTFILE=${A} |
| 370 |
- unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" |
| 371 |
- unpack "./src.zip" |
| 372 |
- |
| 373 |
- # Cleanup the redirtied directory structure |
| 374 |
- rm -rf about_files/ || die |
| 375 |
-} |
| 376 |
- |
| 377 |
-java_prepare() { |
| 378 |
- # Replace the build.xml to allow compilation without Eclipse tasks |
| 379 |
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" |
| 380 |
- mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" |
| 381 |
- |
| 382 |
- # Fix Makefiles to respect flags and work with --as-needed |
| 383 |
- epatch "${FILESDIR}"/as-needed-and-flag-fixes.patch |
| 384 |
-} |
| 385 |
- |
| 386 |
-src_compile() { |
| 387 |
- # Drop jikes support as it seems to be unfriendly with SWT |
| 388 |
- java-pkg_filter-compiler jikes |
| 389 |
- |
| 390 |
- local AWT_ARCH |
| 391 |
- local JAWTSO="libjawt.so" |
| 392 |
- if [[ $(tc-arch) == 'x86' ]] ; then |
| 393 |
- AWT_ARCH="i386" |
| 394 |
- elif [[ $(tc-arch) == 'ppc' ]] ; then |
| 395 |
- AWT_ARCH="ppc" |
| 396 |
- elif [[ $(tc-arch) == 'ppc64' ]] ; then |
| 397 |
- AWT_ARCH="ppc64" |
| 398 |
- else |
| 399 |
- AWT_ARCH="amd64" |
| 400 |
- fi |
| 401 |
- if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then |
| 402 |
- export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}" |
| 403 |
- elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then |
| 404 |
- export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" |
| 405 |
- elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then |
| 406 |
- export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" |
| 407 |
- else |
| 408 |
- eerror "${JAWTSO} not found in the JDK being used for compilation!" |
| 409 |
- die "cannot build AWT library" |
| 410 |
- fi |
| 411 |
- |
| 412 |
- # Fix the pointer size for AMD64 |
| 413 |
- [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64 |
| 414 |
- |
| 415 |
- local platform="linux" |
| 416 |
- |
| 417 |
- use elibc_FreeBSD && platform="freebsd" |
| 418 |
- |
| 419 |
- local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" |
| 420 |
- |
| 421 |
- einfo "Building AWT library" |
| 422 |
- ${make} make_awt || die "Failed to build AWT support" |
| 423 |
- |
| 424 |
- einfo "Building SWT library" |
| 425 |
- ${make} make_swt || die "Failed to build SWT support" |
| 426 |
- |
| 427 |
- einfo "Building JAVA-AT-SPI bridge" |
| 428 |
- ${make} make_atk || die "Failed to build ATK support" |
| 429 |
- |
| 430 |
- if use gnome ; then |
| 431 |
- einfo "Building GNOME VFS support" |
| 432 |
- ${make} make_gnome || die "Failed to build GNOME VFS support" |
| 433 |
- fi |
| 434 |
- |
| 435 |
- if use cairo ; then |
| 436 |
- einfo "Building CAIRO support" |
| 437 |
- ${make} make_cairo || die "Unable to build CAIRO support" |
| 438 |
- fi |
| 439 |
- |
| 440 |
- if use opengl ; then |
| 441 |
- einfo "Building OpenGL component" |
| 442 |
- ${make} make_glx || die "Unable to build OpenGL component" |
| 443 |
- fi |
| 444 |
- |
| 445 |
- einfo "Building JNI libraries" |
| 446 |
- eant compile |
| 447 |
- |
| 448 |
- einfo "Copying missing files" |
| 449 |
- cp -i "${S}/version.txt" "${S}/build/version.txt" |
| 450 |
- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \ |
| 451 |
- "${S}/build/org/eclipse/swt/internal/" |
| 452 |
- |
| 453 |
- einfo "Packing JNI libraries" |
| 454 |
- eant jar |
| 455 |
-} |
| 456 |
- |
| 457 |
-src_install() { |
| 458 |
- swtArch=${ARCH} |
| 459 |
- use amd64 && swtArch=x86_64 |
| 460 |
- use x86-fbsd && swtArch=x86 |
| 461 |
- |
| 462 |
- sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-3.5-manifest" > "MANIFEST_TMP.MF" |
| 463 |
- java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" |
| 464 |
- |
| 465 |
- java-pkg_sointo /usr/$(get_libdir) |
| 466 |
- java-pkg_doso *.so |
| 467 |
- |
| 468 |
- dohtml about.html || die |
| 469 |
-} |
Archives