Remove the obsolete 3.2.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

4 files changed, 6 insertions, 125 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index d95efe9a2b8a..9fc683630d3a 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.59 2009/11/04 19:05:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.60 2009/11/10 20:15:54 caster Exp $
+
+  10 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/compiler-settings-3.2, -eclipse-ecj-3.2.2-r1.ebuild,
+  -files/eclipse-ecj-3.2-build-gentoo.patch:
+  Remove the obsolete 3.2.
 
 *eclipse-ecj-3.5.1 (04 Nov 2009)
 
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild
deleted file mode 100644
index a2e9682fa409..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild,v 1.4 2009/02/11 20:22:49 elvanor Exp $
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~x86-fbsd"
-SLOT="3.2"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.4
-	app-admin/eselect-ecj"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant-core"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove unzip, add javadoc target, put final ecj.jar and javadocs in dist/ and not ../
-	epatch "${FILESDIR}/${PN}-${SLOT}-build-gentoo.patch"
-}
-
-src_compile() {
-	# we don't use eant because the compile*.xml files specifically set -source -target and used compiler
-
-	# bootstrap build with JDK's javac
-	ant -f compilejdtcorewithjavac.xml || die "Failed to bootstrap build with javac"
-
-	local ant_flags=""
-
-	# for some weird reason, with kaffe it fails the build.xml's check for ecj.jar present (which it is)
-	# which if successful sets this property, then checks if it was set and fails if not
-	java-pkg_current-vm-matches kaffe && ant_flags="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter"
-
-	# recompile with ecj.jar made in first step, to get dist/ecj.jar
-	ant ${ant_flags} -lib ecj.jar -f compilejdtcore.xml compile $(use_doc) || die "Failed to rebuild with ecj"
-}
-
-src_install() {
-	java-pkg_dojar dist/ecj.jar
-
-	java-pkg_dolauncher ecj-${SLOT} --main org.eclipse.jdt.internal.compiler.batch.Main
-
-	use doc && java-pkg_dojavadoc dist/doc/api
-
-	insinto /usr/share/java-config-2/compiler
-	newins "${FILESDIR}"/compiler-settings-${SLOT} ecj-${SLOT}
-}
-
-pkg_postinst() {
-	einfo "To select between slots of ECJ..."
-	einfo " # eselect ecj"
-
-	eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-	eselect ecj update
-}
diff --git a/dev-java/eclipse-ecj/files/compiler-settings-3.2 b/dev-java/eclipse-ecj/files/compiler-settings-3.2
deleted file mode 100644
index ea7091ae9049..000000000000
--- a/dev-java/eclipse-ecj/files/compiler-settings-3.2
+++ /dev/null
@@ -1,7 +0,0 @@
-JAVAC="/usr/bin/ecj-3.2"
-PACKAGE="=dev-java/eclipse-ecj-3.2*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.2"
-GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
deleted file mode 100644
index 987095cabc7f..000000000000
--- a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur eclipse-ecj-3.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml
---- eclipse-ecj-3.2/compilejdtcorewithjavac.xml	2006-06-30 01:20:00.000000000 +0200
-+++ eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml	2006-07-28 01:35:06.000000000 +0200
-@@ -6,7 +6,6 @@
- 		<tstamp/>
- 		<property name="srcdir" value="src" />
- 		<property name="destdir" value="compiler" />
--   	    <unzip src="${srcdir}/ecj.zip" dest="${srcdir}"/>
- 	</target>
- 
- 	<target name="compile" depends="init">
-diff -Naur eclipse-ecj-3.2/compilejdtcore.xml eclipse-ecj-3.2-mod/compilejdtcore.xml
---- eclipse-ecj-3.2/compilejdtcore.xml	2006-06-30 01:20:00.000000000 +0200
-+++ eclipse-ecj-3.2-mod/compilejdtcore.xml	2006-07-29 03:22:07.000000000 +0200
-@@ -5,7 +5,9 @@
- 	<target name="init">
- 		<tstamp/>
- 		<property name="destdir" value="compiler2" />
--        <property name="srcdir" value="src" />
-+		<property name="srcdir" value="src" />
-+		<property name="distdir" value="dist" />
-+		<property name="javadocdir" value="${distdir}/doc/api" />
- 	</target>
- 
- 	<target name="compile" depends="init">
-@@ -13,6 +15,7 @@
- 		<echo message="TARGET: ${destdir}" />
- 		<delete dir="${destdir}"/>
- 		<mkdir dir="${destdir}"/>
-+		<mkdir dir="${distdir}"/>
- 
-                 <condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
-                         <available file="ecj.jar" />
-@@ -57,9 +60,17 @@
-                         </fileset>
-                         </copy>
- 
--                <jar jarfile="../ecj.jar">
-+                <jar jarfile="${distdir}/ecj.jar">
-                         <fileset dir="${destdir}"/>
-                 </jar>
- 
- 	</target>
-+	
-+	<target name="javadoc" depends="init">
-+	    <mkdir dir="${javadocdir}"/>
-+	    <javadoc destdir="${javadocdir}">
-+		<packageset dir="${srcdir}"/>
-+	    </javadoc>
-+	</target>
-+	
- </project>