Remove old cruft. Add version bump from upstream, support for CAIRO 0.9.2 in new version. Update metadata

Package-Manager: portage-2.0.51.22-r2

12 files changed, 228 insertions, 129 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index aed8c218f91a..8bd1eead2466 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.22 2005/08/06 18:03:31 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.23 2005/08/17 08:26:18 compnerd Exp $
+
+*swt-3.2_pre1 (17 Aug 2005)
+
+  17 Aug 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/swt-cairo-0.9.2.patch, -files/build-3.1_pre7.xml,
+  -files/build-3.1.xml, files/build.xml, -files/cairo.patch, metadata.xml,
+  -swt-3.1.ebuild, swt-3.1-r1.ebuild, +swt-3.2_pre1.ebuild:
+  Clean up the old version cruft.  Add new version from upstream.  Support for
+  CAIRO 0.9.2
 
 *swt-3.1-r1 (06 Aug 2005)
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 3405d24a48eb..506caef4cd4a 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,11 +1,9 @@
-MD5 cf0a300d2250cd00fdde899a831bb9c9 swt-3.1-r1.ebuild 5300
-MD5 b2c35bb6b0cf63b52f8f2b09135df879 ChangeLog 4067
-MD5 4dcb6dd494f5e369aed5a367e303aef4 metadata.xml 433
-MD5 76eb2c89532870f7e90b064d8f26d739 swt-3.1.ebuild 5202
-MD5 c964f0ff0b83afdfd76d872821540574 files/build-3.1_pre7.xml 476
+MD5 e3ef05c80819dea145867ba03dfeaa51 swt-3.1-r1.ebuild 5294
+MD5 6a556f9ab96f89ef2224bc394f55dcdc ChangeLog 4440
+MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541
+MD5 a9a6f652685f34fbf8c5e6dfa51a4d9d swt-3.2_pre1.ebuild 5374
 MD5 ad4aa305806513ab198281b6e485fbbc files/SWTMessages.properties 2085
-MD5 bb61f479853836959ad766e10161e80a files/build.xml 2106
+MD5 42ff33c44d5ec749f8b5fe4f1155fa8b files/swt-cairo-0.9.2.patch 5725
+MD5 c964f0ff0b83afdfd76d872821540574 files/build.xml 476
 MD5 4d4ba9daee2ceef312b8e18be3ab70ed files/digest-swt-3.1-r1 216
-MD5 c964f0ff0b83afdfd76d872821540574 files/build-3.1.xml 476
-MD5 f33d8fd0bacf2ed4f835b70f6f7836b4 files/cairo.patch 302
-MD5 4d4ba9daee2ceef312b8e18be3ab70ed files/digest-swt-3.1 216
+MD5 7ee7a8d75ee15448b3f9e27aab62bb99 files/digest-swt-3.2_pre1 222
diff --git a/dev-java/swt/files/build-3.1.xml b/dev-java/swt/files/build-3.1.xml
deleted file mode 100644
index ce887a77850c..000000000000
--- a/dev-java/swt/files/build-3.1.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/dev-java/swt/files/build-3.1_pre7.xml b/dev-java/swt/files/build-3.1_pre7.xml
deleted file mode 100644
index ce887a77850c..000000000000
--- a/dev-java/swt/files/build-3.1_pre7.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
index 54cb6ec7e00c..ce887a77850c 100644
--- a/dev-java/swt/files/build.xml
+++ b/dev-java/swt/files/build.xml
@@ -1,4 +1,4 @@
-<project name="SWT" default="jar_all" basedir=".">
+<project name="SWT" default="jar" basedir=".">
    <property name="src" location="."/>
    <property name="build" location="build"/>
 
@@ -11,48 +11,7 @@
       <javac srcdir="${src}" destdir="${build}"/>
    </target>
 
-   <target name="jar_cairo" depends="compile">
-      <jar destfile="swt-cairo.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal/cairo"/>
-      </jar>
+   <target name="jar" depends="compile">
+      <jar destfile="swt.jar" basedir="${build}"/>
    </target>
