Remove old.

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

5 files changed, 6 insertions, 260 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 6a4c566bfa88..2412a3b1a851 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.57 2009/09/05 18:57:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.58 2009/11/04 17:50:42 caster Exp $
+
+  04 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -eclipse-ecj-3.2.2.ebuild, -files/ecj-3.3, -eclipse-ecj-3.3.0-r2.ebuild,
+  -eclipse-ecj-3.4-r3.ebuild:
+  Remove old.
 
   05 Sep 2009; Brent Baude <ranger@gentoo.org> eclipse-ecj-3.3.0-r3.ebuild:
   Marking eclipse-ecj-3.3.0-r3 ppc64 for bug 249521
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild
deleted file mode 100644
index 87bae757d36d..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild
+++ /dev/null
@@ -1,53 +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.ebuild,v 1.9 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"
-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}
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r2.ebuild
deleted file mode 100644
index 3dba4d60b499..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,74 +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.3.0-r2.ebuild,v 1.7 2009/02/11 20:22:49 elvanor Exp $
-
-inherit eutils java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-200706251500"
-S="${WORKDIR}"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/${MY_PN}src.zip"
-
-LICENSE="EPL-1.0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-SLOT="3.3"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	sys-apps/findutils
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# own package
-	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
-	rm -fr org/eclipse/jdt/internal/antadapter
-
-	# what the heck...?! java6
-	rm -fr org/eclipse/jdt/internal/compiler/tool/ \
-		org/eclipse/jdt/internal/compiler/apt/
-
-	# gcj feature
-	epatch "${FILESDIR}"/${P}-gcj.patch
-}
-
-src_compile() {
-	local javac="javac" java="java" jar="jar"
-
-	mkdir -p bootstrap
-	cp -pPR org bootstrap
-
-	einfo "bootstrapping ${MY_PN} with javac"
-
-	cd "${S}"/bootstrap
-	${javac} $(find org/ -name '*.java') || die "${MY_PN} bootstrap failed!"
-
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
-		xargs ${jar} cf ${MY_PN}.jar
-
-	einfo "build ${MY_PN} with bootstrapped ${MY_PN}"
-
-	cd "${S}"
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main -encoding ISO-8859-1 org \
-		|| die "${MY_PN} build failed!"
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
-		xargs ${jar} cf ${MY_PN}.jar
-}
-
-src_install() {
-	java-pkg_dojar ${MY_PN}.jar
-	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-		org.eclipse.jdt.internal.compiler.batch.Main
-}
-
-pkg_postinst() {
-	ewarn "to get the compiler adapter of ecj for ant do"
-	ewarn "	# emerge ant-eclipse-ecj"
-}
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild
deleted file mode 100644
index c4581a6f3bda..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild
+++ /dev/null
@@ -1,122 +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.4-r3.ebuild,v 1.3 2009/02/11 20:22:49 elvanor Exp $
-
-EAPI=2
-
-inherit java-pkg-2
-
-MY_PN="ecj"
-DMF="R-${PV}-200806172000"
-S="${WORKDIR}"
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
-
-IUSE="gcj java6"
-
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-SLOT="3.4"
-
-CDEPEND=">=app-admin/eselect-ecj-0.3
-	sys-devel/gcc[gcj?]"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	!gcj? ( !java6? ( >=virtual/jdk-1.4 )
-		java6? ( >=virtual/jdk-1.6 ) )"
-RDEPEND="${CDEPEND}
-	!gcj? ( !java6? ( >=virtual/jre-1.4 )
-		java6? ( >=virtual/jre-1.6 ) )"
-
-pkg_setup() {
-	if ! use gcj ; then
-		java-pkg-2_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-
-	# These have their own package.
-	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-	rm -fr org/eclipse/jdt/internal/antadapter || die
-
-	if use gcj || ! use java6 ; then
-		rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
-	fi
-}
-
-src_compile() {
-	local javac_opts javac java jar
-
-	if use gcj ; then
-		local gccbin="$(gcc-config -B $(ls -1r /etc/env.d/gcc/${CHOST}-* | head -1) || die)"
-		local gcj="${gccbin}/gcj"
-		javac="${gcj} -C -encoding ISO-8859-1"
-		jar="${gccbin}/gjar"
-		[[ -x ${jar} ]] || jar="${gccbin}/fastjar"
-		[[ -x ${jar} ]] || die "No jar found for gcc"
-		java="${gccbin}/gij"
-	else
-		javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
-		javac="$(java-config -c)"
-		java="$(java-config -J)"
-		jar="$(java-config -j)"
-	fi
-
-	mkdir -p bootstrap || die
-	cp -pPR org bootstrap || die
-	cd "${S}/bootstrap" || die
-
-	einfo "bootstrapping ${MY_PN} with ${javac} ..."
-	${javac} ${javac_opts} $(find org/ -name '*.java') || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
-
-	cd "${S}" || die
-	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
-	${java} -classpath bootstrap/${MY_PN}.jar \
-		org.eclipse.jdt.internal.compiler.batch.Main \
-		${javac_opts} -nowarn org || die
-	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
-		xargs ${jar} cf ${MY_PN}.jar
-
-	if use gcj ; then
-		einfo "Building native ${MY_PN} binary ..."
-		${gcj} ${CFLAGS} -findirect-dispatch -Wl,-Bsymbolic -o native_${MY_PN}-${SLOT} \
-			--main=org.eclipse.jdt.internal.compiler.batch.Main ${MY_PN}.jar || die
-	fi
-}
-
-src_install() {
-	if use gcj ; then
-		dobin native_${MY_PN}-${SLOT}
-		newbin "${FILESDIR}/ecj-${SLOT}" ${MY_PN}-${SLOT}
-
-		# Don't complain when doing dojar below.
-		JAVA_PKG_WANT_SOURCE=1.4
-		JAVA_PKG_WANT_TARGET=1.4
-	else
-		java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-			org.eclipse.jdt.internal.compiler.batch.Main
-	fi
-
-	java-pkg_dojar ${MY_PN}.jar
-}
-
-pkg_postinst() {
-	einfo "To get the Compiler Adapter of ECJ for ANT..."
-	einfo " # emerge ant-eclipse-ecj"
-	echo
-	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/ecj-3.3 b/dev-java/eclipse-ecj/files/ecj-3.3
deleted file mode 100644
index 42af19f7c4dc..000000000000
--- a/dev-java/eclipse-ecj/files/ecj-3.3
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Copyright (c) 2005, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2005, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-
-cp=$(java-config -p eclipse-ecj-3.3)
-
-$(java-config --java) -cp ${cp} org.eclipse.jdt.internal.compiler.batch.Main $@