diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2006-08-27 23:32:56 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-08-27 23:32:56 +0000 |
| commit | 815d2dbed584395b3db42e85dc9763ca6e314576 (patch) | |
| tree | b907e184d7b69d6898663f111b367499e1d9bd07 /dev-java/swt | |
| parent | Marking amd64 stable (diff) | |
| download | gentoo-2-815d2dbed584395b3db42e85dc9763ca6e314576.tar.gz gentoo-2-815d2dbed584395b3db42e85dc9763ca6e314576.tar.bz2 gentoo-2-815d2dbed584395b3db42e85dc9763ca6e314576.zip | |
fix up some minor issues, migrate useflags from mozilla to seamonkey
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'dev-java/swt')
| -rw-r--r-- | dev-java/swt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/swt/files/build.xml | 2 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.2-r1.ebuild | 10 |
3 files changed, 12 insertions, 6 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/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" |