Version bump. Replaces xulrunner integration and respective USE flag with webkit. Fixes bug #335165 and #358773. Includes OSGi manifest improvements by Christoph Brill (egore) <egore@gmx.de> from bug #335165.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

5 files changed, 215 insertions, 3 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index c977568715fd..1f4b17b5d8de 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.137 2011/09/06 11:45:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.138 2011/11/17 23:23:50 caster Exp $
+
+*swt-3.7.1 (17 Nov 2011)
+
+  17 Nov 2011; Vlastimil Babka <caster@gentoo.org> +swt-3.7.1.ebuild,
+  +files/swt-3.7-manifest, metadata.xml:
+  Version bump. Replaces xulrunner integration and respective USE flag with
+  webkit. Fixes bug #335165 and #358773. Includes OSGi manifest improvements by
+  Christoph Brill (egore) <egore@gmx.de> from bug #335165.
 
   06 Sep 2011; Vlastimil Babka <caster@gentoo.org> -swt-3.3.1.1-r1.ebuild,
   -files/swt-3.3-manifest, -swt-3.6.ebuild:
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c06352dbfbcf..ade4617ad48e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -7,6 +7,7 @@ AUX swt-3.4-xulrunner-1.9.1-amd64.patch 12209 RMD160 329f773705d7ade1c9129fdf297
 AUX swt-3.4-xulrunner-1.9.1.patch 12209 RMD160 5ead70a50e586e4343eafff5fe96e64141c18a5e SHA1 68f53ff07faa202113b0748aef2de4b9010af65b SHA256 08e4ed334b37347ad9ea267264b46fb6700d57aef4d7817efbabfcb11de82d9c
 AUX swt-3.5-manifest 752 RMD160 7929539d58df2c3655eb640b708e81fa20e70e43 SHA1 1fd24b815a169e52b364a742180e8137ca1add97 SHA256 8ad9d69aa58e533cc03b9ccf3d8e0356505c357aaeb14968bf146f94d8b79be9
 AUX swt-3.6-manifest 752 RMD160 ae159d0bd65b214f7ff31a006d8436890acd2b60 SHA1 7d224f67d57462ba14dcdb42615ecda164bacc6d SHA256 f5a8e3db5c47d3b82541a73b5b0f172342efc5754adcc00b9b62a5abe4b30096
+AUX swt-3.7-manifest 750 RMD160 a9a860a8c5d269c0175fa1a440a0055a0bd1d7c7 SHA1 1df13d01cbafc98982bac7e5d0daae13ca4b544c SHA256 4c911bfa6f4def901570ca715da547c1d13766915f3244e5d6282bee8be6564f
 DIST swt-3.4-gtk-linux-ppc.zip 4616331 RMD160 72104330e6e56db2ed91b37b1b08294c256dd0d8 SHA1 adf491f8abbd6a5fabfea246ed192b28a05ba05f SHA256 227d3bdceba48cd245269cf689731dc3072898c34ed874501532c06ad3c5e9e8
 DIST swt-3.4-gtk-linux-x86.zip 4548421 RMD160 b0c575d8d60af272629517f2c833b013fa340f12 SHA1 0eb201d5e9f4bda02555c92571ed54ef2d87bce1 SHA256 c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
 DIST swt-3.4-gtk-linux-x86_64.zip 4730884 RMD160 17207c7fda0589c1153867fab73afaa777d39c69 SHA1 f6b5b90c71d7ac1793937c2eecf7fb4f2e2a4045 SHA256 67013b409f21bcad6ba07c36977d526dd0642184d1068158da9cb9d23b95e34d
@@ -16,8 +17,12 @@ DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 RMD160 32aca7c0ad9ced672efa1a1a94bdc
 DIST swt-3.6.1-gtk-linux-ppc.zip 5396609 RMD160 475df9e050c5cd348b79839643bac2ddb2ebf398 SHA1 d9c484e77621d3bb3498d706d5e05aa006745bf6 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec
 DIST swt-3.6.1-gtk-linux-x86.zip 5234373 RMD160 7cdead902a173850ae9caa4f3d3c804dc46b7a4b SHA1 e629e0b65296b67931f1fce8ab72419818c9747f SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef
 DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 RMD160 577c13612ce625d6aea97583cd511d95f37ef666 SHA1 4569b6a64348d0da24ff205925128552c6753a81 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94
+DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 RMD160 2c8c0f00b4f001a4b0680d587f037499d258303c SHA1 0ef380192e28f028cb94c67071cbad648aaedf5f SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c
+DIST swt-3.7.1-gtk-linux-x86.zip 5374283 RMD160 997e300ab267b6cbb5dc4f50610cecf752cf5417 SHA1 7d896033c84f2b0beef952aac0e2e0c73038c881 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942
+DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 RMD160 9e9a82027b93557f8f7e44fc54d090b74cd59373 SHA1 2d8e18bc53d8a2d6ff1af5a4226756a11f4a107d SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75
 EBUILD swt-3.4-r4.ebuild 6405 RMD160 4ad6d6488f4904acbfc285274ee9e0cc2289b4e3 SHA1 fd1ad94c227c14a60ac1d8a5eb6ac4295c887693 SHA256 b3ecb5eb82b06ee87a1baeda71ccc4645990e67d2dbf4b7d55a7c78ff5c7ffc1
 EBUILD swt-3.5.2.ebuild 6107 RMD160 d002ba543a805c3aeea1913701dfb49e16fbcace SHA1 f5c5d8bf98a5616f99f8ead53c34ff4e0604f403 SHA256 b5de7f5e6bee9bf07eb13edd58a8396730064b35288cf76b00d503caceb79ae3
 EBUILD swt-3.6.1.ebuild 6115 RMD160 9a4c184b9b244a017d2d56a4d0a28a5fe8e493d9 SHA1 127df209058fab173691fe1758356d9b0eb71dbb SHA256 8e21e44ff7fdbc82b1836907a3d61583b8246b824ceb78404a0618c9ec516ca8
-MISC ChangeLog 23246 RMD160 4d50da576c01745f7b9f2facfc0b76ea099ea351 SHA1 945ba3dde424d65f870946412c388f845662ee7f SHA256 f69d0cfaccaca2e1f0860c010163b25abb06c714fa7fbdb421c00c9d07ceacf4
-MISC metadata.xml 616 RMD160 34a26442410eabd5c2099d15f06d12eaf75fffcc SHA1 0a3c8429db32a381961e5071930d2e4b6306b68f SHA256 f7d4a0cc490a3a715c19736d9c00176f4ac2285a6daed9f97354dfa76f672709
+EBUILD swt-3.7.1.ebuild 4783 RMD160 c9ce736d2da2b5c3aab874a30dd55d33a2d84fbe SHA1 a067fe1fd7679026f281c29437f7bfe5bdeac71f SHA256 0c5421e7c502999f9b19c97bf3667993e10060ff858a204b87003753b7212f4c
+MISC ChangeLog 23599 RMD160 302ab35e20a443d1d148ad4942955dcc89d42158 SHA1 f134e1f6c324e3f56472444a7e4e1770c106d03a SHA256 70ed40d64132220a08141add864ead8db42f05f5c9ab54d9888d5670d0331e48
+MISC metadata.xml 739 RMD160 83fe3784458a1ff5e09bcb117f600a83e26396e2 SHA1 43637624ef260cd5d8ca78894d2660ba07f2436f SHA256 be0193008928fb3cf3ffdcb34579aae6f5fcd8d6ed6122adbb1fe5865016a91e
diff --git a/dev-java/swt/files/swt-3.7-manifest b/dev-java/swt/files/swt-3.7-manifest
new file mode 100644
index 000000000000..bddcbb48b041
--- /dev/null
+++ b/dev-java/swt/files/swt-3.7-manifest
@@ -0,0 +1,17 @@
+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.7
+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.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true
+
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index d6feba6df824..27284507b924 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -8,6 +8,7 @@
 		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>
 		<flag name="xulrunner">Embedded browser support via xulrunner-1.9 (1.8 for swt-3.3). Xulrunner 2.0 is not supported, will be replaced by webkit in 3.7.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/swt/swt-3.7.1.ebuild b/dev-java/swt/swt-3.7.1.ebuild
new file mode 100644
index 000000000000..1c35b4023ed2
--- /dev/null
+++ b/dev-java/swt/swt-3.7.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.1.ebuild,v 1.1 2011/11/17 23:23:50 caster Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201109091335"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+		)"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~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
+		dev-util/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
+}
+
+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
+}