Version bump.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

3 files changed, 218 insertions, 12 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index bcd6c75ef58c..debe86ac8d0c 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/swt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.112 2009/11/04 13:59:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.113 2009/11/05 20:42:22 caster Exp $
+
+*swt-3.5.1 (05 Nov 2009)
+
+  05 Nov 2009; Vlastimil Babka <caster@gentoo.org> +swt-3.5.1.ebuild:
+  Version bump.
 
   04 Nov 2009; Markus Meier <maekke@gentoo.org> swt-3.5.ebuild:
   amd64/x86 stable, bug #291631
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 27a484a515c4..9ca549bb4271 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX as-needed-and-flag-fixes.patch 7229 RMD160 dcd699249c0a1ecfeecc2f31acf584b6ee0501e1 SHA1 6faadbf3f7a5182f0cd950210794e7634e135e70 SHA256 016a810cc9649235fcab73467a056240b712d5557663b7756d4de64c939256ee
 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
@@ -18,17 +15,14 @@ DIST swt-3.4-gtk-linux-x86_64.zip 4730884 RMD160 17207c7fda0589c1153867fab73afaa
 DIST swt-3.5-gtk-linux-ppc.zip 4900841 RMD160 7a602902fb1b7d96c1c863ccac201b40b811e09f SHA1 387a82b41a35fb0833c37d101b99f5d93ea64818 SHA256 f54d5d1dbd75b2dda52f6143d6155fbf6c898baab0ec7d32161b638eefcdd401
 DIST swt-3.5-gtk-linux-x86.zip 4834113 RMD160 330bcdeca1d183b80017bdd8afefa8bfeabc41db SHA1 b184418f0fcbdbedef19c1fd61094b2d1a88659a SHA256 cf92816555a54e613a8ececc24259f8c6bc1b463be2a6903a87c8278e6cdb337
 DIST swt-3.5-gtk-linux-x86_64.zip 5021592 RMD160 c8488e650d9746d7653f67b036c52da3caf1f212 SHA1 5c8b43c98bde4b170325188540f91702d71acec2 SHA256 96ca4d807ef998c96dfa043a8cc30a36ff358fb4516cdb41bf7cbd71c2c6e3a7
+DIST swt-3.5.1-gtk-linux-ppc.zip 4945691 RMD160 2bf8cecad4297c66d98cd1d6dd80a6a60429779c SHA1 59d1e8434e41b299b8c2ab4df557af4ebb64dcb6 SHA256 574d1f1f8f8a70f0f9df0d95d63477ec7fe8921e122b7d00b6ad7ae2c577d153
+DIST swt-3.5.1-gtk-linux-x86.zip 4879027 RMD160 2b0723130751a700bbe14004587a5a4f801a07df SHA1 654744a3a2bc7eadfd807d2f1238580ac31571ee SHA256 83d1c457129c6722669ce9d7b4b1cb3511273e069c0dab5ae767b7d1c76e5815
+DIST swt-3.5.1-gtk-linux-x86_64.zip 5067404 RMD160 e2468e864ff5da4d41834125f34adb616d4dfb41 SHA1 a2fadf02fad5553c37afb219daebbb4ccca2d6c4 SHA256 99bf7403e4f49ae56c073be582478a1bc4d9f79583f02e0d7a021f8ee71576ce
 EBUILD swt-3.3.1.1-r1.ebuild 5851 RMD160 03097145b518eb5268b824dc42d7fdaa6092d47e SHA1 8ab01943694aeeef1d9f68e7563dd9837e7ce2c8 SHA256 d6e4b159a473dbab54ec3e45cde91e22163c2244e7d19ff9756b7de7c291f212
 EBUILD swt-3.3.1.1.ebuild 6109 RMD160 daec9f9891b431a63191ebf80e5b7fcfa8a4abb1 SHA1 825c5d80258547bb4d076a8719bfc5f1f2092d21 SHA256 e8d203fef1f129c3a4222e870d8c377729399d0cef45e0bd1c4e6ba87f00b76e
 EBUILD swt-3.4-r2.ebuild 6120 RMD160 6ebeda7ba7a5501cb2bcc6dc9d4399629b4b0c3a SHA1 2feb7e28317486276e61c39c7ae298e07e74bf82 SHA256 c44f60b60d5181d9f5351d521e086ec710dc3478bc8be7458aad007ff6a4673b
 EBUILD swt-3.4-r4.ebuild 6200 RMD160 4fbcb626d08d0e0aea4951b5a2f09af5978b7775 SHA1 40649ebbe24f89e29dd86065e23a61b7f2a89433 SHA256 9c3d75555ec637a33aa41c4c18244e3aa53b58845dc6b15922bb57e0e1c696c7
+EBUILD swt-3.5.1.ebuild 5905 RMD160 9f20a6a939f1d3e4e5519f5f9b8d2f5436e3fd2f SHA1 d98370fc91f96aad09fbafeda2bd8630919d77e6 SHA256 c1decc54c964c67dbde0d2c32cc2c79f98f8b68b927681a0f6837c02b08f82db
 EBUILD swt-3.5.ebuild 5901 RMD160 c5a5be3d217042dcbd4b45dba9148a1048888b9a SHA1 0ef89d3dfec5c5741ccf1f61710ef6c42540efa6 SHA256 585f8420d5d14308204599270eea2b9de90dd87147c224ba04dcc2df7cfc6404
-MISC ChangeLog 19505 RMD160 b92597052f9ba942f19877c2b1c59a77a1fdc0eb SHA1 a91cb632484e11ad8f525673c3b6bb06f099e011 SHA256 bd5639307122976af3b2d48b8610f769300090766eed1c5a8c4fadb53481631e
+MISC ChangeLog 19618 RMD160 abe8d26a4ac0daf42b956efad60ad76920929fc5 SHA1 e0515038efe52bc0900d48b36a8d84945bc2d005 SHA256 dcb4a2ca3fb0eb65a9636d7ba42d26308e61a16340dbc29ac24178167e3d6d31
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrxiOsACgkQkKaRLQcq0GK8jwCgjw5sno4arosBWnUWjY+dmcEZ
-5/QAnA1WJn9p6f8Otn7soneMiJS4BhMs
-=DmMC
------END PGP SIGNATURE-----
diff --git a/dev-java/swt/swt-3.5.1.ebuild b/dev-java/swt/swt-3.5.1.ebuild
new file mode 100644
index 000000000000..92ba3869f668
--- /dev/null
+++ b/dev-java/swt/swt-3.5.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.5.1.ebuild,v 1.1 2009/11/05 20:42:22 caster Exp $
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-200909170800"
+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.5"
+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
+
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-proto/xextproto
+		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
+}
+
+src_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.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}-3.5-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
+}