OSGi compliant version, swt version bump to 3.3.1.1

Package-Manager: portage-2.1.3.19

5 files changed, 265 insertions, 5 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 079e7fde11fa..3d6dbece6089 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.78 2008/01/09 22:32:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.79 2008/01/15 12:33:46 elvanor Exp $
+
+*swt-3.3.1.1 (15 Jan 2008)
+
+  15 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/swt-3.3-manifest, +swt-3.3.1.1.ebuild:
+  OSGi compliant version, bump to 3.3.1.1
 
   09 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   -files/swt-3.2-cairo-signedness-x86_64.patch, -files/swt-3.2.1-fbsd.patch,
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 4b83784829d1..75409cc4a7f9 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -6,17 +6,28 @@ AUX swt-3.3-callback-pointer-dereferencing.patch 882 RMD160 dbdd182d3c5093a0a269
 MD5 870ebea6385f5161df108d610214c519 files/swt-3.3-callback-pointer-dereferencing.patch 882
 RMD160 dbdd182d3c5093a0a26994fc6cde4a3e597091ea files/swt-3.3-callback-pointer-dereferencing.patch 882
 SHA256 27c4120bdcc4bb8f5a65d7c85343ee185c6270366c9f9a3cfc530838b5378cab files/swt-3.3-callback-pointer-dereferencing.patch 882
+AUX swt-3.3-manifest 752 RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 SHA1 73a334d10776a77d32b76e63d7bed59b77c0efbb SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae
+MD5 337ef0347cb722d8c0d40a1f5167e1d2 files/swt-3.3-manifest 752
+RMD160 024e2ace2caa4871b3ec07f7adf853fdbaad91c5 files/swt-3.3-manifest 752
+SHA256 f0c98cefd1ddebe0a5a0c15558edba16b00a3ecc910a3fb0a52babb56fd72dae files/swt-3.3-manifest 752
 DIST swt-3.3-gtk-linux-ppc.zip 4514372 RMD160 45401f9491d195f2f75670670b9bff0a67c3a39c SHA1 3fc7f04ffa73c712bcb3a0f2f41386d9fcebc92a SHA256 25342ec0205f90ecdec90a0f04855674c4f0e1ffda433c6023c65f5565c58f5a
 DIST swt-3.3-gtk-linux-x86.zip 4448296 RMD160 5b1e22a51418300cafe3df4794be258d13ed3321 SHA1 020983352a606ad24738cdaf47360b897efbc856 SHA256 08a3b6329c878c99025e9c9b530b65c4315a37ce52e796e89ae6dc62269df163
 DIST swt-3.3-gtk-linux-x86_64.zip 4622274 RMD160 f94b244dbda7b2aca7b9b554f2e3aad106fa6d0c SHA1 97a71cad4c822f5671cbaae278f09d0ea7e0a936 SHA256 f4357ed778da7f0b91b08b0ed67fe2bc907a2c6a1b5808442f6390f56fa85b50
+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
+EBUILD swt-3.3.1.1.ebuild 5915 RMD160 4314bf8d252bb47a944b977245686bc1748b4981 SHA1 c233ddb5fc83b997dff9d1b0640cc076e83c5303 SHA256 9063f6e57e9eb62ae6d7afc71d1d409f32b61d608857d1f38f27ded1f4dea25d
+MD5 230636de9d124ce852b19cdd50b4ce59 swt-3.3.1.1.ebuild 5915
+RMD160 4314bf8d252bb47a944b977245686bc1748b4981 swt-3.3.1.1.ebuild 5915
+SHA256 9063f6e57e9eb62ae6d7afc71d1d409f32b61d608857d1f38f27ded1f4dea25d swt-3.3.1.1.ebuild 5915
 EBUILD swt-3.3.ebuild 6277 RMD160 f7e2389ed8ee96617e37d16f61224d0cf3509e42 SHA1 f3fc96e8578c529a1d6abea380d88ec4f4ad3bc2 SHA256 96462ca61d531395a937ccf4d38e68bad53a0c546a7b165400c24147e9a5aa9c
 MD5 bfc260e6b3d54f8097bd029538e464f9 swt-3.3.ebuild 6277
 RMD160 f7e2389ed8ee96617e37d16f61224d0cf3509e42 swt-3.3.ebuild 6277
 SHA256 96462ca61d531395a937ccf4d38e68bad53a0c546a7b165400c24147e9a5aa9c swt-3.3.ebuild 6277
