commit:     122241651e6870263a7533f3fd1a4b9bbfdd6d34
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 22:11:03 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 22:11:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12224165

dev-java/swt: Drop ye olde 3.5.2

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-java/swt/Manifest                             |   3 -
 dev-java/swt/files/as-needed-and-flag-fixes.patch | 238 ----------------------
 dev-java/swt/files/swt-3.5-manifest               |  17 --
 dev-java/swt/swt-3.5.2.ebuild                     | 165 ---------------
 4 files changed, 423 deletions(-)

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index fc87bffcbf4..a4c8e92cbd1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
-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

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 4cacaf61d67..00000000000
--- 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 70be33fb8ef..00000000000
--- 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.5.2.ebuild
deleted file mode 100644
index 8f9fb56f021..00000000000
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-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_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 )
-       x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-       x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-SLOT="3.5"
-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/libgnome-2*
-                               =gnome-base/gnome-vfs-2*
-                               =gnome-base/libgnomeui-2*
-                               )
-               opengl? (
-                       virtual/opengl
-                       virtual/glu
-               )
-               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-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 "${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
-}
-
-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 || die "Failed to build AWT support"
-
-       einfo "Building SWT library"
-       ${make} make_swt || die "Failed to build SWT support"
-
-       einfo "Building JAVA-AT-SPI bridge"
-       ${make} make_atk || die "Failed to build ATK support"
-
-       if use gnome ; then
-               einfo "Building GNOME VFS support"
-               ${make} make_gnome || die "Failed to build GNOME VFS support"
-       fi
-
-       if use cairo ; then
-               einfo "Building CAIRO support"
-               ${make} make_cairo || die "Unable to build CAIRO support"
-       fi
-
-       if use opengl ; then
-               einfo "Building OpenGL component"
-               ${make} make_glx || die "Unable to build OpenGL component"
-       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/"
-
-       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}-3.5-manifest" > 
"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
-}

Reply via email to