Marked stable. Still won't work with CDT, but I'll work on that.

(Portage version: 2.0.51-r13)

10 files changed, 36 insertions, 42 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 23381025360c..af56e5febb14 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.78 2005/01/28 18:29:57 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.79 2005/02/03 11:09:50 karltk Exp $
+
+  03 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-3.0.1-r2.ebuild:
+  Marked stable on x86, so we'll see what happens.
+
+  01 Feb 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-3.1_pre4.ebuild:
+  Temporarily dropped firefox support.
 
   28 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> eclipse-sdk-3.0.1-r2.ebuild,
   eclipse-sdk-3.1_pre4.ebuild:
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
index a0b6117a9df9..f85e47da6731 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild,v 1.9 2004/11/26 15:30:45 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r5.ebuild,v 1.10 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
index 57318f52270f..9304c891b228 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild,v 1.9 2004/12/11 09:49:56 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild,v 1.10 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
index 9977b7f863db..1fc1ec635403 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild,v 1.3 2004/10/22 23:57:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r1.ebuild,v 1.4 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
index 4ec578b7f05d..6fcf4f3d5e40 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.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-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild,v 1.4 2005/01/28 17:54:31 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild,v 1.5 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
@@ -12,7 +12,7 @@ SRC_URI="http://download2.eclipse.org/downloads/drops/R-3.0.1-200409161125/${MY_
 IUSE="gtk motif gnome kde mozilla"
 SLOT="3"
 LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
 	gtk? ( >=x11-libs/gtk+-2.2.4 )
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
index 3d4d96da3d09..31a45d270071 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild,v 1.1 2004/09/18 08:32:57 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.1.ebuild,v 1.2 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
index e04420636ca3..6f488b401996 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild,v 1.2 2004/09/23 19:45:06 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre1.ebuild,v 1.3 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
index 289b7cdc2208..d14218d8e3d5 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild,v 1.1 2004/10/31 19:15:36 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre2.ebuild,v 1.2 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
index 9bb6857b6b0d..1c2b07685b13 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild,v 1.1 2004/11/06 19:25:39 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre3.ebuild,v 1.2 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild
index 441b1a69e6a9..7fb7870195c8 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.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-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild,v 1.2 2005/01/28 17:54:31 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1_pre4.ebuild,v 1.3 2005/02/03 11:09:50 karltk Exp $
 
 inherit eutils java-utils
 
@@ -82,10 +82,9 @@ src_unpack() {
 	einfo "Patching Motif frontend"
 	patch-motif-frontend
 
-	einfo "Setting build version in Help->About"
-	sed -e "s/@build@/Gentoo Linux ${PF}/" \
-		features/org.eclipse.platform/configuration.files/configuration/config.ini \
-		|| die "Failed to patch config.ini"
+	einfo "Set build version in Help->About"
+	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \; \
+		|| die "Failed to patch about.mappings"
 }
 
 src_compile() {
@@ -109,7 +108,7 @@ src_compile() {
 
 	einfo "Building resources.core plugin"
 	cd ${S}/${core_src_dir}
-	make JDK_INCLUDE="-I`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
+	make JDK_INCLUDE="`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
 	mkdir -p ${S}/"${core_dest_dir}"
 	mv *.so ${S}/"${core_dest_dir}"
 	cd ${S}
@@ -191,9 +190,9 @@ function detect-mozilla()
 	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
 		einfo "Compiling against net-www/mozilla"
 		mozilla_dir=/usr/lib/mozilla
-	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
-		einfo "Compiling against net-www/mozilla-firefox"
-		mozilla_dir=/usr/lib/MozillaFirefox
+#	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
+#		einfo "Compiling against net-www/mozilla-firefox"
+#		mozilla_dir=/usr/lib/MozillaFirefox
 	else
 		eerror "You need either Mozilla, compiled against gtk+ v2.0 or newer"
 		eerror "To merge it, do USE=\"gtk2\" emerge mozilla."
@@ -277,21 +276,10 @@ function patch-gtk-frontend() {
 		-e "s:\(-I\$(GECKO_SDK)\)\(/.*\)\(/include\):-I${mozilla_dir}/include\2:g" \
 		-e "s:\$(XTEST_LIB_PATH):/usr/X11R6/lib:" \
 		-e "s:\$(GECKO_SDK):${mozilla_dir}:" \
+		-e "s:/usr/include/kde:\`kde-config --prefix\`/include:" \
+		-e "s:\(KDE_LIBS.*\)\(-L/usr/lib\):\1-L\`kde-config --prefix\`/lib:" \
 		-i "${S}/${gtk_swt_src_dir}/make_linux.mak" || die "Failed to patch ${gtk_swt_src_dir}/make_linux.mak"
 
-	sed -e "s:KDE_LIB_PATH=.*:KDE_LIB_PATH=$(kde-config --prefix)/lib:" \
-		-e "s:KDE_INCLUDE_PATH=.*:KDE_INCLUDE_PATH=$(kde-config --prefix)/include:" \
-		-e "s:\${GECKO_SDK}/mozilla-config.h:\${GECKO_SDK}/include/mozilla-config.h:" \
-		-e "s:\${GECKO_SDK}/nspr/include:\${GECKO_SDK}/include/nspr:" \
-		-e "s:\${GECKO_SDK}/xpcom/include:\${GECKO_SDK}/include/xpcom:" \
-		-e "s:\${GECKO_SDK}/string/include:\${GECKO_SDK}/include/string:" \
-		-e "s:\${GECKO_SDK}/embed_base/include:\${GECKO_SDK}/include/embed_base:" \
-		-e "s:\${GECKO_SDK}/embedstring/include:\${GECKO_SDK}/include/embedstring:" \
-		-e "s:-lembedstring::" \
-		-e "s:-lembed_base_s::" \
-		-e "s:-lxpcomglue_s::" \
-		-e "s:GECKO_LIBS=\":GECKO_LIBS=\"-L/usr/lib/mozilla :" \
-		-i "${S}/${gtk_swt_src_dir}/build.sh" || die "Failed to patch ${gtk_swt_src_dir}/build.sh"
 
 	sed -e "s:\(JAVA_HOME *=\)\(.*$\):\1${JAVA_HOME}:" \
 		-e "s:\(GECKO_SDK *=\)\(.*$\):\1${mozilla_dir:-/usr/lib/mozilla}:" \
@@ -420,9 +408,7 @@ function build-gtk-native() {
 
 	if use kde ; then
 		einfo "Building KDE support"
-		KDE_INCLUDE_PATH="$(kde-config --prefix)/include" \
-			KDE_LIB_PATH="$(kde-config --prefix)/lib" \
-			bash ./build.sh make_kde || die "Failed to build KDE support"
+		bash ./build.sh make_kde || die "Failed to build KDE support"
 	fi
 
 	if use mozilla ; then