From 3aed5bbea3e511a5df73eb783bc29c154cf31226 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Thu, 2 Apr 2020 04:26:45 -0700
Subject: [PATCH] Rename eselect-electron since it was masked in portage

---
 .../eselect-electron-next-2.2.ebuild}         |   7 +-
 .../files/electron-2.2-next.eselect}          |   0
 .../eselect-electron-2.2.ebuild               |  23 ----
 .../files/electron-2.2.eselect                | 106 ------------------
 .../electron-bin/electron-bin-6.1.2.ebuild    |   3 +-
 .../electron-bin/electron-bin-6.1.6.ebuild    |   3 +-
 .../electron-bin/electron-bin-7.1.5.ebuild    |   3 +-
 .../electron-bin/electron-bin-7.2.1.ebuild    |   3 +-
 .../electron-bin/electron-bin-8.2.0.ebuild    |   3 +-
 dev-util/electron/electron-6.1.4.ebuild       |   2 +-
 dev-util/electron/electron-7.1.1.ebuild       |   2 +-
 dev-util/electron/electron-7.2.1.ebuild       |   2 +-
 dev-util/electron/electron-8.2.0.ebuild       |   2 +-
 13 files changed, 19 insertions(+), 140 deletions(-)
 rename app-eselect/{eselect-electron/eselect-electron-2.2-r1.ebuild => eselect-electron-next/eselect-electron-next-2.2.ebuild} (72%)
 rename app-eselect/{eselect-electron/files/electron-2.2-r1.eselect => eselect-electron-next/files/electron-2.2-next.eselect} (100%)
 delete mode 100644 app-eselect/eselect-electron/eselect-electron-2.2.ebuild
 delete mode 100644 app-eselect/eselect-electron/files/electron-2.2.eselect

diff --git a/app-eselect/eselect-electron/eselect-electron-2.2-r1.ebuild b/app-eselect/eselect-electron-next/eselect-electron-next-2.2.ebuild
similarity index 72%
rename from app-eselect/eselect-electron/eselect-electron-2.2-r1.ebuild
rename to app-eselect/eselect-electron-next/eselect-electron-next-2.2.ebuild
index 9716c23..a8292ac 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.2-r1.ebuild
+++ b/app-eselect/eselect-electron-next/eselect-electron-next-2.2.ebuild
@@ -12,12 +12,15 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="app-admin/eselect"
+DEPEND="
+	app-admin/eselect
+	!app-eselect/eselect-electron
+"
 RDEPEND="${DEPEND}"
 
 S="${FILESDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/electron-${PVR}.eselect electron.eselect
+	newins "${FILESDIR}"/electron-${PVR}-next.eselect electron.eselect
 }
