Version bump. Fixes bug #342931. Xulrunner dep restricted to 1.9 as 2.0 is not supported anymore. Disable the flag if you have xulrunner-2.0. In future versions, swt should use webkit instead. Bug #335165.

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

5 files changed, 229 insertions, 6 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 5d65067fe66a..bf5c7c85f1d7 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.128 2010/08/16 09:38:50 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.129 2010/11/26 23:47:42 caster Exp $
+
+*swt-3.6.1 (26 Nov 2010)
+
+  26 Nov 2010; Vlastimil Babka <caster@gentoo.org> swt-3.6.ebuild,
+  +swt-3.6.1.ebuild, metadata.xml:
+  Version bump. Fixes bug #342931. Xulrunner dep restricted to 1.9 as 2.0 is
+  not supported anymore. Disable the flag if you have xulrunner-2.0. In
+  future versions, swt should use webkit instead. Bug #335165.
 
 *swt-3.6 (16 Aug 2010)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index d26ae4d67bf3..1cd09b1ad77f 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -20,9 +20,13 @@ DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 RMD160 32aca7c0ad9ced672efa1a1a94bdc
 DIST swt-3.6-gtk-linux-ppc.zip 5391218 RMD160 389fd8107fbaff61182f181ce065d67465b93c37 SHA1 cc118ebb6e958f3f1b1ca5f040be041139bd9020 SHA256 e96aac05c3a8258de82e1107fff844dfd211dafab5638c1db1cb4ce6a44eaf62
 DIST swt-3.6-gtk-linux-x86.zip 5229551 RMD160 6b039f00e351585b1a1e0c72c91ccfcf4db4a723 SHA1 46af16709645d0075a3d06c793b6c9cc89d596ce SHA256 9497be8de7e1190680cf984a0d53c3023812540a10df759ac28c7140198077ff
 DIST swt-3.6-gtk-linux-x86_64.zip 5524629 RMD160 4a7b707497144fe925bff0c87e0bf22f8b2879f4 SHA1 d788979aed67d5c8f9e6a623d86a36f519f2eb58 SHA256 0be783b84a3b3c8dc5201eb0d43240935868bec51dc045dd5068061937bef6c7
+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
 EBUILD swt-3.3.1.1-r1.ebuild 5857 RMD160 78bdae228c15885928199eb22b949dcf777d77b1 SHA1 751834a3c87f17d6bb8d7d2553463dcb7f685c67 SHA256 7f8ea17958bbe4899feeee142867a274f4c7f29ef072ca6fa86528246def1294
 EBUILD swt-3.4-r4.ebuild 6313 RMD160 7b9617b2499358289afb4665c76249f4a6ccf5f3 SHA1 2689f78427bc6e260b4c00de817adafc48e825cf SHA256 d72edb3516a67633a5ae98b47cf4c9602d55a2402b80a2f9267518c729ee0d1d
 EBUILD swt-3.5.2.ebuild 6023 RMD160 8375f29f20f7c2174542b673757ea67e08a35f3e SHA1 2fb2ec0bde456d65c749771a60c742aeb5f30266 SHA256 bc7a24bcb98d7602b4fb509b7d7cd5ed8ac620666d54ac0d68472e0107e053f9
