Builds with 1.5, doesn't require mozilla anymore, installs .so files in a sensible...

diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index 260614686dcd50d078ee0f89583cbb5c3fd476d4..c8bf38c79a068a6ca470b18a80bab3666228429c 100644 (file)
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/swt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.4 2004/10/22 10:22:36 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.5 2004/10/31 20:07:24 karltk Exp $
+
+*swt-3.0-r1 (31 Oct 2004)
+
+  31 Oct 2004; Karl Trygve Kalleberg <karltk@gentoo.org> swt-3.0-r1.ebuild:
+  Now install *.so in /usr/lib. Can be built without mozilla in USE. 
+  Works with 1.5. 
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> swt-3.0.ebuild:
   Keywords ~amd64.

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 07fa7875285a15dbead9339ee6b91df75af7d82c..a88766bab64328f6604555b36b057b406dcd8d9f 100644 (file)
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,5 +1,7 @@
-MD5 65cca9e93dd2f22869e4140297d88331 ChangeLog 617
+MD5 d41dc2a84d1d9c0b098868d2e41e7ba0 swt-3.0.ebuild 3076
+MD5 9f4047480c5ad0f61d96e0987e97f93b swt-3.0-r1.ebuild 3079
+MD5 a689813e30571e30327f971004e1e41f ChangeLog 808
 MD5 4dcb6dd494f5e369aed5a367e303aef4 metadata.xml 433
-MD5 f599f1a6c679c9adc2ea00262a71dbef swt-3.0.ebuild 2857
+MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0-r1 67
 MD5 bb07a2eb9c04e5f3190e6743705062d7 files/build-3.0.xml 437
 MD5 9932fd2bc009c4a3fce8b5cc57214297 files/digest-swt-3.0 67

diff --git a/dev-java/swt/files/digest-swt-3.0-r1 b/dev-java/swt/files/digest-swt-3.0-r1
new file mode 100644 (file)
index 0000000..cedefab
--- /dev/null
+++ b/dev-java/swt/files/digest-swt-3.0-r1
@@ -0,0 +1 @@
+MD5 f2ebcfdb917bdd380dc1a3fb33da5936 swt-3.0-linux-gtk.zip 2228684

diff --git a/dev-java/swt/swt-3.0-r1.ebuild b/dev-java/swt/swt-3.0-r1.ebuild
new file mode 100644 (file)
index 0000000..4c9bdea
--- /dev/null
+++ b/dev-java/swt/swt-3.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0-r1.ebuild,v 1.1 2004/10/31 20:07:24 karltk Exp $
+
+inherit eutils java-pkg
+
+IUSE="gnome mozilla"
+DESCRIPTION="SWT library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0-200406251208/swt-3.0-linux-gtk.zip"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND=">=x11-libs/gtk+-2.2.4
+       mozilla? ( >=net-www/mozilla-1.5 )
+       gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
+DEPEND="${RDEPEND}
+       >=virtual/jdk-1.4
+       dev-java/ant
+       app-arch/unzip"
+
+src_unpack() {
+       mkdir ${S} && cd ${S}
+       unpack ${A}
+
+       # remove some files
+       rm -f *.so *.jar
+       use mozilla || rm -f swt-mozillasrc.zip
+
+       for i in *.zip
+       do
+               einfo "Unpacking ${i} to ${S}"
+               unzip ${i} &> /dev/null
+       done
+       use mozilla && mv library/xpcom.cpp ${S}
+
+       mkdir src && mv org src/
+       cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
+
+       sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
+
+       use mozilla ||
+               (
+               rm -rf ${S}/src/org/eclipse/swt/browser
+               rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
+               )
+}
+
+src_compile() {
+       if use gnome ; then
+           gnome_lib=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+       fi
+
+       gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+       atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
+
+       sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
+               -e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
+               -e "s:/mozilla/mozilla/1.6/linux_gtk2/mozilla/dist:$MOZILLA_FIVE_HOME:" \
+               -e "s:/usr/lib/mozilla-1.6:$MOZILLA_FIVE_HOME:" \
+               -e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
+               -e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
+               -e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
+               -e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+               -e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+               -e "s:-L\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME) -lgtkembedmoz:" \
+               -e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
+               -e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
+               make_gtk.mak > Makefile
+
+       make make_swt || die "Failed to build platform-independent SWT support"
+       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 mozilla ; then
+               einfo "Building Mozilla component"
+               make make_mozilla || die "Failed to build Mozilla support"
+       fi
+
+       einfo "Building java source"
+       ant jar
+}
+
+src_install() {
+       java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
+
+       exeinto /usr/lib
+       doexe *.so ${D}/usr/lib || die "Install of .so-files failed"
+
+       dohtml about.html
+}

diff --git a/dev-java/swt/swt-3.0.ebuild b/dev-java/swt/swt-3.0.ebuild
index c830b4c857c3daceb7d989e6afc02913ddf4cdb8..fd086c18f1f9bd1decfa2893e3a7b046163470ae 100644 (file)
--- a/dev-java/swt/swt-3.0.ebuild
+++ b/dev-java/swt/swt-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0.ebuild,v 1.3 2004/10/22 10:22:36 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.0.ebuild,v 1.4 2004/10/31 20:07:24 karltk Exp $
 
 inherit eutils java-pkg
 
@@ -37,6 +37,14 @@ src_unpack() {
 
        mkdir src && mv org src/
        cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
+
+       sed 's/<javac /<javac target="1.2" source="1.3" /' -i ${S}/build.xml
+
+       use mozilla ||
+               (
+               rm -rf ${S}/src/org/eclipse/swt/browser
+               rm -rf ${S}/src/org/eclipse/swt/internal/mozilla
+               )
 }
 
 src_compile() {
@@ -79,8 +87,10 @@ src_compile() {
 }
 
 src_install() {
-       java-pkg_dojar swt.jar || die "install failed."
-       install *.so ${D}/usr/share/${PN}/lib/ || die "install failed"
+       java-pkg_dojar swt.jar || die "Installation of swt.jar failed"
+
+       exeinto /usr/lib
+       doexe *.so ${D}/usr/lib || die "Install of .so-files failed"
 
        dohtml about.html
 }