-MISC ChangeLog 13749 RMD160 c660886c5569b30e2416fac5b6a409c1c2b4ea9e SHA1 9fd1960132de135f821396aec3714dc298367682 SHA256 d00f9f2970d869fe218a32e86890f3bf5ca4d5bd9eada3a6400a4b50e18b43ef
-MD5 21ee7136dbea6fee8506a514463636c0 ChangeLog 13749
-RMD160 c660886c5569b30e2416fac5b6a409c1c2b4ea9e ChangeLog 13749
-SHA256 d00f9f2970d869fe218a32e86890f3bf5ca4d5bd9eada3a6400a4b50e18b43ef ChangeLog 13749
+MISC ChangeLog 13926 RMD160 4dd6b7edced9300ff1a39e03c9ebb67489c7130c SHA1 46676e485382492985c7fd1cc50a5c0f46df8444 SHA256 13840bef0d9b1354a019e968ed514670336a33635245156cc1f11a8c986580f5
+MD5 51877d68ce0805c19a353d9c85a5c049 ChangeLog 13926
+RMD160 4dd6b7edced9300ff1a39e03c9ebb67489c7130c ChangeLog 13926
+SHA256 13840bef0d9b1354a019e968ed514670336a33635245156cc1f11a8c986580f5 ChangeLog 13926
 MISC metadata.xml 440 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 SHA1 4d2c6b9b3c860ebd97f431ebae1a73773569c0fa SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8
 MD5 8a0e1d1eedbd5a4bdd34889f6fbbf9da metadata.xml 440
 RMD160 36ab97c0b5fbe32d4e636e3edb8c4d9e77b2ce34 metadata.xml 440
@@ -24,3 +35,6 @@ SHA256 c09c2804231b54df222f2380cc75d96db4febd9cc5d838e7fb1eb27dc75a53b8 metadata
 MD5 fd7bfdd284019706ad24e37f61699813 files/digest-swt-3.3 786
 RMD160 c2431c272de4377699bd5a756ae10fd05f872eac files/digest-swt-3.3 786
 SHA256 4233ea9e6027d96b896f86253b85660fca71ecc2df5553e163a6c6b0e62afb8d files/digest-swt-3.3 786