-EBUILD swt-3.6.ebuild 6034 RMD160 c5981db27f437a49f69e0c5dbc1b518454de65b5 SHA1 e152354a461fec9cee889129196eb1cc8baf3ec3 SHA256 ceeedae17692a33a3305cf5a30420a1b15ca93e05665e53234ba9ee9c03423a8
-MISC ChangeLog 21746 RMD160 9bd031fbdd94d4ead3e13dfa1b936363d30657ab SHA1 90e25d0ba5919c35a8a5fcd275f3ce65caa3ede7 SHA256 5d95b23875a2da4190845f622d8278664a7d7f805b0c3633afa30d50193bfa5e
-MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
+EBUILD swt-3.6.1.ebuild 6036 RMD160 a8ba57c5ef6135d9ea15dab674bc95fbb45c82c7 SHA1 bb8bc2f75dd5cb5d5ada708b2d7afe8ce4e1441a SHA256 75f3841de83a3079fa8c911989fd31587ed00c5eb22201aefd96bc64cc3f959e
+EBUILD swt-3.6.ebuild 6034 RMD160 f3531213726763c417a01affc580a213c6a725e8 SHA1 aba500237307a2faf4a10304bf579507561aba11 SHA256 0a94ea19189e59eaefd8f1b54610e60615edbb041b5f250d6ecb870b73bedbbf
+MISC ChangeLog 22085 RMD160 dd72a4246c6ee3fa670a98281bd92d66acfa34e4 SHA1 6f5f0b069ba48fbae4bb1f2135ea4820d9555f9a SHA256 3bf12d7f8da84682f23b6875032c3d19d7d6f0b85393e49288bf5c10c8f9e458
+MISC metadata.xml 616 RMD160 34a26442410eabd5c2099d15f06d12eaf75fffcc SHA1 0a3c8429db32a381961e5071930d2e4b6306b68f SHA256 f7d4a0cc490a3a715c19736d9c00176f4ac2285a6daed9f97354dfa76f672709
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index f2631629e398..d6feba6df824 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -7,4 +7,7 @@
 		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="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.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild
new file mode 100644
index 000000000000..b9a1c1f1f299
--- /dev/null
+++ b/dev-java/swt/swt-3.6.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.1.ebuild,v 1.1 2010/11/26 23:47:42 caster Exp $
+
+EAPI=2
+
+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}-201009090800"
+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-ppc.zip
+		)
+		ppc64? (
+			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+		)"
+
+SLOT="3.6"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl xulrunner"
+COMMON=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6.8
+		>=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*
+				)
+		xulrunner? ( =net-libs/xulrunner-1.9* )
+		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
+		dev-util/pkgconfig
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON}"
+
+S="${WORKDIR}"
+
+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=-DSWT_PTR_SIZE_64
+
+	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 xulrunner ; then
+		einfo "Building the Mozilla component against xulrunner-1.9"
+
+		export MOZILLA_INCLUDES="$(pkg-config --cflags libxul libxul-embedding)"
+		# the -R is a workaround for bug #234934
+		export MOZILLA_LIBS="-Wl,-R$(pkg-config libxul --variable=sdkdir) $(pkg-config --libs libxul libxul-embedding)"
+
+		${make} make_mozilla || die "Failed to build Mozilla support"
+
+		# upstream ships libswt-xulrunner*.so even though the build.sh does not
+		# build it anymore... missing this file leads to another instance
+		# of bug #234934 so we build it too
+		einfo "Building the xulrunner component against xulrunner-1.9"
+
+		export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
+		export XULRUNNER_LIBS="${MOZILLA_LIBS}"
+
+		${make} make_xulrunner || die "Failed to build xulrunner support"
+
+		${make} make_xpcominit || die "Failed to build xpcominit 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}-${SLOT}-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
+
+	if use xulrunner; then
+		local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	fi
+
+	dohtml about.html || die
+}
+
+pkg_postinst() {
+	if use xulrunner; then
+		local gecko_dir="$(pkg-config libxul --variable=sdkdir)"
+		elog "You built swt with xulrunner support. For your custom applications please set"
+		elog "MOZILLA_FIVE_HOME environment variable to ${gecko_dir}"
+	fi
+}
diff --git a/dev-java/swt/swt-3.6.ebuild b/dev-java/swt/swt-3.6.ebuild
index ac087dd9d7fa..af6059d3a44a 100644
--- a/dev-java/swt/swt-3.6.ebuild
+++ b/dev-java/swt/swt-3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.ebuild,v 1.1 2010/08/16 09:38:50 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.6.ebuild,v 1.2 2010/11/26 23:47:42 caster Exp $
 
 EAPI=2
 
@@ -42,7 +42,7 @@ COMMON=">=dev-libs/glib-2.6
 				=gnome-base/gnome-vfs-2*
 				=gnome-base/libgnomeui-2*
 				)
-		xulrunner? ( net-libs/xulrunner:1.9 )
+		xulrunner? ( =net-libs/xulrunner-1.9* )
 		opengl?	(
 			virtual/opengl
 			virtual/glu