Revbump that adds MOZILLA_FIVE_HOME to package.env using new java-config's functionality.

Package-Manager: portage-2.1.2.8

4 files changed, 236 insertions, 15 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 79447061b9df..ba9b3a1d63b0 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.63 2007/04/27 21:52:41 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.64 2007/05/25 22:04:33 caster Exp $
+
+*swt-3.2.2-r1 (25 May 2007)
+
+  25 May 2007; Vlastimil Babka <caster@gentoo.org> +swt-3.2.2-r1.ebuild:
+  Revbump that adds MOZILLA_FIVE_HOME to package.env using new java-config's
+  functionality.
 
   27 Apr 2007; Matti Bickel <mabi@gentoo.org> swt-3.2.2.ebuild:
   ~ppc readded (bug #169456)
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 7d5649e5062f..bf6265ccd6ca 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
 MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458
 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458
@@ -44,14 +41,18 @@ EBUILD swt-3.2.1.ebuild 5276 RMD160 94f3aab38e4dd630f2f603792c8a4cdc209fca11 SHA
 MD5 f2f9a180d7d6bea4b201303f972fcba6 swt-3.2.1.ebuild 5276
 RMD160 94f3aab38e4dd630f2f603792c8a4cdc209fca11 swt-3.2.1.ebuild 5276
 SHA256 80854a3efbe88e63209dcb35607c8c1559936b06a5566836dad96e4b7a043ee3 swt-3.2.1.ebuild 5276
+EBUILD swt-3.2.2-r1.ebuild 5874 RMD160 d633135f3533f9ad84fd113b976a92d9311f52c4 SHA1 a57d7ffa5031e1c440ebceba59ebc7be8a25d417 SHA256 f58abbde4216de0cbb2cd7c45fe3ea0cb7cac6763d01095800b184e913cf4b71
+MD5 f20ca60ba76646418506369693b8a6cc swt-3.2.2-r1.ebuild 5874
+RMD160 d633135f3533f9ad84fd113b976a92d9311f52c4 swt-3.2.2-r1.ebuild 5874
+SHA256 f58abbde4216de0cbb2cd7c45fe3ea0cb7cac6763d01095800b184e913cf4b71 swt-3.2.2-r1.ebuild 5874
 EBUILD swt-3.2.2.ebuild 5554 RMD160 37a95240734cd06df841bd2d7224e9c1fb2f398a SHA1 05850583bfbc23ca50074c0fadc440743dcf1234 SHA256 6f8edb0519909392e7df2e5233143c02f0183955e6f838bb89185d774f7657ea
 MD5 85f9a5ecad129b4ad89110494288ce76 swt-3.2.2.ebuild 5554
 RMD160 37a95240734cd06df841bd2d7224e9c1fb2f398a swt-3.2.2.ebuild 5554
 SHA256 6f8edb0519909392e7df2e5233143c02f0183955e6f838bb89185d774f7657ea swt-3.2.2.ebuild 5554
-MISC ChangeLog 11361 RMD160 fe2542b7925906feb4f895677d775c9d3878b2be SHA1 3de0b61ee77b859269ec16e9f51231d627c51f1b SHA256 53da0cd043f33d1b92396f9ff8892f478fff97be1ab750b37dabc23708d53ade
-MD5 a8f7a1345cee9e34b0f8a79eeed65b24 ChangeLog 11361
-RMD160 fe2542b7925906feb4f895677d775c9d3878b2be ChangeLog 11361
-SHA256 53da0cd043f33d1b92396f9ff8892f478fff97be1ab750b37dabc23708d53ade ChangeLog 11361
+MISC ChangeLog 11560 RMD160 32a2743df37b92a813612afb3fb09272b08b5f86 SHA1 99be14769267db9119ae80154a2e2c0f622c2334 SHA256 7e061bf0f68ae7bad6af8342c0220231ff869aebefa6b704145dfec298fb359d
+MD5 e5d94df63954158a21334404e9418101 ChangeLog 11560
+RMD160 32a2743df37b92a813612afb3fb09272b08b5f86 ChangeLog 11560
+SHA256 7e061bf0f68ae7bad6af8342c0220231ff869aebefa6b704145dfec298fb359d ChangeLog 11560
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -65,10 +66,6 @@ SHA256 8a4fdc86dcf1d19555dbec690d191b180265908405983e1396a311132d3975e5 files/di
 MD5 74eb3bd4dcec760c0ea6bce55fa387b5 files/digest-swt-3.2.2 1075
 RMD160 55d3019d53a86a8616f719d0dfd787d4ffa6f696 files/digest-swt-3.2.2 1075
 SHA256 4284c56544b366b08d35f501ba716a29474e3463277967885b0f4ad9df2bb407 files/digest-swt-3.2.2 1075
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGMnA9fNMcoUhJ7GwRAkghAJ0R1VWomP0i5xrOPUAj37CPXIM4gACbBaZG
-WI6yDZ3j/4fyASNo2cFZJdA=
-=Bjgg
------END PGP SIGNATURE-----
+MD5 74eb3bd4dcec760c0ea6bce55fa387b5 files/digest-swt-3.2.2-r1 1075
+RMD160 55d3019d53a86a8616f719d0dfd787d4ffa6f696 files/digest-swt-3.2.2-r1 1075
+SHA256 4284c56544b366b08d35f501ba716a29474e3463277967885b0f4ad9df2bb407 files/digest-swt-3.2.2-r1 1075
diff --git a/dev-java/swt/files/digest-swt-3.2.2-r1 b/dev-java/swt/files/digest-swt-3.2.2-r1
new file mode 100644
index 000000000000..5d856f4631c3
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.2.2-r1
@@ -0,0 +1,12 @@
+MD5 769d0f2efa3894e56966783015862a33 swt-3.2.2-gentoo-patches.tar.bz2 6707
+RMD160 a35840a279f98b4199c25e6b28aadefa1138f843 swt-3.2.2-gentoo-patches.tar.bz2 6707
+SHA256 9f56edd328a5f000dce42c01ae83d1d9e4017dc7fd11ed2a8091ebece783d25e swt-3.2.2-gentoo-patches.tar.bz2 6707
+MD5 45d1f0ff0de9c95fcd92836fea79927c swt-3.2.2-gtk-linux-ppc.zip 3042753
+RMD160 dbec93a4fa1f256a06ff856e5aba8a22a927a52a swt-3.2.2-gtk-linux-ppc.zip 3042753
+SHA256 e5a03729ee01c32950a2244e0d1b8159d988264bc1b335af1b926cba51155450 swt-3.2.2-gtk-linux-ppc.zip 3042753
+MD5 e1340b6c7cf9b617145667b15b02fd49 swt-3.2.2-gtk-linux-x86.zip 3117432
+RMD160 b99c00a6f43316cb82bd38f1e8bd92eea4006b78 swt-3.2.2-gtk-linux-x86.zip 3117432
+SHA256 aae02ccab6ba97d984533c834ca854a649c3a91ad129fb4a61f7e89c55c41f28 swt-3.2.2-gtk-linux-x86.zip 3117432
+MD5 d678cedc336a58b0147081b56de6a1f3 swt-3.2.2-gtk-linux-x86_64.zip 2996317
+RMD160 81ca3cfa69ab084d9bbe04d8ac6a941c65b46b15 swt-3.2.2-gtk-linux-x86_64.zip 2996317
+SHA256 a60902420ca5e540d949613a5eba352a92043cf3c8d20e8a8214fb0c44699e56 swt-3.2.2-gtk-linux-x86_64.zip 2996317
diff --git a/dev-java/swt/swt-3.2.2-r1.ebuild b/dev-java/swt/swt-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..86cd80f67f40
--- /dev/null
+++ b/dev-java/swt/swt-3.2.2-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.2-r1.ebuild,v 1.1 2007/05/25 22:04:33 caster Exp $
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+MY_DMF="R-${PV}-200702121330"
+# https://overlays.gentoo.org/svn/proj/java/other/swt-patches
+PATCHSET="${PN}-3.2.2-gentoo-patches"
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+		)
+		x86-fbsd? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86.zip
+		)
+		amd64? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-x86_64.zip
+		)
+		ppc? (
+			http://download.eclipse.org/downloads/drops/${MY_DMF}/${P}-gtk-linux-ppc.zip
+		)
+		mirror://gentoo/${PATCHSET}.tar.bz2"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE="cairo gnome seamonkey 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.0.2 )
+		gnome?	(
+					=gnome-base/libgnome-2*
+					=gnome-base/gnome-vfs-2*
+					=gnome-base/libgnomeui-2*
+				)
+		seamonkey? (
+					>=www-client/seamonkey-1.0.2
+					>=dev-libs/nspr-4.6.2
+				)
+		xulrunner? (
+					net-libs/xulrunner
+				)
+		opengl?	(
+					virtual/opengl
+					virtual/glu
+				)"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON}
+		dev-java/ant-core
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-proto/xextproto"
+
+# java-config for the env_var stuff, until it's stabled and forced by eclass
+RDEPEND=">=virtual/jre-1.4
+		x11-libs/libXtst
+		>=dev-java/java-config-2.0.33
+		${COMMON}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# determine the right file to unpack from $A
+	local DISTFILE=${A/${PATCHSET}.tar.bz2/}
+	# just in case patchset is ordered before distfile
+	DISTFILE=${DISTFILE## }
+	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "unable to extract distfile"
+	unpack ./src.zip
+
+	unpack "${PATCHSET}.tar.bz2"
+
+	# Cleanup the redirtied directory structure
+	rm -rf about_files/
+	rm -f .classpath .project
+
+	# 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"
+
+	cp make_linux.mak make_freebsd.mak
+
+	#  https://bugs.eclipse.org/bugs/show_bug.cgi?id=167173
+	epatch "${FILESDIR}/${PN}-3.2.1-fbsd.patch"
+}
+
+get_gecko() {
+	local gecko
+	# Wasn't able to succesfully run test with this
+	# http://overlays.gentoo.org/proj/java/browser/testcases/dev-java/swt
+	#use firefox && local gecko="firefox"
+	use seamonkey && gecko="seamonkey"
+	use xulrunner && gecko="xulrunner"
+
+	echo ${gecko}
+}
+
+src_compile() {
+	# Drop jikes support as it seems to be unfriendly with SWT
+	java-pkg_filter-compiler jikes
+
+	# Identify the AWT path
+	# The IBM VMs and the GNU GCC implementations do not store the AWT libraries
+	# in the same location as the rest of the binary VMs.
+	if [[ ! -z "$(java-config --java-version | grep 'IBM')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/jre/bin
+	elif [[ ! -z "$(java-config --java-version | grep 'GNU libgcj')" ]] ; then
+		export AWT_LIB_PATH=$JAVA_HOME/$(get_libdir)
+	else
+		if [[ $(tc-arch) == 'x86' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386
+		elif [[ $(tc-arch) == 'ppc' ]] ; then
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/ppc
+		else
+			export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
+		fi
+	fi
+
+	# Fix the GTK+ Library path
+	export GTKLIBS="$(pkg-config --libs-only-L gtk+-2.0 gthread-2.0) \
+		-lgtk-x11-2.0 -lgthread-2.0 -L/usr/$(get_libdir)/X11 -lXtst"
+
+	# Fix the pointer size for AMD64
+	[[ ${ARCH} == 'amd64' ]] && 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"
+		#local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
+		local inc="$(pkg-config ${gecko}-xpcom --cflags)"
+		GECKO_INCLUDES="${inc}" \
+		GECKO_LIBS="$(pkg-config ${gecko}-xpcom --libs)" \
+			${make} make_mozilla || die "Failed to build Mozilla 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() {
+	java-pkg_dojar swt.jar
+
+	java-pkg_sointo /usr/$(get_libdir)
+	java-pkg_doso *.so
+
+	local gecko="$(get_gecko)"
+	[[ -n "${gecko}" ]] && java-pkg_register-environment-variable \
+		MOZILLA_FIVE_HOME "/usr/$(get_libdir)/${gecko}/"
+
+	dohtml about.html || die
+}
+