gentoo resync : 25.08.2020

3 files changed, 148 insertions, 5 deletions

diff --git a/app-eselect/eselect-sndpeek/Manifest b/app-eselect/eselect-sndpeek/Manifest
index 870aafd1a48d..ca0c49d8bdb4 100644
--- a/app-eselect/eselect-sndpeek/Manifest
+++ b/app-eselect/eselect-sndpeek/Manifest
@@ -1,3 +1,3 @@
-DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
-EBUILD eselect-sndpeek-1.0.1.ebuild 494 BLAKE2B b49f51ce32d3e090c7f6e4752c4f25f8e5c82e8d851c863e7b895c031e1faddfc33960ba42bdac1e667f9dc6016661bf4981055d8d66565588980503d1dfe142 SHA512 251e7a0d63e0102c713c1be9089562dd5765aa139797ba11b185cb0c5dd9f80c7182962fef4aec8dbfefd2700aa1b33ff93de6082bbbc7fb9712df0f61a5d24a
+AUX sndpeek.eselect-1.0.2 3421 BLAKE2B 3a878997876345421b86bbb95dbdf0a4f50562449236bac050d5fc7ff2432315f45160c5a74486814a71691178ce97a48480f56ac3957a3d24edc447446befd8 SHA512 f72e13fad3d2acda398c8e6674d45236effa1060e2e801397ffc80ab06ee61f881564e72de8d83c28286fc09ee3cae6e46d7560d156be9b8cfbdcfd2d46e6f20
+EBUILD eselect-sndpeek-1.0.2.ebuild 452 BLAKE2B 455ac3fe09169af1e99fa9e7703a8fde43f8f8d657fff3627a093fb167d5cd3d2ddbbcfb93835e4f2f975489ff12ac950780bb746c877f2e550ff1565357e90b SHA512 5bf579b600c81d8aa7d4b12bd4d59f4f3793091b25413127a7892bfec5583c80b241933faac59da4fdcd792834465ac7c5c4eb3f6b0df4e4f2b29bba662ec69f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
index f9b2155ae3d9..0214ffce2cdf 100644
--- a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,5 +18,5 @@ S="${WORKDIR}"
 
 src_install() {
 	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect
+	newins "${FILESDIR}/sndpeek.eselect-${PV}" sndpeek.eselect
 }
diff --git a/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2 b/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2
new file mode 100644
index 000000000000..edb54442ceb6
--- /dev/null
+++ b/app-eselect/eselect-sndpeek/files/sndpeek.eselect-1.0.2
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/sndpeek audio engine"
+MAINTAINER="cedk@gentoo.org"
+
+# find a list of sndpeek symlink targets, best first
+find_targets() {
+	local f
+	for f in \
+			${ROOT}/usr/bin/sndpeek-alsa \
+			${ROOT}/usr/bin/sndpeek-jack \
+			${ROOT}/usr/bin/sndpeek-oss \
+		; do
+		if [[ -f ${f} ]] ; then
+			echo $(basename ${f} )
+		fi
+	done
+}
+
+# try to remove the sndpeek symlink
+remove_symlinks() {
+	rm -f "${ROOT}"/usr/bin/sndpeek &>/dev/null
+}
+
+# set the sndpeek 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/${target}" ]] ; then
+		remove_symlinks
+
+		# it's not okay if these fail
+		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/sndpeek" || \
+			die "Couldn't set ${target} /usr/bin/sndpeek symlink"
+	else
+		die -q  "Target \"${1}\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current sndpeek audio engine"
+}
+
+do_show() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	write_list_start "Current sndpeek audio engine:"
+	if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) )" ""
+	elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		write_kv_list_entry "(not a symlink)" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available sndpeek audio engines"
+}
+
+do_list() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	local i targets
+	targets=( $(find_targets ) )
+	write_list_start "Available sndpeek audio engines:"
+	for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+		[[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) ) ]] && \
+			targets[${i}]=$(highlight_marker "${targets[${i}]}")
+	done
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new sndpeek audio engines"
+}
+
+describe_set_options() {
+	echo "target : Target name or number (from 'list' action)"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+do_set() {
+	if [[ -z "${1}" ]] ; then
+		die -q "You didn't give me an audio engine"
+
+	elif [[ -n "${2}" ]] ; then
+		die -q "Too many parameters"
+
+	elif [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		if ! remove_symlinks ; then
+			die -q "Can't remove existing provider"
+		elif ! set_symlinks "${1}" ; then
+			die -q "Can't set new provider"
+		fi
+
+	elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		die -q "Sorry, ${ROOT}/usr/bin/sndpeek confuses me"
+
+	else
+		set_symlinks "${1}" || die -q "Can't set a new audio engine"
+	fi
+}
+
+### update action ###
+
+describe_update() {
+	echo "Automatically update the audio engine"
+}
+
+describe_update_options() {
+	echo "--if-unset : Do not override existing audio engine"
+}
+
+do_update() {
+	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+		die -q "Usage error"
+
+	if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
+		[[ ${1} == "--if-unset" ]] && return
+		remove_symlinks || die -q "Can't remove existing link"
+	fi
+	if [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
+		die -q "Can't set a new provider"
+	elif ! [[ -z $(find_targets ) ]] ; then
+		set_symlinks 1 || die -q "Can't set a new provider"
+	fi
+}
+
+# vim: set ft=eselect :