[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-unison/files/
commit: df8b64f97e58ae0282f9e4d902d55d2d0d2d5fdb
Author: Sam James gentoo org>
AuthorDate: Wed Mar 29 16:56:16 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 29 19:44:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df8b64f9
app-eselect/eselect-unison: fix typo
Signed-off-by: Sam James gentoo.org>
app-eselect/eselect-unison/files/unison.eselect-0.4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.4
b/app-eselect/eselect-unison/files/unison.eselect-0.4
index b65381985bcb..f400610bf0e7 100644
--- a/app-eselect/eselect-unison/files/unison.eselect-0.4
+++ b/app-eselect/eselect-unison/files/unison.eselect-0.4
@@ -64,7 +64,7 @@ describe_show() {
do_show() {
[[ -z "${@}" ]] || die -q "Too many parameters"
- write_list_start "Current unison verson:"
+ write_list_start "Current unison version:"
if [[ -L "${EROOT}/usr/bin/unison" ]] ; then
write_kv_list_entry "$(identify_target)" ""
elif [[ -e "${EROOT}/usr/bin/unison" ]] ; then
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-unison/files/, app-eselect/eselect-unison/
commit: 82931cba6cef8cb744bfdbf4bec16ce2eb7ff8b0
Author: Michał Górny gentoo org>
AuthorDate: Mon Oct 7 13:10:18 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Oct 7 13:53:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82931cba
app-eselect/eselect-unison: Drop old (EAPI=0)
Signed-off-by: Michał Górny gentoo.org>
.../eselect-unison/eselect-unison-0.3.ebuild | 27
.../eselect-unison/files/unison.eselect-0.3| 145 -
2 files changed, 172 deletions(-)
diff --git a/app-eselect/eselect-unison/eselect-unison-0.3.ebuild
b/app-eselect/eselect-unison/eselect-unison-0.3.ebuild
deleted file mode 100644
index bef307805fc..000
--- a/app-eselect/eselect-unison/eselect-unison-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="unison module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/;
-SRC_URI=""
-
-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 \
- || die "failed to install"
-}
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.3
b/app-eselect/eselect-unison/files/unison.eselect-0.3
deleted file mode 100644
index 263c0fa7bc8..000
--- a/app-eselect/eselect-unison/files/unison.eselect-0.3
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*-eselect-*- vim: ft=eselect
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/unison versions"
-MAINTAINER="m...@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 ""
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-unison/files/, app-eselect/eselect-unison/
commit: 0c0c9072bebf9ecd237ba1cfd7999f1c9c59
Author: Virgil Dupras gentoo org>
AuthorDate: Mon Aug 27 18:37:26 2018 +
Commit: Virgil Dupras gentoo org>
CommitDate: Mon Aug 27 18:45:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0c9072
app-eselect/eselect-unison: bump to 0.4
This adds support for slotted fsmonitor which will be added in upcoming
net-misc/unison ebuilds
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../eselect-unison/eselect-unison-0.4.ebuild | 25
.../eselect-unison/files/unison.eselect-0.4| 156 +
2 files changed, 181 insertions(+)
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 000..d8f2e3d228f
--- /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 000..b65381985bc
--- /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="m...@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
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-unison/files/
commit: 5ae2ebdfa8f63a608fa2c2bc67477b39bbce87b4
Author: Manuel Rüger gentoo org>
AuthorDate: Fri Sep 11 14:44:23 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Fri Sep 11 14:46:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae2ebdf
app-eselect/eselect-unison: Remove missed unused files
Package-Manager: portage-2.2.20.1
.../eselect-unison/files/unison.eselect-0.1| 152 -
.../eselect-unison/files/unison.eselect-0.2| 147
2 files changed, 299 deletions(-)
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.1
b/app-eselect/eselect-unison/files/unison.eselect-0.1
deleted file mode 100644
index 6baa012..000
--- a/app-eselect/eselect-unison/files/unison.eselect-0.1
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/unison versions"
-MAINTAINER="m...@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:57:32 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of unison symlink targets, best first
-find_targets() {
- local f
- for f in "${ROOT}"/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 "${ROOT}"/usr/bin/unison)"
- echo "${f##*/unison-}"
-}
-
-# try to remove the unison symlink
-remove_symlinks() {
- rm -f "${ROOT}"/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 "${ROOT}/usr/bin/unison-${target}" ]] ; then
- remove_symlinks
- ln -s "unison-${target}" "${ROOT}/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 "${ROOT}/usr/bin/unison" ]] ; then
- write_kv_list_entry "$(identify_target)" ""
- elif [[ -e "${ROOT}/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() {
- [[ -z "${@}" ]] || die -q "Too many parameters"
-
- local i targets current
- targets=( $(find_targets ) )
- current=$(identify_target)
- if [[ -n ${targets[@]} ]] ; then
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- [[ ${targets[${i}]} == ${current} ]] && \
- targets[${i}]="${targets[${i}]} $(highlight '*'
)"
- done
- write_list_start "Available unison versions:"
- write_numbered_list "${targets[@]}"
- else
- write_kv_list_entry "(none found)" ""
- fi
-}
-
-### 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 ""
-}
-
-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/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 "${ROOT}/usr/bin/unison" ]] ; then
- die -q "${ROOT}/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 "${ROOT}/usr/bin/unison" ]] ; then
- [[ ${1} == "--if-unset" ]] && return
