summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-09-14 18:17:56 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-09-14 18:17:56 +0000
commitca89e0ff720aa3b2ef9f524a41cfb418a0a55d56 (patch)
tree1a4afb7ca10d5662774e4b78ef823f61e5a0c92c /dev-java/swt
parentRemove eutils and autotools, since patching section is gone (diff)
downloadgentoo-2-ca89e0ff720aa3b2ef9f524a41cfb418a0a55d56.tar.gz
gentoo-2-ca89e0ff720aa3b2ef9f524a41cfb418a0a55d56.tar.bz2
gentoo-2-ca89e0ff720aa3b2ef9f524a41cfb418a0a55d56.zip
Removed forced dependency on 1.4. Cleaned up whitespace.
(Portage version: 2.1.1)
Diffstat (limited to 'dev-java/swt')
-rw-r--r--dev-java/swt/ChangeLog5
-rw-r--r--dev-java/swt/swt-3.2-r1.ebuild23
2 files changed, 15 insertions, 13 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog
index eb3f15c23f65..1c06392ff2f7 100644
--- a/dev-java/swt/ChangeLog
+++ b/dev-java/swt/ChangeLog
@@ -1,6 +1,9 @@
# 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.41 2006/08/28 17:47:47 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.42 2006/09/14 18:17:56 nichoj Exp $
+
+ 14 Sep 2006; Joshua Nichols <nichoj@gentoo.org> swt-3.2-r1.ebuild:
+ Removed forced dependency on 1.4. Cleaned up whitespace.
28 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.2-r1.ebuild:
Use distributed version.txt and SWTMessages.properties
diff --git a/dev-java/swt/swt-3.2-r1.ebuild b/dev-java/swt/swt-3.2-r1.ebuild
index accb14df111e..d309db22bef3 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.3 2006/08/28 17:47:47 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2-r1.ebuild,v 1.4 2006/09/14 18:17:56 nichoj Exp $
inherit eutils java-pkg-2
@@ -10,8 +10,8 @@ MY_VERSION="3.2"
DESCRIPTION="GTK based SWT Library"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="x86? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86.zip )
- amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86_64.zip )
- ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-ppc.zip )"
+ amd64? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-x86_64.zip )
+ ppc? ( http://download.eclipse.org/downloads/drops/${MY_DMF}/swt-${MY_VERSION}-gtk-linux-ppc.zip )"
SLOT="3"
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
@@ -42,13 +42,12 @@ COMMON=">=dev-libs/glib-2.6
virtual/opengl
virtual/glu
)"
-DEPEND="=virtual/jdk-1.4*
+DEPEND=">=virtual/jdk-1.5
${COMMON}
- >=dev-util/pkgconfig-0.9
- dev-java/ant-core
- app-arch/unzip"
-RDEPEND="=virtual/jre-1.4*
- ${COMMON}"
+ dev-java/ant-core
+ app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5
+ ${COMMON}"
S="${WORKDIR}"
@@ -121,9 +120,9 @@ src_compile() {
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"
+ -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"