-
-   <target name="jar_mozilla" depends="compile">
-      <jar destfile="swt-mozilla.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal/mozilla"/>
-      </jar>
-   </target>
-   
-   <target name="jar_swt-pi" depends="compile">
-      <jar destfile="swt-pi.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal">
-            <include name="Library.class"/>
-            <include name="Lock.class"/>
-            <include name="Platform.class"/>
-         </fileset>
-         <fileset dir="${build}/org/eclipse/swt/internal/accessibility"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/cde"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/gnome"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/gtk"/>
-         <fileset dir="${build}/org/eclipse/swt/internal/kde"/>
-      </jar>
-   </target>
-   
-   <target name="jar_swt" depends="compile">
-      <jar destfile="swt.jar" basedir="${build}">
-         <fileset dir="${build}/org/eclipse/swt/internal">
-            <exclude name="Library.class"/>
-            <exclude name="Lock.class"/>
-            <exclude name="Platform.class"/>
-            <exclude name="accessibility/**/*"/>
-            <exclude name="cairo/**/*"/>
-            <exclude name="cde/**/*"/>
-            <exclude name="gnome/**/*"/>
-            <exclude name="gtk/**/*"/>
-            <exclude name="kde/**/*"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="jar_all" depends="jar_cairo,jar_mozilla,jar_swt-pi,jar_swt"/>
 </project>
