Commited swt-3.4 final.

Package-Manager: portage-2.1.4.4

5 files changed, 238 insertions, 18 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/Manifest b/dev-java/swt/Manifest
index e9095f42ca39..1b90622b11da 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
 AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea SHA1 d703af14ca2c405304583fead0f06946c1f26a12 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab
 AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae
@@ -8,17 +5,14 @@ AUX swt-3.4-manifest 753 RMD160 c56ff2fcaf42d35af618a60273c9f6580adc0d79 SHA1 05
 DIST swt-3.3.1.1-gtk-linux-ppc.zip 4517854 RMD160 026315045217f20d4a69120c5214003efacdf332 SHA1 4ce9701c75c552e6d7ca2de7563dc44eb51908b7 SHA256 6c1cf5607facd1fd6f684c39d9a99db9739e984c1b4e5d81d9500236d4ff2cdc
 DIST swt-3.3.1.1-gtk-linux-x86.zip 4451797 RMD160 86a44dd3dd6f38b75a20de4a3fe98db38f163c9d SHA1 411d441ac47b7639b48f6094cb9bfe56f6958943 SHA256 5d4a7a524990aed7180fa954abfa5ed610dbead796e91677ca5274fbcd6b9dac
 DIST swt-3.3.1.1-gtk-linux-x86_64.zip 4625538 RMD160 3bbece2ca1820ea7a5b3b10dc637b62f69fe0dc8 SHA1 70b5780233fdf7aae7633e4990922405f5a2e2f9 SHA256 8f153de11f84d7259dbaf5425a54d4c92858b981cacbb38d3c28b7ced8c138d5
+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
 DIST swt-3.4M6-gtk-linux-ppc.zip 4579850 RMD160 70ac000cddce0d22c80a431226977afd22e37836 SHA1 a3bafcc5fbfd5b39b84299984da517c5c50c59be SHA256 2e9e6e5fbe4a22e70a10cd37d03b4aae651c9ed3bb573d34502a158d8ca1cc27
 DIST swt-3.4M6-gtk-linux-x86.zip 4512008 RMD160 c1f2cf741c9cdfcd88d500dbf06f24c7e15d364d SHA1 31177f1c6efbdf123f1e91f3596d9da3d44b21ad SHA256 7a91c8ed7cc7c4ceedf55d19a51bb2ee7c29cb803209e0d2a0fa0126b0fa084c
 DIST swt-3.4M6-gtk-linux-x86_64.zip 4693690 RMD160 2c318f8c709b0204d9d51d4a068edf770b6607c9 SHA1 ee2cb5fe47a08a772f47c3480af99ddf260c1fbe SHA256 a4111d115098fcb85680866e779ef1109c12c94d85f0ecc37fc865b59939bd26
-EBUILD swt-3.3.1.1.ebuild 5812 RMD160 c015046aeed0c22d7ba50e8f95e4e04c8ae16a9b SHA1 a95a40c473ab7411171c098c94b0b985ce72eb70 SHA256 28655ab9b6c7e94e0fca16cca2f1515ef04670cf0c6e0a25dc4f0172ac58be43
-EBUILD swt-3.4_pre6-r1.ebuild 6240 RMD160 4ac77fa0f91a73e4a4ec19f886af04e1eacfdc9d SHA1 049b1c307c66eb72a3de3ae74e3e674038c213af SHA256 665cad35eb8ea493187d9e29c62ec45a3000c1c3610f7afab953f37854fdae72
-MISC ChangeLog 15517 RMD160 50a35f42a431e778bc140189b8ab988ad49786db SHA1 cd7ecc965ebc807b756b037e397c38cefaeff7c7 SHA256 b97cf3f4c0a4dfa7b28549392f8d17e78066f8e7893c7690957aa3d1f4816156
+EBUILD swt-3.3.1.1.ebuild 5811 RMD160 571c9932609e7f74b4743d59708a98f79f845b2a SHA1 e14908adae9612f125181cc57fc3b7f9b1869f3f SHA256 cb0fd3bae40a58f49b5426926bed673a1e78ca0fb5a9eeabea9122aa66ff5ddb
+EBUILD swt-3.4.ebuild 6313 RMD160 add328574a9b0533e942c7e15f062a7e0863212e SHA1 14608c6e4486440378ae265ac4bafecf0f89741b SHA256 d83453bfe3b0c5c1acd56cb26920da6779c5eba54dbb7908d55ebb554d2fc439
+EBUILD swt-3.4_pre6-r1.ebuild 6235 RMD160 0b976fbe56aa9097bd5d76fc113b98ab3a32de37 SHA1 6f5869544e708cdfa04980527af3ddb4bbe6ce81 SHA256 da86496ee240ed585213f1195062598eac07f5303f9a6ee4b13271361540749b
+MISC ChangeLog 15818 RMD160 a6886e10d071359af484595740af4235c7047d6f SHA1 464b156bf009b2463e455020625c1dd5a21a8166 SHA256 322b2864a4932aa4935056dc8f283f38e0c65a8c358d0fb5416aea77028facbf
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgzP28ACgkQcxLzpIGCsLQ/xACfQ9KfXxEMKhZJGpRQhIcH1tZ/
-0+4AniEMvLK7b8ZE76Y1TzZTbcXq90o3
-=5WfK
------END PGP SIGNATURE-----
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