Version bump to add prefix support

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 187 insertions, 7 deletions

diff --git a/app-admin/eselect-unison/ChangeLog b/app-admin/eselect-unison/ChangeLog
index 31edb4dd821c..6997b0b50c92 100644
--- a/app-admin/eselect-unison/ChangeLog
+++ b/app-admin/eselect-unison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-unison
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/ChangeLog,v 1.9 2009/11/22 17:39:04 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/ChangeLog,v 1.10 2010/02/28 20:39:53 abcd Exp $
+
+*eselect-unison-0.3 (28 Feb 2010)
+
+  28 Feb 2010; Jonathan Callen <abcd@gentoo.org> +files/unison.eselect-0.3,
+  +eselect-unison-0.3.ebuild:
+  Version bump to add prefix support
 
 *eselect-unison-0.2 (22 Nov 2009)
 
diff --git a/app-admin/eselect-unison/Manifest b/app-admin/eselect-unison/Manifest
index 67f75b72bdca..f55cfb2a383b 100644
--- a/app-admin/eselect-unison/Manifest
+++ b/app-admin/eselect-unison/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX unison.eselect-0.1 3722 RMD160 da78d270779e69cd0f9523d959dd0dc10bd81188 SHA1 70333c6a2eadaa16dbddec57a0e9f9b09d75cfca SHA256 9eea518e9ab85cd53c9c9a989d032a80b6b117f15ff258b904a6cb0b2775cec1
 AUX unison.eselect-0.2 3635 RMD160 917a420f5c2e2d23177802ee51e97d0c3ce737a3 SHA1 9f9199b8e49752cc9ea7b88d80883d9aaad96ed4 SHA256 9a0945737f2218f2bcaa02bcd687eb8e2c56d0e6f1189b8dac9c8c0e6f968e95
+AUX unison.eselect-0.3 3625 RMD160 9c548ebb53ef97fc934e207e2ae797b2c1ec20fd SHA1 5cc41f56a6e2f38728c70ce97971510168ab8fde SHA256 9c89097f086c279d33c56fe5dbf20c8bc75f1d6884024f80c0021a823c0b94b9
 EBUILD eselect-unison-0.1.ebuild 685 RMD160 ce74ca883238e2219908a6ec6c815ec0aa58ea91 SHA1 2e98162d22632191bc456c3a40c8725fd32f53ba SHA256 843413a75ccd47184c323410545a57b87c43e7b07511f3d84aeab3bed60bedd8
 EBUILD eselect-unison-0.2.ebuild 689 RMD160 103a689515f2236d985724d29086d9f14c0b32e7 SHA1 11c0cd78529b6e8ccfdf6dfa45049d532d40f313 SHA256 e802b19da38794c8c6e41ecca2b89e45638c810235cc566cfb3975bc0d148a97
