Remove old.

(Portage version: 2.1.10.62/cvs/Linux x86_64)

4 files changed, 5 insertions, 247 deletions

diff --git a/app-admin/eselect-ecj/ChangeLog b/app-admin/eselect-ecj/ChangeLog
index 72bba839daf0..a5933d435f86 100644
--- a/app-admin/eselect-ecj/ChangeLog
+++ b/app-admin/eselect-ecj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/eselect-ecj
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.20 2012/04/15 17:45:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.21 2012/06/10 17:46:25 sera Exp $
+
+  10 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -eselect-ecj-0.6.ebuild,
+  -eselect-ecj-0.6-r1.ebuild, -files/ecj-0.6.eselect:
+  Remove old.
 
   15 Apr 2012; Mike Frysinger <vapier@gentoo.org> eselect-ecj-0.7.ebuild:
   Add back ia64 love #349020 by Dennis Schridde.
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.6-r1.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.6-r1.ebuild
deleted file mode 100644
index b6099a1704f6..000000000000
--- a/app-admin/eselect-ecj/eselect-ecj-0.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.6-r1.ebuild,v 1.2 2011/12/31 14:30:00 sera Exp $
-
-EAPI=1
-
-DESCRIPTION="Manages ECJ symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-PDEPEND="
-|| (
-	dev-java/eclipse-ecj:3.7
-	dev-java/eclipse-ecj:3.6
-	dev-java/eclipse-ecj:3.5
-	dev-java/eclipse-ecj:3.4
-	>=dev-java/eclipse-ecj-3.3.0-r2:3.3
-	dev-java/ecj-gcj:3.5
-)"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/ecj-${PV}.eselect" ecj.eselect || die "newins failed"
-}
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild
deleted file mode 100644
index b4cffa6ee74f..000000000000
--- a/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild,v 1.5 2011/12/31 14:30:00 sera Exp $
-
-EAPI=1
-
-DESCRIPTION="Manages ECJ symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-PDEPEND="
-|| (
-	dev-java/eclipse-ecj:3.5
-	dev-java/eclipse-ecj:3.4
-	>=dev-java/eclipse-ecj-3.3.0-r2:3.3
-	dev-java/ecj-gcj:3.5
-)"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/ecj-${PV}.eselect" ecj.eselect || die "newins failed"
-}
diff --git a/app-admin/eselect-ecj/files/ecj-0.6.eselect b/app-admin/eselect-ecj/files/ecj-0.6.eselect
deleted file mode 100644
index fae5ecaa4df0..000000000000
--- a/app-admin/eselect-ecj/files/ecj-0.6.eselect
+++ /dev/null
@@ -1,188 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: ecj-0.6.eselect,v 1.1 2010/10/31 17:17:43 caster Exp $
-
-DESCRIPTION="Manage ECJ targets"
-MAINTAINER="java@gentoo.org"
-VERSION="0.6"
-
-ECJ="${EROOT}/usr/bin/ecj"
-ECJ_JAR="${EROOT}/usr/share/eclipse-ecj/ecj.jar"
-
-# find a list of ecj symlink targets, best first.
-find_targets() {
-	for f in $(ls -r "${ECJ}"-[0-9]* "${ECJ}"-gcj-[0-9]* 2> /dev/null) ; do
-		if [[ -f "${f}" ]] ; then
-			echo $(basename "${f}")
-		fi
-	done
-}
-
-# get a named or numbered target.
-find_target() {
-	local target=${1}
-
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		[[ -z "${targets}" ]] && die -q "No targets found!"
-		target=${targets[target-1]}
-	fi
-
-	if [[ "${target}" = ecj-[0-9]* || "${target}" = ecj-gcj-[0-9]* ]] \
-		&& [[ -f "${EROOT}/usr/bin/${target}" ]] ; then
-		echo ${target}
-	else
-		die -q "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-# try to remove the ecj symlink.
-remove_symlink() {
-	rm "${ECJ}" &>/dev/null
-	if [[ -e ${ECJ_JAR} ]] ; then
-		rm "${ECJ_JAR}"
-	fi
-}
-
-# determine the current target.
-get_target() {
-	local canonicalised=$(canonicalise "${ECJ}")
-	echo $(basename "${canonicalised}")
-}
-
-# set the ecj symlink.
-set_symlink() {
-	local target=$(find_target "${1}")
-	remove_symlink
-	ln -s "${target}" "${ECJ}" || die "Couldn't set ${target} symlink."
-	mkdir -p $(dirname ${ECJ_JAR})
-	if [[ "${target}" = ecj-gcj* ]] ; then
-		ln -sf /usr/share/${target}/lib/ecj.jar ${ECJ_JAR}
-	else
-		ln -sf /usr/share/eclipse-${target}/lib/ecj.jar ${ECJ_JAR}
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show current ECJ target"
-}
-
-do_show() {
-	if [[ ${#} -gt 0 ]]; then
-		die -q "No parameters allowed."
-	fi
-
-	if [[ -L "${ECJ}" ]] ; then
-		get_target
-		return 0
-	elif [[ -e "${ECJ}" ]] ; then
-		echo "(not a symlink)" >&2
-		return 1
-	else
-		echo "(unset)" >&2
-		return 1
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available ECJ targets"
-}
-
-do_list() {
-	if [[ ${#} -gt 0 ]]; then
-		die -q "Usage error: no parameters allowed."
-	fi
-
-	local i targets
-	targets=( $(find_targets) )
-
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = $(basename "$(canonicalise "${ECJ}")") ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-
-	write_list_start "Available ECJ targets:"
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new ECJ target"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ $# -gt 1 ]]; then
-		die -q "Too many parameters. Expected only one."
-	fi
-
-	local target=${1}
-
-	if [[ -z "${target}" ]] ; then
-		die -q "You didn't give me a target name or number."
-	elif [[ -L "${ECJ}" ]] ; then
-		if ! remove_symlink ; then
-			die -q "Can't remove existing ecj provider."
-		elif ! set_symlink "${1}" ; then
-			die -q "Can't set new ecj provider."
-		fi
-	elif [[ -e "${ECJ}" ]] ; then
-		write_warning_msg "Can't set a new ecj provider. There's a file in the way at ${ECJ}. You can try removing it manually, and then re-running this command."
-	elif [[ -e "${ECJ_JAR}" ]] ; then
-		write_warning_msg "Can't set a new ecj provider. There's a file in the way at ${ECJ_JAR}. You can try removing it manually, and then re-running this command."
-	else
-		set_symlink "${target}" || die -q "Wasn't able to set a new provider."
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Set the ECJ target to the latest if the current target is invalid or if the given target is the latest"
-}
-
-describe_update_options() {
-	echo "target (optional) : Target name (from 'list' action)"
-}
-
-describe_update_parameters() {
-	echo "<target>"
-}
-
-do_update() {
-	if [[ $# -gt 1 ]] ; then
-		die -q "Too many parameters. Expected only one."
-	fi
-
-	# For pkg_postrm
-	if [[ ! $(find_targets) ]]; then
-		remove_symlink
-		return
-	fi
-
-	local canonicalised=$(canonicalise "${ECJ}")
-
-	if [[ ! -L "${ECJ}" ]] || [[ ! -f "${canonicalised}" ]] ; then
-		do_set 1
-	elif [[ -n "${1}" ]] ; then
-		# Check whether target name is valid.
-		find_target "${1}" > /dev/null
-
-		if [[ "${1}" == "$(find_target 1)" ]] ; then
-			do_set 1
-		fi
-	fi
-}