From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- app-eselect/eselect-unison/Manifest | 4 +- .../eselect-unison/eselect-unison-0.3.ebuild | 27 ---- .../eselect-unison/eselect-unison-0.4.ebuild | 4 +- .../eselect-unison/files/unison.eselect-0.3 | 145 --------------------- 4 files changed, 3 insertions(+), 177 deletions(-) delete mode 100644 app-eselect/eselect-unison/eselect-unison-0.3.ebuild delete mode 100644 app-eselect/eselect-unison/files/unison.eselect-0.3 (limited to 'app-eselect/eselect-unison') diff --git a/app-eselect/eselect-unison/Manifest b/app-eselect/eselect-unison/Manifest index 4e17785939d7..33328c856931 100644 --- a/app-eselect/eselect-unison/Manifest +++ b/app-eselect/eselect-unison/Manifest @@ -1,5 +1,3 @@ -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 +EBUILD eselect-unison-0.4.ebuild 560 BLAKE2B 88351051393d663d16ef542ddee4b88c293315c8506999b54000cfb8d2c3c2df52e925183f313addb90b3850e651c02643fee4a088c595874c53387fcaf54834 SHA512 f897666d1186e1ed50cfacafd8df341091a88d6cdeae274b630d7b16c65e9602da405b7d1c013571f78fbf736d9cc865943512e6b115190d07ab3ca956e70592 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 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 bef307805fc3..000000000000 --- 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/eselect-unison-0.4.ebuild b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild index d8f2e3d228f2..6246a68d7f0c 100644 --- a/app-eselect/eselect-unison/eselect-unison-0.4.ebuild +++ b/app-eselect/eselect-unison/eselect-unison-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="" 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 263c0fa7bc80..000000000000 --- 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="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 "" -} - -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 -} -- cgit v1.2.3