From 61df240f72a84a17945ff4b20e18d426a4451b2a Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Tue, 7 Apr 2015 22:19:00 +0300 Subject: Moved app-admin/eselect to app-eselect/eselect* --- app-admin/eselect-lightdm/Manifest | 2 - .../eselect-lightdm/eselect-lightdm-0.2.ebuild | 25 --- .../eselect-lightdm/files/lightdm-0.2.eselect | 176 --------------------- app-eselect/eselect-lightdm/Manifest | 2 + .../eselect-lightdm/eselect-lightdm-0.2.ebuild | 25 +++ .../eselect-lightdm/files/lightdm-0.2.eselect | 176 +++++++++++++++++++++ x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild | 2 +- x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild | 2 +- .../lightdm-gtk-greeter-1.3.1-r1.ebuild | 2 +- .../lightdm-gtk-greeter-1.6.1.ebuild | 2 +- .../lightdm-gtk-greeter-1.7.0.ebuild | 2 +- .../lightdm-gtk-greeter-1.9.0.ebuild | 2 +- x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild | 2 +- x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild | 2 +- 16 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 app-admin/eselect-lightdm/Manifest delete mode 100644 app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild delete mode 100644 app-admin/eselect-lightdm/files/lightdm-0.2.eselect create mode 100644 app-eselect/eselect-lightdm/Manifest create mode 100644 app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild create mode 100644 app-eselect/eselect-lightdm/files/lightdm-0.2.eselect diff --git a/app-admin/eselect-lightdm/Manifest b/app-admin/eselect-lightdm/Manifest deleted file mode 100644 index 28551431..00000000 --- a/app-admin/eselect-lightdm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX lightdm-0.2.eselect 4393 SHA256 3953380345fcb011f6f6786a1b3800f0e06ff05f7b3abd93eb734a71980bdd25 SHA512 1908ad4f363d2e7cc74ead0d52a90bc87f4752d7140b0e1098935f8f4446cc260ed73b629c895dda3afa3449718077ed70253a9becb60820d94cc2e278aeacc9 WHIRLPOOL be3248dee97a416ad84db3f080673edb7bfcffe08b4d24f9f97307a917bfb4f8cd3c132f5a59cf971ca8c00a1f9379caf328f93f9379643925288f7150283349 -EBUILD eselect-lightdm-0.2.ebuild 497 SHA256 46b5b60218693e53db3a98dcfcebc1c13a44fec4cc2a7d7b7b8ef2e33f2fee5d SHA512 3f46dd3b7ac03d93d416696f03cbeb54cbaaacecec0fbeaff446d19e47175988dddd0c264d7015c38bf70d7808cdf1dd96a7aa643632b809bf957bac15f20a3f WHIRLPOOL e1e14d07473480e70673c4ea3a5b0ada4e93eda083f78e4bf9906724d0bc0cb335fa1d3a332250a3b36056542d1707db6f06e3cdb1568b33172fe05cf9968be9 diff --git a/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild b/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild deleted file mode 100644 index 7e1ef10b..00000000 --- a/app-admin/eselect-lightdm/eselect-lightdm-0.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -SRC_URI="" -KEYWORDS="~amd64 ~arm ~x86" - -DESCRIPTION="Eselect module for making easy to switch between LightDM greeters" -HOMEPAGE="http://www.sabayon.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -S="${WORKDIR}" - -RDEPEND="app-admin/eselect" -DEPEND="${RDEPEND}" - -src_install() { - insinto /usr/share/eselect/modules - newins "${FILESDIR}/lightdm-${PV}.eselect" lightdm.eselect -} diff --git a/app-admin/eselect-lightdm/files/lightdm-0.2.eselect b/app-admin/eselect-lightdm/files/lightdm-0.2.eselect deleted file mode 100644 index 00cf7e1d..00000000 --- a/app-admin/eselect-lightdm/files/lightdm-0.2.eselect +++ /dev/null @@ -1,176 +0,0 @@ -# -*-eselect-*- vim: ft=eselect -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 or later -# $Id: $ - -DESCRIPTION="Switch between LightDM greeters" -MAINTAINER="lxnay@gentoo.org" -VERSION="0.1" - -# Module variables -GREETERS_DIR="${EROOT}/usr/share/xgreeters" -GREETER_SYM="${GREETERS_DIR}/default.desktop" - -find_targets() { - local f fname - for f in "${GREETERS_DIR}/"*; do - [[ "${f}" == "${GREETER_SYM}" ]] && continue - # skip dirs - [[ -d "${f}" ]] && continue - # skip broken syms etc - [[ ! -e "${f}" ]] && continue - # skip non reg files - [[ ! -f "${f}" ]] && continue - - fname=$(basename "${f}") - [[ "${fname}" == *.desktop ]] || continue - - echo "${fname%%.desktop}" - done -} - -remove_symlink() { - rm "${GREETER_SYM}" -} - -set_symlink() { - local target="${1}" - - if is_number "${target}"; then - local targets=( $(find_targets) ) - target=${targets[target-1]} - fi - - [[ -z "${target}" || ! -f "${GREETERS_DIR}/${target}.desktop" ]] \ - && die -q "Target \"${target}\" doesn't appear to be valid!" - - echo "Setting LightDM greeter to ${target}" - ln -sf "${target}.desktop" "${GREETER_SYM}" || die "Cannot create symlink" -} - -### show action ### - -describe_show() { - echo "Show the current LightDM greeter" -} - -describe_show_options() { - echo "--quiet : only print the actual symlink value" - echo "--silent : same as --quiet" -} - -do_show() { - local quiet="" - - while [[ $# -gt 0 ]]; do - case ${1##--} in - quiet|silent) - quiet="1" - ;; - esac - shift - done - - [[ -z "${quiet}" ]] && write_list_start "Current greeter:" - if [[ -L "${GREETER_SYM}" ]] && [[ -e "${GREETER_SYM}" ]]; then - local greeter=$(canonicalise "${GREETER_SYM}") - local greeter_bn=$(basename "${greeter%.desktop}") - if [[ -n "${quiet}" ]]; then - echo "${greeter_bn}" - else - write_kv_list_entry "${greeter_bn}" "" - fi - else - if [[ -z "${quiet}" ]]; then - write_kv_list_entry "(unset)" "" - fi - fi -} - -### list action ### - -describe_list() { - echo "List available LightDM greeters" -} - -describe_list_options() { - echo "--quiet : only print the actual symlink value" - echo "--silent : same as --quiet" -} - -do_list() { - local quiet - - while [[ $# -gt 0 ]]; do - case ${1##--} in - quiet|silent) - quiet="1" - ;; - esac - shift - done - - local i targets=( $(find_targets) ) - - [[ -z "${quiet}" ]] && write_list_start "Available LightDM greeters:" - for (( i = 0; i < ${#targets[@]}; i++ )); do - if [[ -z "${quiet}" ]]; then - # highlight the target where the symlink is pointing to - [[ ${targets[i]} = \ - $(basename "$(canonicalise "${GREETER_SYM}")") ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") - else - echo "${targets[i]}" - fi - done - [[ -z "${quiet}" ]] && \ - write_numbered_list -m "(none found)" "${targets[@]}" -} - -### set action ### -describe_set() { - echo "Set a new LightDM greeter" -} - -describe_set_parameters() { - echo "" -} - -describe_set_options() { - echo "target : Target name or number (from 'list' action)" - echo "--use-old : use the old value if target is already set" -} - -do_set() { - local use_old - local target="${1}" - - while [[ $# -gt 0 ]]; do - case ${1##--} in - use-old) - use_old="1" - ;; - esac - shift - done - - [[ -z "${target}" ]] && \ - die -q "You didn't tell me what to set the symlink to" - [[ ${#} -gt 1 ]] && die -q "Too many parameters" - - if [[ "${use_old}" = "1" ]]; then - old_target=$(do_show --quiet) - target="${old_target:-${target}}" - fi - - if [[ -L "${GREETER_SYM}" ]]; then - # existing symlink - remove_symlink || die -q "Couldn't remove existing symlink" - set_symlink "${target}" || die -q "Couldn't set a new symlink" - elif [[ -e "${GREETER_SYM}" ]]; then - # we have something strange - die -q "${GREETER_SYM} exists but is not a symlink" - else - set_symlink "${target}" || die -q "Couldn't set a new symlink" - fi -} diff --git a/app-eselect/eselect-lightdm/Manifest b/app-eselect/eselect-lightdm/Manifest new file mode 100644 index 00000000..28551431 --- /dev/null +++ b/app-eselect/eselect-lightdm/Manifest @@ -0,0 +1,2 @@ +AUX lightdm-0.2.eselect 4393 SHA256 3953380345fcb011f6f6786a1b3800f0e06ff05f7b3abd93eb734a71980bdd25 SHA512 1908ad4f363d2e7cc74ead0d52a90bc87f4752d7140b0e1098935f8f4446cc260ed73b629c895dda3afa3449718077ed70253a9becb60820d94cc2e278aeacc9 WHIRLPOOL be3248dee97a416ad84db3f080673edb7bfcffe08b4d24f9f97307a917bfb4f8cd3c132f5a59cf971ca8c00a1f9379caf328f93f9379643925288f7150283349 +EBUILD eselect-lightdm-0.2.ebuild 497 SHA256 46b5b60218693e53db3a98dcfcebc1c13a44fec4cc2a7d7b7b8ef2e33f2fee5d SHA512 3f46dd3b7ac03d93d416696f03cbeb54cbaaacecec0fbeaff446d19e47175988dddd0c264d7015c38bf70d7808cdf1dd96a7aa643632b809bf957bac15f20a3f WHIRLPOOL e1e14d07473480e70673c4ea3a5b0ada4e93eda083f78e4bf9906724d0bc0cb335fa1d3a332250a3b36056542d1707db6f06e3cdb1568b33172fe05cf9968be9 diff --git a/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild b/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild new file mode 100644 index 00000000..7e1ef10b --- /dev/null +++ b/app-eselect/eselect-lightdm/eselect-lightdm-0.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +SRC_URI="" +KEYWORDS="~amd64 ~arm ~x86" + +DESCRIPTION="Eselect module for making easy to switch between LightDM greeters" +HOMEPAGE="http://www.sabayon.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +S="${WORKDIR}" + +RDEPEND="app-admin/eselect" +DEPEND="${RDEPEND}" + +src_install() { + insinto /usr/share/eselect/modules + newins "${FILESDIR}/lightdm-${PV}.eselect" lightdm.eselect +} diff --git a/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect b/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect new file mode 100644 index 00000000..00cf7e1d --- /dev/null +++ b/app-eselect/eselect-lightdm/files/lightdm-0.2.eselect @@ -0,0 +1,176 @@ +# -*-eselect-*- vim: ft=eselect +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 or later +# $Id: $ + +DESCRIPTION="Switch between LightDM greeters" +MAINTAINER="lxnay@gentoo.org" +VERSION="0.1" + +# Module variables +GREETERS_DIR="${EROOT}/usr/share/xgreeters" +GREETER_SYM="${GREETERS_DIR}/default.desktop" + +find_targets() { + local f fname + for f in "${GREETERS_DIR}/"*; do + [[ "${f}" == "${GREETER_SYM}" ]] && continue + # skip dirs + [[ -d "${f}" ]] && continue + # skip broken syms etc + [[ ! -e "${f}" ]] && continue + # skip non reg files + [[ ! -f "${f}" ]] && continue + + fname=$(basename "${f}") + [[ "${fname}" == *.desktop ]] || continue + + echo "${fname%%.desktop}" + done +} + +remove_symlink() { + rm "${GREETER_SYM}" +} + +set_symlink() { + local target="${1}" + + if is_number "${target}"; then + local targets=( $(find_targets) ) + target=${targets[target-1]} + fi + + [[ -z "${target}" || ! -f "${GREETERS_DIR}/${target}.desktop" ]] \ + && die -q "Target \"${target}\" doesn't appear to be valid!" + + echo "Setting LightDM greeter to ${target}" + ln -sf "${target}.desktop" "${GREETER_SYM}" || die "Cannot create symlink" +} + +### show action ### + +describe_show() { + echo "Show the current LightDM greeter" +} + +describe_show_options() { + echo "--quiet : only print the actual symlink value" + echo "--silent : same as --quiet" +} + +do_show() { + local quiet="" + + while [[ $# -gt 0 ]]; do + case ${1##--} in + quiet|silent) + quiet="1" + ;; + esac + shift + done + + [[ -z "${quiet}" ]] && write_list_start "Current greeter:" + if [[ -L "${GREETER_SYM}" ]] && [[ -e "${GREETER_SYM}" ]]; then + local greeter=$(canonicalise "${GREETER_SYM}") + local greeter_bn=$(basename "${greeter%.desktop}") + if [[ -n "${quiet}" ]]; then + echo "${greeter_bn}" + else + write_kv_list_entry "${greeter_bn}" "" + fi + else + if [[ -z "${quiet}" ]]; then + write_kv_list_entry "(unset)" "" + fi + fi +} + +### list action ### + +describe_list() { + echo "List available LightDM greeters" +} + +describe_list_options() { + echo "--quiet : only print the actual symlink value" + echo "--silent : same as --quiet" +} + +do_list() { + local quiet + + while [[ $# -gt 0 ]]; do + case ${1##--} in + quiet|silent) + quiet="1" + ;; + esac + shift + done + + local i targets=( $(find_targets) ) + + [[ -z "${quiet}" ]] && write_list_start "Available LightDM greeters:" + for (( i = 0; i < ${#targets[@]}; i++ )); do + if [[ -z "${quiet}" ]]; then + # highlight the target where the symlink is pointing to + [[ ${targets[i]} = \ + $(basename "$(canonicalise "${GREETER_SYM}")") ]] \ + && targets[i]=$(highlight_marker "${targets[i]}") + else + echo "${targets[i]}" + fi + done + [[ -z "${quiet}" ]] && \ + write_numbered_list -m "(none found)" "${targets[@]}" +} + +### set action ### +describe_set() { + echo "Set a new LightDM greeter" +} + +describe_set_parameters() { + echo "" +} + +describe_set_options() { + echo "target : Target name or number (from 'list' action)" + echo "--use-old : use the old value if target is already set" +} + +do_set() { + local use_old + local target="${1}" + + while [[ $# -gt 0 ]]; do + case ${1##--} in + use-old) + use_old="1" + ;; + esac + shift + done + + [[ -z "${target}" ]] && \ + die -q "You didn't tell me what to set the symlink to" + [[ ${#} -gt 1 ]] && die -q "Too many parameters" + + if [[ "${use_old}" = "1" ]]; then + old_target=$(do_show --quiet) + target="${old_target:-${target}}" + fi + + if [[ -L "${GREETER_SYM}" ]]; then + # existing symlink + remove_symlink || die -q "Couldn't remove existing symlink" + set_symlink "${target}" || die -q "Couldn't set a new symlink" + elif [[ -e "${GREETER_SYM}" ]]; then + # we have something strange + die -q "${GREETER_SYM} exists but is not a symlink" + else + set_symlink "${target}" || die -q "Couldn't set a new symlink" + fi +} diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild index 642486e7..b8f2b642 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild b/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild index d45f2006..40699016 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.4.0-r1.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild b/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild index 6dbd5f7f..724dcd10 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.4.0.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild index fd43798d..c9cc15b9 100644 --- a/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild +++ b/x11-misc/lightdm-base/lightdm-base-1.8.5-r2.ebuild @@ -34,7 +34,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig" -PDEPEND="app-admin/eselect-lightdm" +PDEPEND="app-eselect/eselect-lightdm" DOCS=( NEWS ) diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild index ee1077e5..9288f4b2 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1-r1.ebuild @@ -16,7 +16,7 @@ IUSE="" # This ebuild needs custom Rogentos themes, thus it must depend on rogentos-artwork-core DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" -RDEPEND="app-admin/eselect-lightdm +RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/kogaion-dark-theme diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild index caaec402..13eafaf6 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild @@ -16,7 +16,7 @@ IUSE="" # This ebuild needs custom Sabayon themes, thus it must depend on kogaion-artwork-core DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" -RDEPEND="app-admin/eselect-lightdm +RDEPEND="app-eselect/eselect-lightdm x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild index 6c30951d..a8aef2e6 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.7.0.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" RDEPEND="!!=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild index be818c54..4ed72451 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.9.0.ebuild @@ -19,7 +19,7 @@ IUSE="" DEPEND="x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2" RDEPEND="!!=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild index 1e9ac685..502867f3 100644 --- a/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild +++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.1.ebuild @@ -24,7 +24,7 @@ DEPEND="x11-libs/libX11 >=x11-misc/lightdm-1.3.2[qt4] " RDEPEND="${DEPEND} - app-admin/eselect-lightdm" + app-eselect/eselect-lightdm" S=${WORKDIR}/${PN/-kde}-${PV} diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild index 0099e1a5..e1d063b2 100644 --- a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild +++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1.ebuild @@ -24,7 +24,7 @@ DEPEND="x11-libs/libX11 >=x11-misc/lightdm-1.3.2[qt4] " RDEPEND="${DEPEND} - app-admin/eselect-lightdm" + app-eselect/eselect-lightdm" S=${WORKDIR}/${PN/-kde}-${PV} -- cgit v1.2.3