-MISC ChangeLog 1426 RMD160 d13d352d60fa81e108bc7f4f4d9cb4d26b3f7e20 SHA1 71ec5217144801d5ca500688fd639a63fc733861 SHA256 99982b473548eecf5e5d36f1f759ec3648f717a2568e49f9cd9f4512a72ac6ea
+EBUILD eselect-unison-0.3.ebuild 714 RMD160 6f08393b7e932d9ffbf62e98abdce19e50604c60 SHA1 10c6bbcf83c18c80ee8f8e88f035fe70cfdadebd SHA256 41877673d676b5ae0f0183ab764337130f629c1e1f4e5b2e75976deabb9d375b
+MISC ChangeLog 1607 RMD160 9435ae26c67bd63fd1dd606290ec25d4d71bfa40 SHA1 36bf96e98dc09b5048df17d7b58d6200b7ef83c6 SHA256 0a76e444505be4fe15b4f01b99158d34332d607a58ab062d5d37805dff61ad65
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksJd9IACgkQOeoy/oIi7uy+9gCgtHp4wX0iGGOQU8he/RTQOBpe
-24sAn0/Lym4rTxFq02AbTzqAvAWUTftR
-=XJZE
+iEYEARECAAYFAkuK1KMACgkQOypDUo0oQOpbBACfcIxVC7e94id9yIwaZoMF0j/N
+AjIAn1FdH4pNqI7kJypj5D9VySYiTmrT
+=LhKR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-unison/eselect-unison-0.3.ebuild b/app-admin/eselect-unison/eselect-unison-0.3.ebuild
new file mode 100644
index 000000000000..4505c35e47f6
--- /dev/null
+++ b/app-admin/eselect-unison/eselect-unison-0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/eselect-unison-0.3.ebuild,v 1.1 2010/02/28 20:39:53 abcd Exp $
+
+inherit eutils
+
+DESCRIPTION="unison module for eselect"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_install() {
+	local MODULEDIR="/usr/share/eselect/modules"
+	local MODULE="unison"
+	dodir ${MODULEDIR}
+	insinto ${MODULEDIR}
+	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
+		|| die "failed to install"
+}
diff --git a/app-admin/eselect-unison/files/unison.eselect-0.3 b/app-admin/eselect-unison/files/unison.eselect-0.3
new file mode 100644
index 000000000000..db1782f222cd
--- /dev/null
+++ b/app-admin/eselect-unison/files/unison.eselect-0.3
@@ -0,0 +1,146 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-unison/files/unison.eselect-0.3,v 1.1 2010/02/28 20:39:55 abcd Exp $
+
+DESCRIPTION="Manage /usr/bin/unison versions"
+MAINTAINER="ml@gentoo.org"
+VERSION="0.3"
+
+# find a list of unison symlink targets, best first
+find_targets() {
+	local f
+	for f in "${EROOT}"/usr/bin/unison-[0-9]*; do
+		if [[ -f ${f} ]] ; then
+			echo "${f##*/unison-}"
+		fi
+	done | tac
+}
+
+# find version number of currently symlinked version
+identify_target() {
+	local f
+	f="$(canonicalise "${EROOT}"/usr/bin/unison)"
+	echo "${f##*/unison-}"
+}
+
+# try to remove the unison symlink
+remove_symlinks() {
+	rm -f "${EROOT}"/usr/bin/unison &>/dev/null
+}
+
+# set the unison symlink
+set_symlinks() {
+	local target="${1}" targets
+	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+		targets=( $(find_targets) )
+		target=${targets[target - 1]}
+	fi
+	if [[ -f "${EROOT}/usr/bin/unison-${target}" ]] ; then
+		remove_symlinks
+		ln -s "unison-${target}" "${EROOT}/usr/bin/unison" || \
+			die "Could not set ${target} /usr/bin/unison symlink"
+	else
+		die -q "Target \"${target}\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current unison version"
+}
+
+do_show() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	write_list_start "Current unison verson:"
+	if [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+		write_kv_list_entry "$(identify_target)" ""
+	elif [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+		write_kv_list_entry "(not a symlink)" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available unison versions"
+}
+
+do_list() {
+	[[ $# -eq 0 ]] || die -q "Too many parameters"
+
+	local i targets current
+	targets=( $(find_targets ) )
+	current=$(identify_target)
+	for (( i = 0; i < ${#targets[@]}; i++ )); do
+		[[ ${targets[i]} = ${current} ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
+	write_list_start "Available unison versions:"
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new unison version"
+}
+
+describe_set_options() {
+	echo "target : Target version number or index from 'list' action"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+do_set() {
+	if [[ -z "${1}" ]] ; then
+		die -q "You didn't give me a version number"
+
+	elif [[ -n "${2}" ]] ; then
+		die -q "Too many parameters"
+
+	elif [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+		if ! remove_symlinks ; then
+			die -q "Can't remove existing version symlink"
+		elif ! set_symlinks "${1}" ; then
+			die -q "Can't set new version"
+		fi
+
+	elif [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+		die -q "${EROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
+
+	else
+		set_symlinks "${1}" || die -q "Can't set new version"
+	fi
+}
+
+### update action ###
+
+describe_update() {
+	echo "Automatically update the unison version number"
+}
+
+describe_update_options() {
+	echo "--if-unset : Do not override currently selected version"
+}
+
+do_update() {
+	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+		die -q "Usage error"
+
+	if [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+		[[ ${1} == "--if-unset" ]] && return
+		remove_symlinks || die -q "Can't remove existing symlink"
+	fi
+	if [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+		die -q "${EROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
+	elif ! [[ -z $(find_targets ) ]] ; then
+		set_symlinks 1 || die -q "Can't set a new version"
+	fi
+}