Revision bump. Define missing g_thread_supported() to be 0, reported by Thev00d00, as per http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b76decdda2aff36d926293d1567c3b04f7c91d1c

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 194 insertions, 9 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index b2689e98492d..8f10a8a917e7 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.145 2013/05/10 15:44:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.146 2013/05/15 09:02:02 tomwij Exp $
+
+*swt-4.2-r2 (15 May 2013)
+
+  15 May 2013; Tom Wijsman <TomWij@gentoo.org> +swt-4.2-r2.ebuild:
+  Revision bump. Define missing g_thread_supported() to be 0, reported by
+  Thev00d00, as per http://git.eclipse.org/c/platform/eclipse.platform.swt.git/c
+  ommit/?id=b76decdda2aff36d926293d1567c3b04f7c91d1c
 
 *swt-4.2-r1 (10 May 2013)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 9b9b0a65bfd5..585eae9df948 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -37,17 +37,18 @@ EBUILD swt-3.6.1.ebuild 4774 SHA256 2fa22bec72c95340565d8ae982a28ab646acf7d512ac
 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
 EBUILD swt-4.2-r1.ebuild 4824 SHA256 1a0f97eca60d3a2791aca24573601fa7a23de0b56ae292a56e3f390ccf15c6fd SHA512 198ab0114ed9e7801c57cce950fcfe0a77fb1112dd2ea935964443395c861e597bf274022a70b1d951b68c2088ab95ac1fc64ebe935b14eb0fb0d4a18fad00cb WHIRLPOOL b995326f94a156f015298c7732df076906b31094f40dd841e7940d9c331792cc12018c31ca5cf0550b32f0279031c8db6d0dc411a681279cf5db8e057d0fc030
+EBUILD swt-4.2-r2.ebuild 4950 SHA256 652162ae0f78851fc831cab7ee41cca21a2b3a6227a710c6d8076528307f63d4 SHA512 281824727d25b5677c8972dc57361723129297afb80b585de6b2393977d8b560c84f8340ee0c08c6a3b17d1f9170a72660b612902013599d5a337d8c882f275c WHIRLPOOL e138025e61eae4afc8262d7fe2b7653e49da415788ed990776e255528ac097b53b832566787579e8b4f7da07cae2d41097d2be8f8476870d70ef91fa58c1d6d2
 EBUILD swt-4.2.ebuild 4710 SHA256 6885c522f436c3a9a305c4bb19fda4bc5ffc10a248b670f7ff7a9d1acdcdac38 SHA512 6a60a8216de7d3106abeb3e673b9bc458ec6d39e6ae57a46870e326d2000984dd2f059e112b499a252baefe3dc71711a0e3e2121e3a707003a6c5202081e1d34 WHIRLPOOL d5afcaebc5b297fc7c0dfd4c3c7d35e6d1842e870758907ff5be295aa5c8c8d8f9acf8fbadedbc9a592857131b801277c7e79ec3f3fc4e9487e145a7ee237687
-MISC ChangeLog 24833 SHA256 ae7845c562a03be698aef028e2f171ec035ca872041369a0c00c1aa99c3cb4fc SHA512 befae2fea10685a76692dddc4b143e507e64be8e56e6c94b857f852d7609b21debe9f856a06afb0906554face36bb10068526347d4bd5c7712bdcd6bdac4344a WHIRLPOOL 8d25621f1e6163d78f8ec6b3c73cecb115d2c61868e1a44930f611bb9f9eccb42977916b1eeed68c3c8f763b4f12cb6764b85a939e351e9be1e0305e7e6d1822
+MISC ChangeLog 25136 SHA256 d58f1ea7fff072a0084000fd8dcc91e6f040f6ed448032a87a50f0f26f776ec6 SHA512 05d9013223b47fa24941de10bb50af12432a88f1e23586307f590c7b469554687015a0cf64141767714af12b3a62b120331f8956d0d48817270f284e88c4162b WHIRLPOOL 538db6399c4d14af0aab8f98d612a10a5f350b64ccd65ae1dd5dbce934fd1f4d5bb04d32092f626df728bcd18388db97f93844679348e09b118dba536e494d83
 MISC metadata.xml 578 SHA256 1e4845acfd81dc03aba0b504ac5c3307bf8d8a3bf666ece773fc483e458eaea0 SHA512 2b9ed1965582b5cd8371b473a296d620005273c82b393f5f32c3c45ce65926330bb75e4a312256c21bdb3f69a9c2a4b99f18e9396a349ba17ba94ebe647e5b8a WHIRLPOOL a32177b01a02581a0b4762e31cdf8029a88fc7e57ec9809c9a8156326a843e604a861e8f5f7bb44d8adc9e1c0c09eebb58d8d6ffd613ae531f99d6f1113cf044
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRjRV/AAoJEJWyH81tNOV9NuwIAKHcFhRKiNytwKuBw1JqW03S
-agltAFOyZNxPZLGyKwKMjAXfH6uC/UWNEtN5cp63ZK4VgDan/OQNp/E3ab5Ucv+o
-RhrC509pYoHw49dlXap0OV2mD0Q3gbTsuRuVhk+Pd1paGmq5dm2weBKzQOn8VB/0
-pzBCMiIbM3/09GyBPGn9WKqWpL22hoTvy90LxR3tYqX55lIp6q2AYGmF0aVaCkmn
-/56F5jm2ZlVv7lKD6ATa3QJY/z62FhZCSY1INOFVhIVoa0oRec24+DVSE9gvqS43
-sWbg4gM3ZSU1D1tr4a59apewZyLKLPbZlTkZIP/PPyfR94i42QLMSPJCfQKj7P4=
-=cRyY
+iQEcBAEBCAAGBQJRk06oAAoJEJWyH81tNOV9+eQH/Ra8I+6o7uzIs3s6esCcNcGG
+EgG6nssfYEPWMRIC/ex+NvI3aIVfpLVz+7CYnUynInMCu6PYaZHqBmcwiJBwmAc2
+RbAvhP1yYzwBuR71IqQVihUWqi1u/M2k+6tgKRE0gm4tv7R56effHVwj/FoNpUoh
++7jWnZkJZD8HS5R9Lh8awt2A7j2z3tHlwLnjEvPSOGAtEpD/iRzx2Vj8My8vEPOG
+WKmBBq+f8M4oR796FO+vRUX3kihzdM3KRv0QgmugvHupuZ3FQ4Z4rEXQq8MGoCFf
+P/XWUQ+Lfd6HitnyAgX2lRDwoKcxY3GC35gPbLgvg5MLUrjiD++a0smsCJ5Xi/k=
+=+CdW
 -----END PGP SIGNATURE-----
diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild
new file mode 100644
index 000000000000..e1d0d5059f9e
--- /dev/null
+++ b/dev-java/swt/swt-4.2-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-4.2-r2.ebuild,v 1.1 2013/05/15 09:02:02 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic 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.32
+	>=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
+
+	# Define missing g_thread_supported() to be 0.
+	sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
+}
+
+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"
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	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
+}