Handle better the fmtutil-sys call and fix a typo

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

4 files changed, 192 insertions, 7 deletions

diff --git a/app-admin/eselect-mpost/ChangeLog b/app-admin/eselect-mpost/ChangeLog
index a467a6afadf7..5799bcdf9cfa 100644
--- a/app-admin/eselect-mpost/ChangeLog
+++ b/app-admin/eselect-mpost/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-mpost
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mpost/ChangeLog,v 1.13 2009/11/06 21:37:38 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mpost/ChangeLog,v 1.14 2011/01/09 18:41:34 aballier Exp $
+
+*eselect-mpost-0.3 (09 Jan 2011)
+
+  09 Jan 2011; Alexis Ballier <aballier@gentoo.org> +files/mpost.eselect-0.3,
+  +eselect-mpost-0.3.ebuild:
+  Handle better the fmtutil-sys call and fix a typo
 
 *eselect-mpost-0.2 (06 Nov 2009)
 
diff --git a/app-admin/eselect-mpost/Manifest b/app-admin/eselect-mpost/Manifest
index 43a977c54117..35be058da927 100644
--- a/app-admin/eselect-mpost/Manifest
+++ b/app-admin/eselect-mpost/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 AUX mpost.eselect-0.1 3897 RMD160 0b61b618eec72ee01c73283b1f7df2f92e0db77c SHA1 3b19c2a3c0af24c2e5918a7fb2e3d5fb3824dcb6 SHA256 173c85e3d88191b2f342b5e1f5dc654c0d78909529495609477138f1a818b4b8
 AUX mpost.eselect-0.2 3790 RMD160 28b47340d889eff7ab7eeb000bb05eed8497f5f6 SHA1 d5188add2ae7ef8978aec57c17011cdc0cd92bc2 SHA256 ff41f9d0e23d81af082d59a5bb43ced478d2cc8710aebbe059e1d013c69eacfd
+AUX mpost.eselect-0.3 3794 RMD160 bd2cf4c31e4243f68ef3b24d1d0c00dfb9a43f28 SHA1 e96d6e3891f04bdcc920f40c36f6969ad733e145 SHA256 7b1aeca93dbcd2daad9bc71cc7d64028f32421ce6c264b0a2760a130fd7a21a6
 EBUILD eselect-mpost-0.1.ebuild 862 RMD160 770e64c28b2a6ee9bf33e8c57b36fc88ede5888d SHA1 6fa4040b8b322867396d649309c6388ca110ba15 SHA256 2e933ed3b42e67cf9329e9182fe9b4fb1697f8da3888f478c0cb6f3d8f97382b
 EBUILD eselect-mpost-0.2.ebuild 870 RMD160 a0136c082513e942427f734539303aad6cd3e8ad SHA1 92512f848445c59c5ac58aa54e708d578efeb87e SHA256 3c272136b532c27e7745c44535bb3bab0cd82f621bc985b9a9afc52564a3f5af
