A lot of reworking.

7 files changed, 92 insertions, 70 deletions

diff --git a/dev-util/eclipse-cdt/ChangeLog b/dev-util/eclipse-cdt/ChangeLog
index aaa16ca4abc6..36eeda7c3547 100644
--- a/dev-util/eclipse-cdt/ChangeLog
+++ b/dev-util/eclipse-cdt/ChangeLog
@@ -1,7 +1,19 @@
 # ChangeLog for dev-util/eclipse-cdt
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed unde the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/ChangeLog,v 1.2 2004/07/28 14:40:32 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/ChangeLog,v 1.3 2004/08/21 21:33:50 karltk Exp $
 
+*eclipse-cdt-2.0-r2 (21 Aug 2004)
+
+  21 Aug 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  Removed CVS connetions, reworked the .tar.bz2 snapshot, now uses eclipse-ext
+  properly. Still ugly, but apperas to work somewhat on x86. Removed old
+  revisions.
+  
+*eclipse-cdt-2.0-r1 (30 Jul 2004)
+
+  30 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  Minor fixes.
+  
   28 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> eclipse-cdt-2.0.ebuild:
   Fixed depends.  
 
diff --git a/dev-util/eclipse-cdt/Manifest b/dev-util/eclipse-cdt/Manifest
index 786546b75273..8b9636291318 100644
--- a/dev-util/eclipse-cdt/Manifest
+++ b/dev-util/eclipse-cdt/Manifest
@@ -1,4 +1,4 @@
-MD5 7a874e30e16e5bdfa63c1e65f385502c ChangeLog 508
-MD5 750fa08f092f985093ed92ddc0b08ce6 eclipse-cdt-2.0.ebuild 1887
-MD5 212fa3e242f7824c284b407f8da84f08 metadata.xml 674
-MD5 32737dc4e509b46595d20f5df9ce6e1d files/digest-eclipse-cdt-2.0 75
+MD5 99e6716e9fb639201d827b3d9c8359af ChangeLog 880
+MD5 8aecf696383da8cfdf7539e45c3f498e eclipse-cdt-2.0-r2.ebuild 2185
+MD5 6155f43aec6a2348e28c7b465f3226b0 metadata.xml 682
+MD5 73535641ec7f807fbc5f8b321f5dd386 files/digest-eclipse-cdt-2.0-r2 78
diff --git a/dev-util/eclipse-cdt/eclipse-cdt-2.0-r2.ebuild b/dev-util/eclipse-cdt/eclipse-cdt-2.0-r2.ebuild
new file mode 100644
index 000000000000..9a2c81306ded
--- /dev/null
+++ b/dev-util/eclipse-cdt/eclipse-cdt-2.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/eclipse-cdt-2.0-r2.ebuild,v 1.1 2004/08/21 21:33:50 karltk Exp $
+
+inherit eclipse-ext
+
+DESCRIPTION="Eclipse C/C++ Development Tools"
+HOMEPAGE="http://www.eclipse.org/cdt"
+SRC_URI="http://dev.gentoo.org/~karltk/projects/eclipse/distfiles/eclipse-cdt-2.0-gentoo-1.tar.bz2"
+LICENSE="CPL-1.0"
+SLOT="2"
+KEYWORDS="-* ~x86"
+IUSE=""
+DEPEND=">=dev-util/eclipse-sdk-3.0.0"
+S=${WORKDIR}/${P}
+
+# karltk: A lot more work to do:
+# - add back other arches
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+        mkdir -p ${S}/results/eclipse-copy
+        (
+                cd ${S}/results/eclipse-copy
+                lndir -silent /usr/lib/eclipse-3
+                # getProtectionDomain().getCodeSource() my buttocks...
+                rm startup.jar ; cp /usr/lib/eclipse-3/startup.jar .
+        )
+	mkdir -p ${S}/results/final-result
+	touch ${S}/results/final-result/compilelog.txt
+
+	sed -e "s/name=\"buildId\" value=\"[^\"]*\"/name=\"buildId\" value=\"${P}_gentoo\"/" \
+		-e 's:name="zipsdir" value="[^"]*":name="zipsdir" value="${buildDirectory}/final-result":' \
+		-i build.xml
+
+	sed -e "s:ECLIPSE_HOME=.*:ECLIPSE_HOME=${S}/results/eclipse-copy:" \
+		-i build.sh
+
+	sed -e "s:buildLabel=.*:buildLabel=final-result:" \
+		-i platform/build.properties \
+		-i sdk/build.properties
+}
+
+src_compile() {
+	# Use java-utils
+	addwrite /proc/cpuinfo
+	einfo "Building native code"
+	(
+		cd results/plugins/org.eclipse.cdt.core.linux/library || die 
+		make ARCH=x86 all || die "Failed to compile platform-specific code"
+	)
+	einfo "Building Java code"
+	./build.sh || die "Failed to compile"
+
+	finalzip=results/final-result/org.eclipse.cdt-2.1.0-eclipse-cdt-2.0_gentoo-linux.x86.zip
+	if [ ! -f ${finalzip} ] ; then
+		die "Compilation of final SDK zip failed"
+	fi
+
+	unzip ${finalzip} -d results/final-result/
+}
+
+src_install() {
+        eclipse-ext_require-slot 3
+
+        eclipse-ext_create-ext-layout source
+
+        eclipse-ext_install-features results/final-result/eclipse/features/*
+        eclipse-ext_install-plugins results/final-result/eclipse/plugins/*
+}
+
diff --git a/dev-util/eclipse-cdt/eclipse-cdt-2.0.ebuild b/dev-util/eclipse-cdt/eclipse-cdt-2.0.ebuild
deleted file mode 100644
index 8f64123db568..000000000000
--- a/dev-util/eclipse-cdt/eclipse-cdt-2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt/eclipse-cdt-2.0.ebuild,v 1.4 2004/07/29 20:00:50 mr_bones_ Exp $
-
-inherit eclipse-ext
-
-DESCRIPTION="Eclipse C/C++ Development Tools"
-HOMEPAGE="http://www.eclipse.org/cdt"
-SRC_URI="http://dev.gentoo.org/~karltk/projects/eclipse/distfiles/eclipse-cdt-2.0-gentoo.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="2"
-KEYWORDS="-* ~x86"
-IUSE=""
-DEPEND=">=dev-util/eclipse-sdk-3.0.0"
-S=${WORKDIR}/${P}
-
-# karltk: A lot more work to do:
-# - make a better snapshot of the CVS
-# - remove the the CVS connects during build!
-# - fix the unzip hack
-# - use eclipse-ext
-# - add back other arches
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mkdir -p ${S}/results/eclipse-copy
-	(
-		cd ${S}/results/eclipse-copy
-		lndir -silent /usr/lib/eclipse-3
-		# getProtectionDomain().getCodeSource() my buttocks...
-		rm startup.jar ; cp /usr/lib/eclipse-3/startup.jar .
-	)
-	sed -e "s/name=\"buildId\" value=\"[^\"]*\"/name=\"buildId\" value=\"${P}_gentoo\"/" \
-		-e 's_name="zipsdir" value="[^"]*"_name="zipsdir" value="${buildDirectory}/final-result"_' \
-		-i build.xml
-}
-
-src_compile() {
-	# Use java-utils
-	addwrite /proc/cpuinfo
-	(
-		cd results/plugins/org.eclipse.cdt.core.linux/library || die
-		make ARCH=x86 all || die "Failed to compile platform-specific code"
-	)
-	./build.sh || die "Failed to compile"
-}
-
-src_install() {
-	if [ ! -f results/I.eclipse-cdt-2.0_gentoo/org.eclipse.cdt-2.1.0-eclipse-cdt-2.0_gentoo-linux.x86.zip ] ; then
-		die "Compilation of final SDK zip failed"
-	fi
-
-	dodir /usr/lib/eclipse-3
-
-	# Nasty!
-	unzip results/I.eclipse-cdt-2.0_gentoo/org.eclipse.cdt-2.1.0-eclipse-cdt-2.0_gentoo-linux.x86.zip \
-		-d ${D}/usr/lib/eclipse-3
-	mv ${D}/usr/lib/eclipse-3/eclipse/{features,plugins} ${D}/usr/lib/eclipse-3
-	rmdir ${D}/usr/lib/eclipse-3/eclipse
-}
-
diff --git a/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0 b/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0
deleted file mode 100644
index 2f5bd3c1281e..000000000000
--- a/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0238a29f9447cb998bcbc2f782d6753 eclipse-cdt-2.0-gentoo.tar.gz 7618341
diff --git a/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r2 b/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r2
new file mode 100644
index 000000000000..8c1f17be6506
--- /dev/null
+++ b/dev-util/eclipse-cdt/files/digest-eclipse-cdt-2.0-r2
@@ -0,0 +1 @@
+MD5 6f398d3fcec4dd7097b65c639e50ef97 eclipse-cdt-2.0-gentoo-1.tar.bz2 6767450
diff --git a/dev-util/eclipse-cdt/metadata.xml b/dev-util/eclipse-cdt/metadata.xml
index 6d2d9758c658..77e7f4b3dd73 100644
--- a/dev-util/eclipse-cdt/metadata.xml
+++ b/dev-util/eclipse-cdt/metadata.xml
@@ -11,8 +11,8 @@ platform.
 
 Features:
 * C/C++ Editor (basic functionality, syntax highlighting, code completion etc.) 
-* C/C++ Debugger (APIs & Default implementation, using GDB) 
-* C/C++ Launcher (APIs & Default implementation, launches and external application) 
+* C/C++ Debugger (APIs &amp; Default implementation, using GDB) 
+* C/C++ Launcher (APIs &amp; Default implementation, launches and external application) 
 * Parser
 * Search Engine
 * Content Assist Provider