fix up some minor issues, migrate useflags from mozilla to seamonkey

Package-Manager: portage-2.1.1_rc1-r1

4 files changed, 24 insertions, 18 deletions

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index b747e254308e..817b4e57f904 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.39 2006/08/27 17:56:25 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.40 2006/08/27 23:32:56 compnerd Exp $
+
+  27 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org> files/build.xml,
+  swt-3.2-r1.ebuild:
+  migrate mozilla to seamonkey in useflags, update build.xml
 
   27 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   -files/swt-cairo-0.9.2-amd64.patch, -files/swt-cairo-0.9.2.patch,
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index b14198e1143e..639a95391098 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -2,10 +2,10 @@ AUX SWTMessages.properties 2116 RMD160 84fb8d013eb130e99f97ee8f391e9f4aaf0b2049
 MD5 defc2c8e41e34436005ecd1d7ffadbf4 files/SWTMessages.properties 2116
 RMD160 84fb8d013eb130e99f97ee8f391e9f4aaf0b2049 files/SWTMessages.properties 2116
 SHA256 cd8498c1b97d68c2456a967cd9feb95d70719ed3e38244a6c952e64f93a73a22 files/SWTMessages.properties 2116
-AUX build.xml 476 RMD160 c2cd2ce905d85c464f03cd71478cde8d84344aa1 SHA1 773e8fda2c2bd1eb435cbf2c6e786c7b1e79d8ae SHA256 9a329f77f4df1a7cd6c185a9e37836edfcffd47c2837cda22d1888dee3d356e3
-MD5 c964f0ff0b83afdfd76d872821540574 files/build.xml 476
-RMD160 c2cd2ce905d85c464f03cd71478cde8d84344aa1 files/build.xml 476
-SHA256 9a329f77f4df1a7cd6c185a9e37836edfcffd47c2837cda22d1888dee3d356e3 files/build.xml 476
+AUX build.xml 458 RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 SHA1 3d5befea18ba4c5bc20da80ed067488a16be6585 SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7
+MD5 f5e548bc26a0f1f3c18131be76face40 files/build.xml 458
+RMD160 a8eb69b723bdd8e5e25df8df26d28f4ea134fa87 files/build.xml 458
+SHA256 bbac0fb3bf9454b81e6d27dae4ebb9538cf62f2be17adcf169538749230dc8e7 files/build.xml 458
 AUX swt-3.2-cairo-signedness-x86.patch 494 RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e SHA1 496583f3790ce4cb367d1eb2b476904b5eb6f0a8 SHA256 7b3dadc1ae0792966d98d0510456c6f2db2214b65a20720c87e7c54745d10809
 MD5 a0a38db824d740f3fdddf1e06674effc files/swt-3.2-cairo-signedness-x86.patch 494
 RMD160 4e4d5a77ee451806710b8678a97d75258cf18e4e files/swt-3.2-cairo-signedness-x86.patch 494
@@ -28,18 +28,18 @@ EBUILD swt-3.1-r1.ebuild 5134 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 SH
 MD5 b4b7d6f6a73cc928573c5059606ed87c swt-3.1-r1.ebuild 5134
 RMD160 3c554f5fdd1c0c8ab974a6879c331e771e9093b5 swt-3.1-r1.ebuild 5134
 SHA256 cf3dcba06645c17931a76cceed12b4b9fa7c5342efe8607fadb1237ba9193f54 swt-3.1-r1.ebuild 5134
-EBUILD swt-3.2-r1.ebuild 5048 RMD160 e7970b04fbb25bca0191046e0a0a713e6e542dae SHA1 b921d76777935a7a75dd2c71bd5820143f788df8 SHA256 b1237d55cc17b8d5f353a97b69338bf7bb7c07f27047649bf799a9b6e27148da
-MD5 e8145445299494e2bd0d53b5a333ca67 swt-3.2-r1.ebuild 5048
-RMD160 e7970b04fbb25bca0191046e0a0a713e6e542dae swt-3.2-r1.ebuild 5048
-SHA256 b1237d55cc17b8d5f353a97b69338bf7bb7c07f27047649bf799a9b6e27148da swt-3.2-r1.ebuild 5048
+EBUILD swt-3.2-r1.ebuild 5174 RMD160 9b245762411e24de627d3c09fb05dfb33032e666 SHA1 cb81c0cedfee359bd3123285a83e1b65fbfa821a SHA256 d9a0d734394cd67f5221098abf7f554c8a872114294a567c0b5aaf2bba3513df
+MD5 0b44280b933c07c16a97a7f6424acaef swt-3.2-r1.ebuild 5174
+RMD160 9b245762411e24de627d3c09fb05dfb33032e666 swt-3.2-r1.ebuild 5174
+SHA256 d9a0d734394cd67f5221098abf7f554c8a872114294a567c0b5aaf2bba3513df swt-3.2-r1.ebuild 5174
 EBUILD swt-3.2.ebuild 5016 RMD160 9b0764a9276b1301954ba578277a499a9dc22434 SHA1 977f626bbd53748aa752b2538942c28b42d9c7a4 SHA256 96fd3ef49716b980f5d424666d6d4c47caf3a4ace63c4e2e37a9f76c7534c166
 MD5 a43588bf08f3a460fd4fa7321dbb181d swt-3.2.ebuild 5016
 RMD160 9b0764a9276b1301954ba578277a499a9dc22434 swt-3.2.ebuild 5016
 SHA256 96fd3ef49716b980f5d424666d6d4c47caf3a4ace63c4e2e37a9f76c7534c166 swt-3.2.ebuild 5016