+MD5 bc64655e5425d15ca7b9f201d918f9b1 files/digest-swt-3.3.1.1 822
+RMD160 09c0fa554d83be89872d3135091398dfe8f1f9da files/digest-swt-3.3.1.1 822
+SHA256 a7672fdf8bc77b6cae2a01e7a5f0b5487e192568fee33643840607668852c482 files/digest-swt-3.3.1.1 822
diff --git a/dev-java/swt/files/digest-swt-3.3.1.1 b/dev-java/swt/files/digest-swt-3.3.1.1
new file mode 100644
index 000000000000..86aad218b330
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.3.1.1
@@ -0,0 +1,9 @@
+MD5 207fccf1ee525025f393cf337599f55d swt-3.3.1.1-gtk-linux-ppc.zip 4517854
+RMD160 026315045217f20d4a69120c5214003efacdf332 swt-3.3.1.1-gtk-linux-ppc.zip 4517854
+SHA256 6c1cf5607facd1fd6f684c39d9a99db9739e984c1b4e5d81d9500236d4ff2cdc swt-3.3.1.1-gtk-linux-ppc.zip 4517854
+MD5 f859fac5f9ee4f426e372e14856019e8 swt-3.3.1.1-gtk-linux-x86.zip 4451797
+RMD160 86a44dd3dd6f38b75a20de4a3fe98db38f163c9d swt-3.3.1.1-gtk-linux-x86.zip 4451797
+SHA256 5d4a7a524990aed7180fa954abfa5ed610dbead796e91677ca5274fbcd6b9dac swt-3.3.1.1-gtk-linux-x86.zip 4451797
+MD5 9be9b542fed32bb8057fd05c84261e88 swt-3.3.1.1-gtk-linux-x86_64.zip 4625538
+RMD160 3bbece2ca1820ea7a5b3b10dc637b62f69fe0dc8 swt-3.3.1.1-gtk-linux-x86_64.zip 4625538
+SHA256 8f153de11f84d7259dbaf5425a54d4c92858b981cacbb38d3c28b7ced8c138d5 swt-3.3.1.1-gtk-linux-x86_64.zip 4625538
diff --git a/dev-java/swt/files/swt-3.3-manifest b/dev-java/swt/files/swt-3.3-manifest
new file mode 100644
index 000000000000..2a0f5c897586
--- /dev/null
+++ b/dev-java/swt/files/swt-3.3-manifest
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 3.3.0
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
+Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
+ org.eclipse.swt.internal.cairo; x-internal:=true,
+ org.eclipse.swt.internal.cde; x-internal:=true,
+ org.eclipse.swt.internal.gnome; x-internal:=true,
+ org.eclipse.swt.internal.gtk; x-internal:=true,
+ org.eclipse.swt.internal.mozilla; x-internal:=true,
+ org.eclipse.swt.internal.opengl.glx; x-internal:=true
\ No newline at end of file
diff --git a/dev-java/swt/swt-3.3.1.1.ebuild b/dev-java/swt/swt-3.3.1.1.ebuild
new file mode 100644
index 000000000000..7dc2af1eeb6a
--- /dev/null
+++ b/dev-java/swt/swt-3.3.1.1.ebuild
@@ -0,0 +1,215 @@
+# 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.1 2008/01/15 12:33:46 elvanor Exp $
+
+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}-200710231652"
+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
+		)"
+
+SLOT="3"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE="cairo firefox 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? ( !firefox? ( !xulrunner? (
+			>=www-client/seamonkey-1.0.2
+			>=dev-libs/nspr-4.6.2
+		) ) )
+		firefox? ( !xulrunner? (
+			>=www-client/mozilla-firefox-2
+			>=dev-libs/nspr-4.6.2
+		) )
+		xulrunner? (
+			net-libs/xulrunner
+			>=dev-libs/nspr-4.6.2
+		)
+		opengl?	(
+			virtual/opengl
+			virtual/glu
+		)"
+DEPEND=">=virtual/jdk-1.4
+		app-arch/unzip
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-proto/xextproto
+		${COMMON}"
+
+# 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() {
+	local DISTFILE="${A}"
+	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/ || 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 firefox && gecko="firefox"
+	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"
+	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' ]] && 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}"
+		#local idir="$(pkg-config ${gecko}-xpcom --variable=includedir)"
+		local inc="$(pkg-config ${gecko}-xpcom --cflags)"
+		local libs="$(pkg-config ${gecko}-xpcom --libs)"
+		MOZILLA_INCLUDES="${inc}" \
+		MOZILLA_LIBS="${libs}" \
+			${make} make_mozilla || die "Failed to build ${gecko} support"
+		if [[ "${gecko}" = "xulrunner" ]]; then
+			XULRUNNER_INCLUDES="${inc}" \
+			XULRUNNER_LIBS="${libs}" \
+				${make} make_xulrunner || die "Failed to build ${gecko} support"
+		fi
+	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.3-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 [[ -n "${gecko}" ]]; then
+		local gecko_dir="$(pkg-config ${gecko}-xpcom --variable=libdir)"
+		java-pkg_register-environment-variable MOZILLA_FIVE_HOME "${gecko_dir}"
+	fi
+
+	dohtml about.html || die
+}