gentoo resync : 31.01.2018

5 files changed, 1 insertions, 380 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 33ba73ced9b7..5a7f0d770189 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -6,7 +6,6 @@ AUX swt-3.7.2-gio_launch-URI.patch 4287 BLAKE2B 45c2655ca657b968b1fa6dc74fee4e30
 AUX swt-3.8-as-needed-and-flag-fixes.patch 8852 BLAKE2B 963f9cccc06c41b6bbd88d5430d66b500094c19708bb903cae7b125342556eb42d193c91fb6c3ca94c589a75060e3a16c3f8cec2ccd02c3f5a4176d5ec2c6a91 SHA512 523dfb0c0fa2bb2c8c0647ef214465c7ebbc93a7a179b204efc46065a925170dc2659238bbb0abefc73b145322b9668340d36ff8a95fc5083890223b48d6e644
 AUX swt-3.8-manifest 750 BLAKE2B 46ff2102bf58343aa6443accc445c1531920f5913876189f471eba38961c4850cc121f52410570f8cae374f2112ec9466cffaccb218daf9558d43c32f39cd24c SHA512 ce465f77e2fc3340ccaf3ecce67697666972331f849ef196eeebfed3dd1342691a5641ec20b91bc5b480ea0acc9edf194ec9f4bc597c2778d0bd0382923d1bc5
 AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e82847568f611e1c04d380b6cd5837c7f96055ea3132c401de3e73f4b41e6b9bf070f515778cf0b5ddbdaa8942f SHA512 035ea3dda893481f67ac0447e0c7382a9761eb3ee77b65ca77038bd17117b68a2d93058c8414d9b2656ceeecde3e6ebc06c0f27e044f217fe8f44945104dcbd4
-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.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
@@ -18,9 +17,7 @@ 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.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-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
+MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
deleted file mode 100644
index ba537f54024e..000000000000
--- a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91
-http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c
-https://bugs.eclipse.org/404776
-https://bugs.gentoo.org/500570
-
---- a/src/org/eclipse/swt/browser/WebKit.java
-+++ b/src/org/eclipse/swt/browser/WebKit.java
-@@ -597,9 +597,13 @@ public void create (Composite parent, int style) {
- 	*/
- 	long /*int*/ session = WebKitGTK.webkit_get_default_session ();
- 	long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
--	WebKitGTK.soup_session_feature_detach (originalAuth, session);
-+	if (originalAuth != 0) {
-+		WebKitGTK.soup_session_feature_detach (originalAuth, session);
-+	}
- 	OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
--	WebKitGTK.soup_session_feature_attach (originalAuth, session);
-+	if (originalAuth != 0) {
-+		WebKitGTK.soup_session_feature_attach (originalAuth, session);
-+	}
- 
- 	/*
- 	* Check for proxy values set as documented java properties and update the
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index 3100286ec075..40abe82a75f0 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -10,7 +10,4 @@
 		Eclipse platform in an operating system independent manner.  It is analogous to
 		AWT/Swing in Java with a difference - SWT uses a rich set of native widgets.
 	</longdescription>
-	<use>
-		<flag name="webkit">Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
deleted file mode 100644
index de15a30fd3e7..000000000000
--- a/dev-java/swt/swt-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}-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-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.7"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE="cairo gnome opengl webkit"
-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
-		)
-		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
-		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 "${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-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() {
-	# 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
-}
diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
deleted file mode 100644
index e0d8a03d7f0a..000000000000
--- a/dev-java/swt/swt-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 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 webkit"
-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
-		)
-		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
-		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
-	epatch "${FILESDIR}"/${P}-libwebkit-compat.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" || 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"
-	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
-}