diff --git a/app-eselect/eselect-electron/files/electron-2.2-r1.eselect b/app-eselect/eselect-electron-next/files/electron-2.2-next.eselect
similarity index 100%
rename from app-eselect/eselect-electron/files/electron-2.2-r1.eselect
rename to app-eselect/eselect-electron-next/files/electron-2.2-next.eselect
diff --git a/app-eselect/eselect-electron/eselect-electron-2.2.ebuild b/app-eselect/eselect-electron/eselect-electron-2.2.ebuild
deleted file mode 100644
index 9716c23..0000000
--- a/app-eselect/eselect-electron/eselect-electron-2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019 rexy712
-# Distributed under the terms of the GNU General Public License v3
-
-EAPI=7
-
-DESCRIPTION="Manages versions of electron executables"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-admin/eselect"
-RDEPEND="${DEPEND}"
-
-S="${FILESDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/electron-${PVR}.eselect electron.eselect
-}
diff --git a/app-eselect/eselect-electron/files/electron-2.2.eselect b/app-eselect/eselect-electron/files/electron-2.2.eselect
deleted file mode 100644
index 8def361..0000000
--- a/app-eselect/eselect-electron/files/electron-2.2.eselect
+++ /dev/null
@@ -1,106 +0,0 @@
-inherit config multilib
-
-DESCRIPTION="Manage electron versions"
-MAINTAINER="rexerton.rexy@tutamail.com"
-VERSION="2.2"
-
-USR_PATH="${EROOT%/}/usr"
-OPT_PATH="${EROOT%/}/opt"
-
-active_slot() {
-	if [ -h "${USR_PATH}/bin/electron" ];then
-		readlink "${USR_PATH}/bin/electron" | xargs basename
-	else
-		echo "(none)"
-	fi
-}
-get_slots() {
-	local found_slots=()
-	for slot in $(find "${USR_PATH}/bin" -mindepth 1 -maxdepth 1 \( -type f -o -type l \) -regex "${USR_PATH}"'/bin/electron\(-bin\)?-[1-9][0-9.]+\(-r[1-9]+\)?$');do
-		[ -x "${slot}" ] && found_slots+=( "${slot##*/}" )
-	done
-	echo ${found_slots[@]}
-}
-
-describe_list() {
-	echo "List available electron slots"
-}
-
-do_list() {
-	write_list_start "Available electron slots"
-	if $(is_output_mode brief);then
-		echo $(get_slots)
-	else
-		i=1
-		for slot in $(get_slots);do
-			case "${slot}" in
-				"$(active_slot)" )
-					write_kv_list_entry "$i) $(highlight_marker ${slot})";;
-				*)
-					write_kv_list_entry "$i) ${slot}";;
-			esac
-			i=$((i+1))
-		done
-		[ -z "$(get_slots)" ] && write_warning_msg "No slots available."
-	fi
-}
-
-describe_show() {
-	echo "Get active slot"
-}
-
-do_show() {
-	echo "$(active_slot)"
-}
-
-describe_set() {
-	echo "Set the symlink for the electron application"
-}
-
-_create_symlinks() {
-	local version_name="$1"
-	local libdir="$(get_libdir)"
-	[ -h "${USR_PATH}/bin/electron" ] && rm "${USR_PATH}/bin/electron"
-	ln -sf "${USR_PATH}/bin/${version_name}" "${USR_PATH}/bin/electron" || die
-	if [ -d "${USR_PATH}/${libdir}/${version_name}" ];then
-		[ -h "${USR_PATH}/${libdir}/electron" ] && rm "${USR_PATH}/${libdir}/electron"
-		ln -sf "${USR_PATH}/${libdir}/${version_name}" "${USR_PATH}/${libdir}/electron" || die
-	elif [ -d "${OPT_PATH}/electron/${version_name}" ];then
-		[ -h "${USR_PATH}/${libdir}/electron" ] && rm "${USR_PATH}/${libdir}/electron"
-		ln -sf "${OPT_PATH}/electron/${version_name}" "${USR_PATH}/${libdir}/electron" || die
-	elif [ -h "${USR_PATH}/${libdir}/electron" ];then
-		rm "${USR_PATH}/${libdir}/electron"
-	fi
-
-	if [ -d "${USR_PATH}/include/${version_name}" ];then
-		[ -h "${USR_PATH}/include/electron" ] && rm "${USR_PATH}/include/electron"
-		ln -sf "${USR_PATH}/include/${version_name}" "${USR_PATH}/include/electron" || die
-	elif [ -h "${USR_PATH}/include/electron" ];then
-		rm "${USR_PATH}/include/electron"
-	fi
-}
-
-do_set() {
-	local selected="$1"
-	if [ -e "${USR_PATH}/bin/${selected}" ] && [[ "${selected}" =~ ^electron(-bin)?-[1-9][0-9.]+(-r[1-9]+)? ]];then
-		_create_symlinks "${selected}"
-		return
-	elif [[ "${selected}" =~ ^[1-9][0-9]*$ ]];then
-		slots=( $(get_slots) )
-		if [ "${selected}" -le ${#slots[@]} ];then
-			_create_symlinks "${slots[$((selected-1))]}"
-			return
-		fi
-	fi
-
-	die -q "Not a valid slot"
-}
-describe_unset() {
-	echo "Remove electron symlinks"
-}
-do_unset() {
-	[ -h "${USR_PATH}/bin/electron" ] && rm "${USR_PATH}/bin/electron"
-	[ -h "${USR_PATH}/$(get_libdir)/electron" ] && rm "${USR_PATH}/$(get_libdir)/electron"
-	[ -h "${USR_PATH}/include/electron" ] && rm "${USR_PATH}/include/electron"
-}
-
diff --git a/dev-util/electron-bin/electron-bin-6.1.2.ebuild b/dev-util/electron-bin/electron-bin-6.1.2.ebuild
index f7dd1cf..a8184fc 100644
--- a/dev-util/electron-bin/electron-bin-6.1.2.ebuild
+++ b/dev-util/electron-bin/electron-bin-6.1.2.ebuild
@@ -51,10 +51,11 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	>=app-eselect/eselect-electron-next-2.2
 "
 DEPEND="
 	app-arch/unzip
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 "
 
 S="${WORKDIR}"
diff --git a/dev-util/electron-bin/electron-bin-6.1.6.ebuild b/dev-util/electron-bin/electron-bin-6.1.6.ebuild
index f7dd1cf..a8184fc 100644
--- a/dev-util/electron-bin/electron-bin-6.1.6.ebuild
+++ b/dev-util/electron-bin/electron-bin-6.1.6.ebuild
@@ -51,10 +51,11 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	>=app-eselect/eselect-electron-next-2.2
 "
 DEPEND="
 	app-arch/unzip
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 "
 
 S="${WORKDIR}"
diff --git a/dev-util/electron-bin/electron-bin-7.1.5.ebuild b/dev-util/electron-bin/electron-bin-7.1.5.ebuild
index 29971f0..c153fdb 100644
--- a/dev-util/electron-bin/electron-bin-7.1.5.ebuild
+++ b/dev-util/electron-bin/electron-bin-7.1.5.ebuild
@@ -51,10 +51,11 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	>=app-eselect/eselect-electron-next-2.2
 "
 DEPEND="
 	app-arch/unzip
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 "
 
 S="${WORKDIR}"
diff --git a/dev-util/electron-bin/electron-bin-7.2.1.ebuild b/dev-util/electron-bin/electron-bin-7.2.1.ebuild
index 3922a70..e5dd2ab 100644
--- a/dev-util/electron-bin/electron-bin-7.2.1.ebuild
+++ b/dev-util/electron-bin/electron-bin-7.2.1.ebuild
@@ -51,10 +51,11 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	>=app-eselect/eselect-electron-next-2.2
 "
 DEPEND="
 	app-arch/unzip
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 "
 
 S="${WORKDIR}"
diff --git a/dev-util/electron-bin/electron-bin-8.2.0.ebuild b/dev-util/electron-bin/electron-bin-8.2.0.ebuild
index 0248154..5c668ba 100644
--- a/dev-util/electron-bin/electron-bin-8.2.0.ebuild
+++ b/dev-util/electron-bin/electron-bin-8.2.0.ebuild
@@ -51,10 +51,11 @@ RDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/pango
+	>=app-eselect/eselect-electron-next-2.2
 "
 DEPEND="
 	app-arch/unzip
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 "
 
 S="${WORKDIR}"
diff --git a/dev-util/electron/electron-6.1.4.ebuild b/dev-util/electron/electron-6.1.4.ebuild
index 78192cd..7039dfb 100644
--- a/dev-util/electron/electron-6.1.4.ebuild
+++ b/dev-util/electron/electron-6.1.4.ebuild
@@ -33,7 +33,7 @@ RESTRICT="
 
 #DEPS
 COMMON_DEPEND="
-	>=app-eselect/eselect-electron-2.2
+	>=app-|eselect/eselect-electron-next-2.2
 	cups? ( >=net-print/cups-2.2:= )
 	dev-libs/expat:=
 	dev-libs/glib:2
diff --git a/dev-util/electron/electron-7.1.1.ebuild b/dev-util/electron/electron-7.1.1.ebuild
index 50b479d..e508b61 100644
--- a/dev-util/electron/electron-7.1.1.ebuild
+++ b/dev-util/electron/electron-7.1.1.ebuild
@@ -33,7 +33,7 @@ RESTRICT="
 
 #DEPS
 COMMON_DEPEND="
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 	cups? ( >=net-print/cups-2.2:= )
 	dev-libs/expat:=
 	dev-libs/glib:2
diff --git a/dev-util/electron/electron-7.2.1.ebuild b/dev-util/electron/electron-7.2.1.ebuild
index 7fc97d0..bafe582 100644
--- a/dev-util/electron/electron-7.2.1.ebuild
+++ b/dev-util/electron/electron-7.2.1.ebuild
@@ -33,7 +33,7 @@ RESTRICT="
 
 #DEPS
 COMMON_DEPEND="
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 	cups? ( >=net-print/cups-2.2:= )
 	dev-libs/expat:=
 	dev-libs/glib:2
diff --git a/dev-util/electron/electron-8.2.0.ebuild b/dev-util/electron/electron-8.2.0.ebuild
index f396ac4..e602027 100644
--- a/dev-util/electron/electron-8.2.0.ebuild
+++ b/dev-util/electron/electron-8.2.0.ebuild
@@ -33,7 +33,7 @@ RESTRICT="
 
 #DEPS
 COMMON_DEPEND="
-	>=app-eselect/eselect-electron-2.2
+	>=app-eselect/eselect-electron-next-2.2
 	cups? ( >=net-print/cups-2.2:= )
 	dev-libs/expat:=
 	dev-libs/glib:2