Revbump to hopefully fix bug #234934. Also dropped mozilla flag - use xulrunner lag to build the embedded browser.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64

3 files changed, 202 insertions, 2 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 7ee3c3420afb..cde4d95bfd30 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2008/07/31 09:11:56 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.91 2008/08/16 21:27:47 caster Exp $
+
+*swt-3.4-r1 (16 Aug 2008)
+
+  16 Aug 2008; Vlastimil Babka <caster@gentoo.org> +swt-3.4-r1.ebuild:
+  Revbump to hopefully fix bug #234934. Also dropped mozilla flag - use
+  xulrunner lag to build the embedded browser.
 
 *swt-3.4 (31 Jul 2008)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 1b90622b11da..807eb0183c2a 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -12,7 +12,8 @@ DIST swt-3.4M6-gtk-linux-ppc.zip 4579850 RMD160 70ac000cddce0d22c80a431226977afd
 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 5811 RMD160 571c9932609e7f74b4743d59708a98f79f845b2a SHA1 e14908adae9612f125181cc57fc3b7f9b1869f3f SHA256 cb0fd3bae40a58f49b5426926bed673a1e78ca0fb5a9eeabea9122aa66ff5ddb
+EBUILD swt-3.4-r1.ebuild 5362 RMD160 fbb647cac4dd55e4f7f8c4c1a8ff0c6eb96ca8cc SHA1 9f016b3a0bf24ed37b6a6cf767682b0ba1cea59d SHA256 5d0a32fcbde539d47d811cd26798eeb9ffa329d57822a651de715deaf9ce5737
 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 ChangeLog 16035 RMD160 3b1e4cecd65b0d903824df75fc56532c1cb88a02 SHA1 0985033dd171e9074b14098fef84a7485e82361e SHA256 569a46ad8dcfc633792845fb4ae93e87e353d94f113c6844c63401f3698af993
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
diff --git a/dev-java/swt/swt-3.4-r1.ebuild b/dev-java/swt/swt-3.4-r1.ebuild
new file mode 100644
index 000000000000..f78bb7b187f4
--- /dev/null
+++ b/dev-java/swt/swt-3.4-r1.ebuild
@@ -0,0 +1,193 @@
+# 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-r1.ebuild,v 1.1 2008/08/16 21:27:47 caster 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 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
+		)"
+
+# 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"
+}
+
+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
+
+	if use xulrunner ; then
+		einfo "Building the Mozilla component against xulrunner-1.9"
+
+		export MOZILLA_INCLUDES="$(pkg-config libxul --cflags)"
+		export MOZILLA_LIBS="$(pkg-config libxul --libs)"
+
+		${make} make_mozilla || die "Failed to build xulrunner 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
+
+	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
+}