Version bump, promoting the 0.5-r1 version from java-overlay to 0.6. Changes by Andrew John Hughes <andrew@gentoo.org>, adding support for ecj-gcj and manage a /usr/share/eclipse-ecj/ecj.jar symlink along with the launcher.

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

4 files changed, 229 insertions, 12 deletions

diff --git a/app-admin/eselect-ecj/ChangeLog b/app-admin/eselect-ecj/ChangeLog
index bf239b247fb9..d555395c1def 100644
--- a/app-admin/eselect-ecj/ChangeLog
+++ b/app-admin/eselect-ecj/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/eselect-ecj
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.7 2010/02/28 18:52:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ecj/ChangeLog,v 1.8 2010/10/31 17:17:43 caster Exp $
+
+*eselect-ecj-0.6 (31 Oct 2010)
+
+  31 Oct 2010; Vlastimil Babka <caster@gentoo.org> +eselect-ecj-0.6.ebuild,
+  +files/ecj-0.6.eselect:
+  Version bump, promoting the 0.5-r1 version from java-overlay to 0.6.
+  Changes by Andrew John Hughes <andrew@gentoo.org>, adding support for
+  ecj-gcj and manage a /usr/share/eclipse-ecj/ecj.jar symlink along with the
+  launcher.
 
 *eselect-ecj-0.5 (28 Feb 2010)
 
diff --git a/app-admin/eselect-ecj/Manifest b/app-admin/eselect-ecj/Manifest
index 0f064bf677c0..248ecc17c204 100644
--- a/app-admin/eselect-ecj/Manifest
+++ b/app-admin/eselect-ecj/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ecj-0.5.eselect 3734 RMD160 436be03f04ba408f85aa834682083e70a24490ba SHA1 b79be285d9654de402f47d0711db20aa86cfe7d6 SHA256 65644b56fee469dd905a3e3d94dbbff9056f2863360d192d1b5c61ac521c2e4d
+AUX ecj-0.6.eselect 4287 RMD160 c5536f5b6c7944332de89d3f8fa75773077f424c SHA1 79665e5bf6acc85e80cae01dd1e6556db2db10cc SHA256 2a48ab5b2a26f00cc22cbea282c1edc875f7022595d265fb69a206cb5500c6c7
 AUX ecj.eselect 3960 RMD160 9547fe4fd121414ff0a199a9aa196c5bff6d4f7f SHA1 1ab678117ec9df5cd0841f887e973b6e7e3d8895 SHA256 8124d5a2989584ad923c5914f4e52a846fc76670a7990a4ca3f763aeafaf726b
 EBUILD eselect-ecj-0.3.ebuild 650 RMD160 45ca2a4ddb56ba22a0c4e287bea083be9a1d2f81 SHA1 addec9b2257de06d1940abf2311ff32f1dc6b2e7 SHA256 80881cf36a78647991a17f7571c4f8b2d921a15798780569539ded8ade64f745
 EBUILD eselect-ecj-0.5.ebuild 736 RMD160 bda9a91517e49e3b9b91c28d9b53b37081db4100 SHA1 57428ca6ac7f77e9c19dcc216afe938843fab0ff SHA256 043019c22f81d1e82b0b3da000e902205a270392c9ce3ba8cadcf0b4a64674ce
-MISC ChangeLog 1337 RMD160 0bf9d738e628f9fc68d5b626047668343ce37c77 SHA1 208c3619298ad25376b9201c312b45b59e0c7658 SHA256 b81c3cc162bac0f27df63148392fa986cee044cd2d8a4b0c6698784ee63295ad
+EBUILD eselect-ecj-0.6.ebuild 761 RMD160 094ded0b14fdefe26dd5296188a8cffd77c83b51 SHA1 f869077c00404ed6e947dce9e842230c62c712ca SHA256 411c47d88ad34e45e13211d34c84c87bf0cbb110bba4cbdfcd5ac16edef2d419
+MISC ChangeLog 1707 RMD160 0c0bdc3e3e0885375b514af4399a8afdae638af0 SHA1 88d1bb0e0da09ae88b79b67fe22fc1aece0cc984 SHA256 6a3487dbeb851c369d80299cb95935d6f9d6d4fb6c6e432e03f609154c0bd58e
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuKwwQACgkQOeoy/oIi7uxWPQCfcFmgoMygb2waWJtkj4MOflVW
-NuMAmwR8jzG0rnjLgDV84xe30Yhlpl5e
-=3W2i
------END PGP SIGNATURE-----
diff --git a/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild b/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild
new file mode 100644
index 000000000000..2999ca7b690d
--- /dev/null
+++ b/app-admin/eselect-ecj/eselect-ecj-0.6.ebuild
@@ -0,0 +1,28 @@
+# 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.6.ebuild,v 1.1 2010/10/31 17:17:43 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 ~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
new file mode 100644
index 000000000000..fae5ecaa4df0
--- /dev/null
+++ b/app-admin/eselect-ecj/files/ecj-0.6.eselect
@@ -0,0 +1,188 @@
+# -*-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
+}