diff --git a/dev-java/swt/files/cairo.patch b/dev-java/swt/files/cairo.patch
deleted file mode 100644
index d6fbc25b027f..000000000000
--- a/dev-java/swt/files/cairo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cairo.c.org	2005-02-14 16:57:48.000000000 -0600
-+++ cairo.c	      2005-03-26 00:20:17.000000000 -0600
-@@ -22,6 +22,7 @@
- #include "swt.h"
- #include "cairo_structs.h"
- #include "cairo_stats.h"
-+#include "cairo-xlib.h"
- 
- #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func
- 
diff --git a/dev-java/swt/files/digest-swt-3.1 b/dev-java/swt/files/digest-swt-3.1
deleted file mode 100644
index 21e67436fa42..000000000000
--- a/dev-java/swt/files/digest-swt-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a7d5f5f593e423f9aec7713c548f3817 swt-3.1-gtk-linux-x86.zip 2643472
-MD5 37907f265059d9853911fc9538743280 swt-3.1-gtk-linux-x86_64.zip 2702033
-MD5 6fa2922701a0e360e0035fd0363fcae8 swt-3.1-gtk-linux-ppc.zip 2525054
diff --git a/dev-java/swt/files/digest-swt-3.2_pre1 b/dev-java/swt/files/digest-swt-3.2_pre1
new file mode 100644
index 000000000000..458056a3b0c8
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.2_pre1
@@ -0,0 +1,3 @@
+MD5 907ad3012ec32beaa9662fcafb5aa669 swt-3.2M1-gtk-linux-x86.zip 2666543
+MD5 3c3cde2a01d3b59d57165b9fe0e6ed73 swt-3.2M1-gtk-linux-x86_64.zip 2725513
+MD5 c2d0daa2a480d2276e1f406ba28e57ed swt-3.2M1-gtk-linux-ppc.zip 2542441
diff --git a/dev-java/swt/files/swt-cairo-0.9.2.patch b/dev-java/swt/files/swt-cairo-0.9.2.patch
new file mode 100644
index 000000000000..ca202d94af64
--- /dev/null
+++ b/dev-java/swt/files/swt-cairo-0.9.2.patch
@@ -0,0 +1,169 @@
+===================================================================
+RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- cairo.c	2005/07/11 21:28:17	1.4
++++ cairo.c	2005/08/15 20:22:55	1.5
+@@ -254,6 +254,62 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1font_1options_1create
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1create)
++	(JNIEnv *env, jclass that)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1create_FUNC);
++	rc = (jint)cairo_font_options_create();
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1create_FUNC);
++	return rc;
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1destroy
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1destroy)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1destroy_FUNC);
++	cairo_font_options_destroy((cairo_font_options_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1destroy_FUNC);
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1get_1antialias
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1options_1get_1antialias)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1get_1antialias_FUNC);
++	rc = (jint)cairo_font_options_get_antialias((cairo_font_options_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1get_1antialias_FUNC);
++	return rc;
++}
++#endif
++
++#ifndef NO_cairo_1font_1options_1set_1antialias
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1font_1options_1set_1antialias)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1font_1options_1set_1antialias_FUNC);
++	cairo_font_options_set_antialias((cairo_font_options_t *)arg0, arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1font_1options_1set_1antialias_FUNC);
++}
++#endif
++
++#ifndef NO_cairo_1get_1antialias
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1antialias)
++	(JNIEnv *env, jclass that, jint arg0)
++{
++	jint rc = 0;
++	Cairo_NATIVE_ENTER(env, that, cairo_1get_1antialias_FUNC);
++	rc = (jint)cairo_get_antialias((cairo_t *)arg0);
++	Cairo_NATIVE_EXIT(env, that, cairo_1get_1antialias_FUNC);
++	return rc;
++}
++#endif
++
+ #ifndef NO_cairo_1get_1current_1point
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1current_1point)
+ 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+@@ -309,6 +365,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1get_1font_1options
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1get_1font_1options)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1get_1font_1options_FUNC);
++	cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1get_1font_1options_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1get_1line_1cap
+ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1line_1cap)
+ 	(JNIEnv *env, jclass that, jint arg0)
+@@ -972,12 +1038,14 @@
+ #endif
+ 
+ #ifndef NO_cairo_1reference
+-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1reference)
++JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1reference)
+ 	(JNIEnv *env, jclass that, jint arg0)
+ {
++	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1reference_FUNC);
+-	cairo_reference((cairo_t *)arg0);
++	rc = (jint)cairo_reference((cairo_t *)arg0);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1reference_FUNC);
++	return rc;
+ }
+ #endif
+ 
+@@ -1075,6 +1143,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1set_1antialias
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1antialias)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1set_1antialias_FUNC);
++	cairo_set_antialias((cairo_t *)arg0, arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1set_1antialias_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1set_1dash
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1dash)
+ 	(JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
+@@ -1123,6 +1201,16 @@
+ }
+ #endif
+ 
++#ifndef NO_cairo_1set_1font_1options
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1options)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1)
++{
++	Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1options_FUNC);
++	cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
++	Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1options_FUNC);
++}
++#endif
++
+ #ifndef NO_cairo_1set_1font_1size
+ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size)
+ 	(JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+@@ -1371,14 +1459,12 @@
+ #endif
+ 
+ #ifndef NO_cairo_1surface_1finish
+-JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1finish)
++JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1finish)
+ 	(JNIEnv *env, jclass that, jint arg0)
+ {
+-	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1finish_FUNC);
+-	rc = (jint)cairo_surface_finish((cairo_surface_t *)arg0);
++	cairo_surface_finish((cairo_surface_t *)arg0);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1finish_FUNC);
+-	return rc;
+ }
+ #endif
+ 
+@@ -1526,11 +1612,11 @@
+ 
+ #ifndef NO_cairo_1xlib_1surface_1create_1for_1bitmap
+ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create_1for_1bitmap)
+-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
++	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ {
+ 	jint rc = 0;
+ 	Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
+-	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, arg2, arg3);
++	rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
+ 	Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
+ 	return rc;
+ }
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index 7d4816e9e620..4a3caec7c169 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-SWT is the software component that delivers native widget functionality for the
-Eclipse platform in an operating system independent manner.  It is analogous to
-AWT/Swing in Java with a difference - SWT uses a rich set of native widgets. 
-</longdescription>
+	<herd>java</herd>
+	<maintainer>
+		<email>compnerd@gentoo.org</email>
+		<name>Saleem Abdulrasool</name>
+	</maintainer>
+	<longdescription>
+		SWT is the software component that delivers native widget functionality for the
+		Eclipse platform in an operating system independent manner.  It is analogous to
+		AWT/Swing in Java with a difference - SWT uses a rich set of native widgets. 
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/swt/swt-3.1-r1.ebuild b/dev-java/swt/swt-3.1-r1.ebuild
index c9fc9fc99f9e..80203ec52c14 100644
--- a/dev-java/swt/swt-3.1-r1.ebuild
+++ b/dev-java/swt/swt-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1-r1.ebuild,v 1.1 2005/08/06 18:03:31 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1-r1.ebuild,v 1.2 2005/08/17 08:26:18 compnerd Exp $
 
 inherit eutils java-pkg
 
@@ -72,7 +72,7 @@ src_unpack() {
 	rm -f .classpath .project
 
 	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die "Unable to update build.xml"
+	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"
 }
 
