Remove old.

(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)

5 files changed, 5 insertions, 416 deletions

diff --git a/app-admin/eselect-ecj/ChangeLog b/app-admin/eselect-ecj/ChangeLog
index 40d37a3ae75b..73d5029c4c23 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.11 2011/03/11 19:15:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.12 2011/09/20 15:29:24 caster Exp $
+
+  20 Sep 2011; Vlastimil Babka <caster@gentoo.org> -eselect-ecj-0.3.ebuild,
+  -eselect-ecj-0.5.ebuild, -files/ecj-0.5.eselect, -files/ecj.eselect:
+  Remove old.
 
   11 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> eselect-ecj-0.6.ebuild:
   ppc/ppc64 stable wrt #344375
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.3.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.3.ebuild
deleted file mode 100644
index f3c944dd546a..000000000000
--- a/app-admin/eselect-ecj/eselect-ecj-0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 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.3.ebuild,v 1.5 2009/11/10 20:13:57 caster Exp $
-
-EAPI=1
-
-DESCRIPTION="Manages ECJ symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.10"
-PDEPEND="
-|| (
-	dev-java/eclipse-ecj:3.5
-	dev-java/eclipse-ecj:3.4
-	>=dev-java/eclipse-ecj-3.3.0-r2:3.3
-)"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}/ecj.eselect" || die "doins failed"
-}
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild
deleted file mode 100644
index 4ff13fcf2131..000000000000
--- a/app-admin/eselect-ecj/eselect-ecj-0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/02/28 18:52:01 ulm Exp $
-
-EAPI=1
-
-DESCRIPTION="Manages ECJ symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~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
-)"
-
-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.5.eselect b/app-admin/eselect-ecj/files/ecj-0.5.eselect
deleted file mode 100644
index 6a627e9f0629..000000000000
--- a/app-admin/eselect-ecj/files/ecj-0.5.eselect
+++ /dev/null
@@ -1,175 +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.5.eselect,v 1.2 2010/02/28 19:24:35 ulm Exp $
-
-DESCRIPTION="Manage ECJ targets"
-MAINTAINER="java@gentoo.org"
-VERSION="0.5"
-
-ECJ="${EROOT}/usr/bin/ecj"
-
-# find a list of ecj symlink targets, best first.
-find_targets() {
-	for f in $(ls -r "${ECJ}"-[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]* ]] && [[ -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
-}
-
-# 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."
-}
-
-### 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."
-	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
-}
diff --git a/app-admin/eselect-ecj/files/ecj.eselect b/app-admin/eselect-ecj/files/ecj.eselect
deleted file mode 100644
index dcafbb5b31ed..000000000000
--- a/app-admin/eselect-ecj/files/ecj.eselect
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: ecj.eselect,v 1.1 2008/07/21 22:07:24 betelgeuse Exp $
-
-DESCRIPTION="Manage ECJ targets"
-MAINTAINER="chewi@aura-online.co.uk"
-VERSION="0.3"
-
-ECJ="${ROOT}/usr/bin/ecj"
-
-# find a list of ecj symlink targets, best first.
-find_targets() {
-	for f in $(ls -r "${ECJ}"-[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]* ]] && [[ -f "${ROOT}/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
-}
-
-# 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 "${ROOT}/usr/bin/${target}" "${ECJ}" || \
-		die "Couldn't set ${target} symlink."
-}
-
-### 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) )
-
-	if [[ -n ${targets[@]} ]] ; then
-		local canonicalised basename
-
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			canonicalised=$(canonicalise "${ECJ}")
-			basename=$(basename "${canonicalised}")
-
-			if [[ "${targets[${i}]}" = "${basename}" ]] ; then
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-			fi
-		done
-
-		write_list_start "Available ECJ targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### 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."
-	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
-}
-
-# vim: set ft=eselect :