-MISC ChangeLog 7061 RMD160 009c49ae9813a3fc249277808845dd0c7e843b10 SHA1 e954dba658fc5219da149f10d585ebfc58cc9b94 SHA256 6a57f754969dc4bbf029fcb4fc084b3679c1ec20f98fe559f7988e3e0e5f090b
-MD5 5daa40d305b91f6e4febdb8dd36c7faa ChangeLog 7061
-RMD160 009c49ae9813a3fc249277808845dd0c7e843b10 ChangeLog 7061
-SHA256 6a57f754969dc4bbf029fcb4fc084b3679c1ec20f98fe559f7988e3e0e5f090b ChangeLog 7061
+MISC ChangeLog 7217 RMD160 c6c9097440435cbdb178479f219e117d27721d7f SHA1 8e869727c4e3233e8c7842685bf2c69fa71645bc SHA256 6d2d7b474cf34aac5d28a93338d65ed408c47948b83e30b45ef31ed74919f144
+MD5 81bb1956de81cbc29e3b667708559b83 ChangeLog 7217
+RMD160 c6c9097440435cbdb178479f219e117d27721d7f ChangeLog 7217
+SHA256 6d2d7b474cf34aac5d28a93338d65ed408c47948b83e30b45ef31ed74919f144 ChangeLog 7217
 MISC metadata.xml 541 RMD160 33bb464b6275a77003697575eb0b7489136b8c3a SHA1 d8f32b4f5af20f823913c2568f104eb152e265ab SHA256 8b1a4fe91adab457d55e0ba84ad35f19c39a0fea87ac552168bd9cbe3c796aa7
 MD5 5ea14ff7e96eeb0ce1c8a161b7f1ce3f metadata.xml 541
 RMD160 33bb464b6275a77003697575eb0b7489136b8c3a metadata.xml 541
diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
index ce887a77850c..ea775871bf09 100644
--- a/dev-java/swt/files/build.xml
+++ b/dev-java/swt/files/build.xml
@@ -11,7 +11,7 @@
       <javac srcdir="${src}" destdir="${build}"/>
    </target>
 
-   <target name="jar" depends="compile">
+   <target name="jar">
       <jar destfile="swt.jar" basedir="${build}"/>
    </target>
 </project>
diff --git a/dev-java/swt/swt-3.2-r1.ebuild b/dev-java/swt/swt-3.2-r1.ebuild
index 593f1068355f..75cffa40c85e 100644
--- a/dev-java/swt/swt-3.2-r1.ebuild
+++ b/dev-java/swt/swt-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2-r1.ebuild,v 1.1 2006/08/27 17:42:30 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2-r1.ebuild,v 1.2 2006/08/27 23:32:56 compnerd Exp $
 
 inherit eutils java-pkg-2
 
@@ -17,7 +17,7 @@ SLOT="3"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="cairo gnome mozilla opengl"
+IUSE="cairo gnome seamonkey opengl"
 COMMON=">=dev-libs/glib-2.6
 		>=x11-libs/gtk+-2.6.8
 		>=dev-libs/atk-1.10.2
@@ -34,7 +34,7 @@ COMMON=">=dev-libs/glib-2.6
 					=gnome-base/gnome-vfs-2*
 					=gnome-base/libgnomeui-2*
 				)
-		mozilla? (
+		seamonkey? (
 					>=www-client/seamonkey-1.0.2
 					>=dev-libs/nspr-4.6.2
 				)
@@ -118,11 +118,13 @@ src_compile() {
 		emake -f make_linux.mak make_gnome || die "Failed to build GNOME VFS support"
 	fi
 
-	if use mozilla ; then
+	if use seamonkey ; then
+		export GECKO_SDK="$(pkg-config seamonkey-xpcom --variable=libdir)"
 		export GECKO_INCLUDES="-I/usr/$(get_libdir)/seamonkey/include/xpcom \
 							   -I/usr/include/nspr \
 							   -I/usr/$(get_libdir)/seamonkey/include/embed_base \
 							   -I/usr/$(get_libdir)/seamonkey/include/string"
+		export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
 
 		einfo "Building the Mozilla component"
 		emake -f make_linux.mak make_mozilla || die "Failed to build Mozilla support"