-MISC ChangeLog 1887 RMD160 ac79613cc07d32ef5e06bba70ebb38f4821294c9 SHA1 a01c6cdb300a5bdbe46f9264b7e6b0f16e7dc0d3 SHA256 ffe1e7bebec2c72774948d498703252f4c6073cd5921679f2a949bdee1960f9a
+EBUILD eselect-mpost-0.3.ebuild 875 RMD160 e6ff3f51296746b89528ea6761d01f3750cbbe04 SHA1 4cea9b43d475a864c22d904b1bf7fab6e555c6c1 SHA256 f48ad6f81018ba5337f6ce9e7387638449785694aba9736b501082e7720cf54e
+MISC ChangeLog 2086 RMD160 0cc85f5c38e37e986279f970a633015ec0384340 SHA1 05e2849fdaa743fc605c43143fba0f9f0fa57066 SHA256 0c8600b872824a6b8aa7cdbc84715ed59a464f169bb94c8c5220da3eb00ce21e
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkr0l7kACgkQOeoy/oIi7uxF8QCgpuc8+9Y6L65Rc4T5FVs3Ehrf
-Z+cAn3GSYOoFfCO37U+hx+tLReV5ahyT
-=PXI6
+iEYEARECAAYFAk0qAWQACgkQvFcC4BYPU0pDEACgzYR0qO3dPNI/Jz8jbbkyVywl
+oFEAn21EFzvKVy6T/ZGZZ4USPbi8IsoF
+=nD79
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-mpost/eselect-mpost-0.3.ebuild b/app-admin/eselect-mpost/eselect-mpost-0.3.ebuild
new file mode 100644
index 000000000000..9ca27ea08f97
--- /dev/null
+++ b/app-admin/eselect-mpost/eselect-mpost-0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mpost/eselect-mpost-0.3.ebuild,v 1.1 2011/01/09 18:41:34 aballier Exp $
+
+inherit eutils
+
+DESCRIPTION="mpost module for eselect"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# Depend on texlive-core-2008 that allows usage of this module, otherwise it
+# will not work so nicely.
+RDEPEND=">=app-admin/eselect-1.2.3
+	>=app-text/texlive-core-2008"
+
+src_install() {
+	local MODULEDIR="/usr/share/eselect/modules"
+	local MODULE="mpost"
+	dodir ${MODULEDIR}
+	insinto ${MODULEDIR}
+	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
+		|| die "failed to install"
+}
diff --git a/app-admin/eselect-mpost/files/mpost.eselect-0.3 b/app-admin/eselect-mpost/files/mpost.eselect-0.3
new file mode 100644
index 000000000000..de62b9ccb4b9
--- /dev/null
+++ b/app-admin/eselect-mpost/files/mpost.eselect-0.3
@@ -0,0 +1,148 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: mpost.eselect-0.3,v 1.1 2011/01/09 18:41:34 aballier Exp $
+
+DESCRIPTION="Manage /usr/bin/mpost implementations"
+MAINTAINER="ml@gentoo.org"
+SVN_DATE='$Date: 2011/01/09 18:41:34 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# find a list of mpost symlink targets, best first
+find_targets() {
+	local f
+	for f in "${ROOT}"/usr/bin/mpost-*; do
+		if [[ -f ${f} ]] ; then
+			echo "${f##*/mpost-}"
+		fi
+	done | sort
+}
+
+# find version number of currently symlinked version
+identify_target() {
+	local f
+	f="$(canonicalise "${ROOT}"/usr/bin/mpost)"
+	echo "${f##*/mpost-}"
+}
+
+# try to remove the mpost symlink
+remove_symlinks() {
+	rm -f "${ROOT}"/usr/bin/mpost &>/dev/null
+}
+
+# set the mpost 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 "${ROOT}/usr/bin/mpost-${target}" ]] ; then
+		remove_symlinks
+		ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \
+			die "Could not set ${target} /usr/bin/mpost symlink"
+		echo "Updating TeX formats"
+		"${ROOT}"/usr/bin/fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly."
+	else
+		die -q "Target \"${target}\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current mpost version"
+}
+
+do_show() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	write_list_start "Current mpost version:"
+	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
+		write_kv_list_entry "$(identify_target)" ""
+	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
+		write_kv_list_entry "(not a symlink)" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available mpost versions"
+}
+
+do_list() {
+	[[ -z "${@}" ]] || 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 mpost versions:"
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new mpost 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 "${ROOT}/usr/bin/mpost" ]] ; 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 "${ROOT}/usr/bin/mpost" ]] ; then
+		die -q "${ROOT}/usr/bin/mpost 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 mpost 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 "${ROOT}/usr/bin/mpost" ]] ; then
+		[[ ${1} == "--if-unset" ]] && return
+		remove_symlinks || die -q "Can't remove existing symlink"
+	fi
+	if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
+		die -q "${ROOT}/usr/bin/mpost 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
+}