Remove the obsolete 3.2.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

5 files changed, 7 insertions, 130 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/Manifest b/dev-java/eclipse-ecj/Manifest
index 0bd3d33af15f..b167ca7d3cad 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,13 +1,9 @@
-AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SHA1 28f78c5e169bfdc6f81441d96e3734c9eeed80db SHA256 ca705f626f3871697afc65b90f7844479b8846d8e969e4ead107615a0ef168e9
-AUX eclipse-ecj-3.2-build-gentoo.patch 1877 RMD160 027003513593a3b880bff73a012f73959c674be5 SHA1 5e2a5f0b0f484e147665c48bb38e2df1401823e5 SHA256 086abbf990543dcbf511567a2f663e53f932e825c75600745771c7d3f5739bd3
 AUX eclipse-ecj-3.3.0-gcj.patch 20084 RMD160 08944cef146676d9d7fddc46727bc172d75cdcb5 SHA1 900ccaaec2db0012defc016c65088f979a35e145 SHA256 6c5ffcefdc385305f01b63fcb7088b04698b5d1b8d9db54d058ffcf2252460e8
 DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1 dbf3300205717c165a1b1ec36af4c3fd1e45888b SHA256 a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
 DIST ecjsrc-3.5.1.zip 1297603 RMD160 3fd56790edc323fd10439eaf778b8489b641d637 SHA1 83b14c20a82079ff9dd3c42c4eee56db4c175723 SHA256 27639423e565c6b6ee5184f174447151aebdf5ef669c1bd73185e9b85515d4ee
 DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
-DIST eclipse-ecj-3.2.2.tar.bz2 615226 RMD160 4dc422a8abe983293e07c10aac3dba97e6e0907f SHA1 a8ba6817e4e9d37cf6b9725f7fff229b7448eaac SHA256 81a61220d29aae92c124ca365c4d100e780c57279696e29193a8b92ebca0c2df
-EBUILD eclipse-ecj-3.2.2-r1.ebuild 1932 RMD160 665b71bd83682d6091a656c903c2e483a5e4451f SHA1 516fbc0fa421645ab070b4fbcfbfdd37cef7a0f2 SHA256 88217e40f760e19a91d090eb72f75e8281fd8e0ea74e458c4f446e2309f919c9
 EBUILD eclipse-ecj-3.3.0-r3.ebuild 2120 RMD160 0a4afac8a965b827148b9a1b48ec82e66ddb17a0 SHA1 c28b9df069497cfd6459b98821c51fd60b63c60b SHA256 c1b36ffbe000bbae165da32a81f4eb6ea6c9ad1f123b4bb67905dc9aeff0917c
 EBUILD eclipse-ecj-3.4-r4.ebuild 2266 RMD160 7dc48632d92d7a96a21706cbe7025a879d6e473e SHA1 ad44fb68c7202b744250cacc2daa51d3d3d1a909 SHA256 c97a509f93055f74933daaff67e1e92b7e4b40c6d5559260ad1436ace321a27d
 EBUILD eclipse-ecj-3.5.1.ebuild 2780 RMD160 1b7c52fcd313a9eef41c62fe0d6b18a1f4c0d7b7 SHA1 1797985c4f76c48769428912f55cb1d944ac8e74 SHA256 737f58eeb7f47b46ed50f422c2bef3007505e725b18b2b7974410256d41556dd
-MISC ChangeLog 9018 RMD160 4dd3e83b28fb3bffeda9f1358454377261ae9175 SHA1 87151d485495fdd1734f3eadb629fafd1a3cf83c SHA256 859de9e7d4666c473d16e22c9777fe781f417fe1d8726cbd806d5a1da02d5bce
+MISC ChangeLog 9204 RMD160 36664ceb1edc7f903a3f836fc4adf8421463dca7 SHA1 c5521ea41a3896590496b81799197adabe53b4ef SHA256 54f1e126afc2816de2fc7d21828975f900dbacf43c1b564ce14d12682c72eb57
 MISC metadata.xml 570 RMD160 c3773d8e931a0e7a00eeb494f1f8f68cc1f799ed SHA1 71c2b881dc7b6733567777051b079745f3c2d70a SHA256 dd2a09440442264363911b455040196cbb42763fbacbb135c07b3f0de44a1e3a
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>