Commited swt-3.4 final.

(Portage version: 2.1.4.4)

4 files changed, 231 insertions, 5 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 29dca091eaf9..7ee3c3420afb 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.89 2008/05/20 21:15:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.90 2008/07/31 09:11:56 elvanor Exp $
+
+*swt-3.4 (31 Jul 2008)
+
+  31 Jul 2008; Jean-Noël Rivasseau <elvanor@gentoo.org> swt-3.3.1.1.ebuild,
+  swt-3.4_pre6-r1.ebuild, +swt-3.4.ebuild:
+  Added swt-3.4 final. Mozilla/Gecko support is now only provided via xulrunner
+  (this matches upstream policy as Firefox 3 needs xulrunner-1.9 for example).
 
   20 May 2008; Petteri Räty <betelgeuse@gentoo.org> swt-3.4_pre6-r1.ebuild:
   Add ppc64 support. Fixes bug #222971. Thanks to Andrew John Hughes
diff --git a/dev-java/swt/swt-3.3.1.1.ebuild b/dev-java/swt/swt-3.3.1.1.ebuild
index c6e24ffd5307..1544848ee541 100644
--- a/dev-java/swt/swt-3.3.1.1.ebuild
+++ b/dev-java/swt/swt-3.3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1.ebuild,v 1.5 2008/03/19 19:03:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.3.1.1.ebuild,v 1.6 2008/07/31 09:11:56 elvanor Exp $
 
 EAPI="1"
 
@@ -70,7 +70,7 @@ RDEPEND=">=virtual/jre-1.4
 S="${WORKDIR}"
 
 src_unpack() {
-	local DISTFILE="${A}"
+	local DISTFILE=${A}
 	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
 	unpack ./src.zip
 
diff --git a/dev-java/swt/swt-3.4.ebuild b/dev-java/swt/swt-3.4.ebuild
new file mode 100644
index 000000000000..392d3ba6c70a
--- /dev/null
+++ b/dev-java/swt/swt-3.4.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4.ebuild,v 1.1 2008/07/31 09:11:56 elvanor Exp $
+
+EAPI="1"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_pre/M}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-200806172000"
+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.4"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl mozilla 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*
+				)
+		mozilla? ( net-libs/xulrunner:1.9 )
+		xulrunner? ( net-libs/xulrunner:1.9 )
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)"
+
+# 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
+
+DEPEND=">=virtual/jdk-1.4
+		!=dev-java/swt-3.4*:3
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-proto/xextproto
+		x11-proto/inputproto
+		${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+	x11-libs/libXtst
+	${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
+
+	# 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"
+
+	# Apply all the patches, including arch-specific
+	# EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" epatch
+
+	sed -i "s/CFLAGS = -O -Wall/CFLAGS = ${CFLAGS} -Wall/" \
+		make_linux.mak || die "Failed to tweak make_linux.mak"
+
+	sed -i "s/MOZILLACFLAGS = -O/MOZILLACFLAGS = ${CXXFLAGS}/" \
+		make_linux.mak || die "Failed to tweak make_linux.mak"
+
+	# Kill some strict-aliasing warnings
+	epatch "${FILESDIR}/${PN}-3.3-callback-pointer-dereferencing.patch"
+}
+
+get_gecko() {
+	local gecko
+
+	# order here match the logic in DEPEND and USE flag descriptions
+	#use seamonkey && gecko="seamonkey"
+	use mozilla && gecko="xulrunner"
+	use xulrunner && gecko="xulrunner"
+
+	echo ${gecko}
+}
+
+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="ppc"
+	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"
+
+	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
+
+	local gecko="$(get_gecko)"
+	if [[ ${gecko} ]]; then
+		einfo "Building the Mozilla component against ${gecko}"
+
+		if [[ "${gecko}" = "xulrunner" ]]; then
+			export XULRUNNER_INCLUDES="$(pkg-config mozilla-gtkmozembed --cflags)"
+			export XULRUNNER_LIBS="$(pkg-config mozilla-gtkmozembed --libs)"
+			export MOZILLA_INCLUDES="$(pkg-config mozilla-gtkmozembed --cflags)"
+			export MOZILLA_LIBS="$(pkg-config mozilla-gtkmozembed --libs)"
+
+			${make} make_xulrunner || die "Failed to build ${gecko} support"
+		else
+			export MOZILLA_INCLUDES="$(pkg-config ${gecko}-gtkmozembed --cflags)"
+			export MOZILLA_LIBS="$(pkg-config ${gecko}-gtkmozembed --libs)"
+		fi
+
+		${make} make_mozilla || die "Failed to build ${gecko} 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.4-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
+
+	local gecko="$(get_gecko)"
+	if [[ "${gecko}" == "seamonkey" ]]; then
+		local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	elif [[ -n "${gecko}" ]]; then
+		local gecko_dir="$(pkg-config mozilla-gtkmozembed --variable=sdkdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	fi
+
+	dohtml about.html || die
+}
diff --git a/dev-java/swt/swt-3.4_pre6-r1.ebuild b/dev-java/swt/swt-3.4_pre6-r1.ebuild
index ba4579ea389f..9cdf49c584f1 100644
--- a/dev-java/swt/swt-3.4_pre6-r1.ebuild
+++ b/dev-java/swt/swt-3.4_pre6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild,v 1.3 2008/05/20 21:15:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.4_pre6-r1.ebuild,v 1.4 2008/07/31 09:11:56 elvanor Exp $
 
 EAPI="1"
 
@@ -80,7 +80,7 @@ RDEPEND=">=virtual/jre-1.4
 S="${WORKDIR}"
 
 src_unpack() {
-	local DISTFILE="${A}"
+	local DISTFILE=${A}
 	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
 	unpack ./src.zip