gentoo resync : 29.08.2018

4 files changed, 183 insertions, 0 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 19cbd9418a14..27c8b1053c10 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-unison/Manifest b/app-eselect/eselect-unison/Manifest
index 3af2f7b6409f..4e17785939d7 100644
--- a/app-eselect/eselect-unison/Manifest
+++ b/app-eselect/eselect-unison/Manifest
@@ -1,3 +1,5 @@
 AUX unison.eselect-0.3 3503 BLAKE2B 4aa6a2325277d6e76cb5f751ea582aea33cb8aadb57555e3da11a3276deb42137830b78a58da14ea91e2f638718138d08da5936551c6933c8d83e587d7a97e8b SHA512 67c8d9109e83643534219eb8c78bf797abf7e77751605dcfb7da6f48c5e26a1fffc36c991aef222b51427305e9b704c8e9aff23234994dc1424849673df91bf0
+AUX unison.eselect-0.4 3888 BLAKE2B 9af7e1efe1bd5fe646e2bbdea8332affe92ec9cd1558f33c544ee9d10abcf70d39137fefae2a8b046164177afaea5072c14e9b12a623832e10e6b7e05f421d34 SHA512 a3090fa316553f41392a69697a8d20cbf03ec9355cb215a9b660023fc664f372dfd4e159e9d22614f04cf9d34792512a8073b4ec8ed484b9a82eae2c934a6ad8
 EBUILD eselect-unison-0.3.ebuild 595 BLAKE2B 5284ff851825be73fab23e0a144932fe9b814fa6ab53066e8fa193298c8f1397ae810fe136b3dd58e12c39ceef922adf6c1f922d53ef8cbb58833c5694c3f8b2 SHA512 ed16e404d880a11f1a8252ed214daece8cf0126913d52ebc84b4e84dc1683275fbdfa3bb1dde895605291478cadad37cc9f1e24ecced83133e42ff834bf10e5d
+EBUILD eselect-unison-0.4.ebuild 566 BLAKE2B fe53767de8e69eff9e8fe4244864e433e8d18ae68a21dd71acd7932ce69e3fefd3f9451dd0a1e3181a91cda83196fb9000399ca43cc48f3cbf11bdb414ff3c1e SHA512 2ad2f569fb8e43b50d37b4e7145b8db1e7e1066b8c00067cef4e0810ff3e968fc4589f021ea02e92d444fe3b35ef957cbcc6ef1110ef403137401817f4f73c53
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/app-eselect/eselect-unison/eselect-unison-0.4.ebuild b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild
new file mode 100644
index 000000000000..d8f2e3d228f2
--- /dev/null
+++ b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="unison module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~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
+}
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.4 b/app-eselect/eselect-unison/files/unison.eselect-0.4
new file mode 100644
index 000000000000..b65381985bcb
--- /dev/null
+++ b/app-eselect/eselect-unison/files/unison.eselect-0.4
@@ -0,0 +1,156 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/unison versions"
+MAINTAINER="ml@gentoo.org"
+VERSION="0.4"
+
+# 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-}"
+}
+
+function is_link_or_empty() {
+    if [[ ! -e "$1" ]] || [[ -L "$1" ]]; then
+		return 0
+	else
+		return 1
+	fi
+}
+    
+# 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
+		ln -sf "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
+	# If unison-fsmonitor isn't a symlink, it means that we still have a
+	# unison version (<2.48-r1) that doesn't properly slot that binary.
+	# Don't mess with it if that's the case.
+	if is_link_or_empty "${EROOT}/usr/bin/unison-fsmonitor" ; then
+		# not a regular file. safe to symlink.
+		ln -sf "unison-fsmonitor-${target}" \
+			"${EROOT}/usr/bin/unison-fsmonitor" \
+			|| die "Could not set ${target} /usr/bin/unison-fsmonitor symlink"
+	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 ! 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" ]] && [[ ${1} == "--if-unset" ]]; then
+		return
+	fi
+	if ! is_link_or_empty "${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
+		rm -f "${EROOT}/usr/bin/unison"
+		rm -f "${EROOT}/usr/bin/unison-fsmonitor"
+	else
+		set_symlinks 1 || die -q "Can't set a new version"
+	fi
+}