diff --git a/dev-java/swt/swt-3.1.ebuild b/dev-java/swt/swt-3.2_pre1.ebuild
index 9b81ea0e193e..79df53212900 100644
--- a/dev-java/swt/swt-3.1.ebuild
+++ b/dev-java/swt/swt-3.2_pre1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.1.ebuild,v 1.9 2005/07/18 17:54:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2_pre1.ebuild,v 1.1 2005/08/17 08:26:18 compnerd Exp $
 
 inherit eutils java-pkg
 
-MY_DMF="R-3.1-200506271435"
-MY_VERSION="3.1"
+MY_DMF="S-3.2M1-200508111530"
+MY_VERSION="3.2M1"
 
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
@@ -15,18 +15,19 @@ SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_V
 
 SLOT="3"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="accessibility cairo firefox gnome mozilla"
 RDEPEND=">=virtual/jre-1.4
 		 mozilla? (
-		 			 firefox? ( >=www-client/mozilla-firefox-1.0.3 )
+		 			 firefox? ( >=www-client/mozilla-firefox-1.0.6 )
 					!firefox? ( >=www-client/mozilla-1.4 )
 				  )
 		 gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
 		 cairo? ( >=x11-libs/cairo-0.3.0 )"
 DEPEND=">=virtual/jdk-1.4
 		${RDEPEND}
+		  dev-util/pkgconfig
 		  dev-java/ant-core
 		  app-arch/unzip"
 
@@ -56,7 +57,7 @@ src_unpack() {
 	fi
 
 	# Clean up the directory structure
-	for f in *; do
+	for f in $(ls); do
 		if [[ "${f}" != "src.zip" ]] ; then
 			rm -rf ${f}
 		fi
@@ -70,8 +71,13 @@ src_unpack() {
 	rm -rf about_files/
 	rm -f .classpath .project
 
+	# CARIO 0.9.2 API Patch
+	if has_version '>=x11-libs/cairo-0.9.2' ; then
+		epatch ${FILESDIR}/swt-cairo-0.9.2.patch
+	fi
+
 	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml || die "Unable to update build.xml"
+	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"
 }
 
@@ -97,27 +103,27 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == 'amd64' ]] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
 
-	echo "Building AWT library"
+	einfo "Building AWT library"
 	emake -f make_linux.mak make_awt || die "Failed to build AWT support"
 
-	echo "Building SWT library"
+	einfo "Building SWT library"
 	emake -f make_linux.mak make_swt || die "Failed to build SWT support"
 
 	if use accessibility ; then
-		echo "Building JAVA-AT-SPI bridge"
+		einfo "Building JAVA-AT-SPI bridge"
 		emake -f make_linux.mak make_atk || die "Failed to build ATK support"
 	fi
 
 	if use gnome ; then
-		echo "Building GNOME VFS support"
+		einfo "Building GNOME VFS support"
 		emake -f make_linux.mak make_gnome || die "Failed to build GNOME VFS support"
 	fi
 
 	if use mozilla ; then
 		if use firefox ; then
-			GECKO_SDK=/usr/lib/MozillaFirefox
+			GECKO_SDK="$(pkg-config firefox-xpcom --variable=libdir)"
 		else
-			GECKO_SDK=/usr/lib/mozilla
+			GECKO_SDK="$(pkg-config mozilla-xpcom --variable=libdir)"
 		fi
 
 		export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
@@ -130,23 +136,22 @@ src_compile() {
 						-I${GECKO_SDK}/include/embedstring -I${GECKO_SDK}/include/embedstring/include"
 		export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
 
-		echo "Building the Mozilla component"
+		einfo "Building the Mozilla component"
 		emake -f make_linux.mak make_mozilla || die "Failed to build Mozilla support"
 	fi
 
 	if use cairo ; then
-		echo "Building CAIRO support"
+		einfo "Building CAIRO support"
 		emake -f make_linux.mak make_cairo || die "Unable to build CAIRO support"
 	fi
 
-	echo "Building JNI libraries"
+	einfo "Building JNI libraries"
 	ant compile || die "Failed to compile JNI interfaces"
 
-	echo "Creating missing files"
-	echo "version 3.138" > ${S}/build/version.txt
+	einfo "Creating missing files"
 	cp ${FILESDIR}/SWTMessages.properties ${S}/build/org/eclipse/swt/internal/
 
-	echo "Packing JNI libraries"
+	einfo "Packing JNI libraries"
 	ant jar || die "Failed to create JNI jar"
 }