gentoo resync : 03.07.2021

4 files changed, 99 insertions, 26 deletions

diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index 739cdaac6370..2b556d31f898 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -1,6 +1,9 @@
 AUX espeakup.confd 256 BLAKE2B 1fc5aed1a603d19a7dcddaae05eb00dfe8651993c1f31dfb5a7db0737c24cc75f284dd313b7e1abd2c2841d408f7a719124aac91eb974a5b1e9ae00be4abf6a3 SHA512 aebd97c63dbeae5025bf54f39bb3e7d97822a2b1b369e40b013c5c7da2eba968adf48800f62ef14541ca22ed3f3dfcbdb63b2a3d7f45975ae8bddfea0a42d931
+AUX espeakup.initd 399 BLAKE2B 5fbc9c7f723519493829cd853232f959488dda14f1807344b20b424cc81aa5fda17b3431e8ef760c5011ad1bad78bffa87d861e45b8e008d4972ceb2087ae452 SHA512 034d880dc58523f4185137181109e4331549689ddcb271a0a307cc4a71987c1a8878287bb6da547d0e0c53c7559a5f14d6e61a16db8e893e7da2781f1cab73dd
 AUX espeakup.rc 284 BLAKE2B 9cbc247d542afa3ed7cc8be816a96cca7673b5af0f30f91c91ecde838b31311371b69ad02d195fbc41973d58844eefd997b83aa5f329bd3f1ec9d74ada55e05a SHA512 411e984074260d1a5e7cbf80ff4db7e16d7b5cca48a5e82491bc775c962636da1cefc79527921d8546056b969b8368a6c157833e27bb0e4e6aae48596225b747
 DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83
+DIST espeakup-0.90.tar.gz 25170 BLAKE2B f91a70bad0d985d313852b9e5f72dea4330ab23050ca6904ae5895d513088031f34d878cd64d97dcf2cf02dddc3e9fdabd0826cac98634829019ed3267e27bd8 SHA512 0731835a04063c5eac8ed0ed37cd92cc5d2dd1c58cbd94e158b7dfbb7bc0e2f84a6484fffd9009bf2920652a36fb737044b2e1fb67fb1679ee7150855bc9a15e
 EBUILD espeakup-0.80.ebuild 1788 BLAKE2B 104c80fd5c5ce820a4d4a467ef86c05f4e38d21753837d29812e8c2c7b1d1ab4d1787eca01cf79eb490b8eff918c401e9c835b6fba69ee1b45e328e1167c5e5c SHA512 4d5bbcc7df2febd0fb4bc90f07e678518b30a8212a9483d6161713e32491d849921dcaee1dd959c6925d82595e993ed6a07539de9ffc9b85d0d977d250941787
-EBUILD espeakup-9999.ebuild 1793 BLAKE2B 942b6e71215b319d1f222c11e395e2154d1a860ae0efca1623c9203a1f44fee49553950532d453804d996b5d466cefd0894823fad2eb4e31b4c3c1022ed3cd88 SHA512 f17b4b9779d724ce1711f29eb1164a225ce212ad11f11d6e2f5fe98ddccb805c68d8c2bd98b509f9911e5a30f365091c4a3cb83b23055257a5bae1ca6062a7ba
+EBUILD espeakup-0.90.ebuild 1519 BLAKE2B 501b27cfbf964404b3cee3601859ada23763899b884bddfb6bcdc6292a578a7fce9418db328c7b318333595e8ece5c78d7225320da52ed21cf89d63d8a7300ff SHA512 cb24dd2b6e8a0e69b3cbdb1f44d1fa9ea4c149f00b6853815d028cdbef00f2076c78b3a8d61a2c98bb5213b5e3fe9e874381439ada40859bdb71efcdceee8007
+EBUILD espeakup-9999.ebuild 1373 BLAKE2B 17f14459223aa1b4aa82468af10f7789c270065de2306616cbfcc8ff9c4be295fc3068216d70c5da4e560082c647542413f11116ef1aa86228965697d155b9ca SHA512 bfee229fb83a43340d2062e050328d3d5dcaa24ec61cd65a9c5a95f416078e6de8605e2426bd924031619db1f844a9e84044fa2f7148a36a692ffcb75c40f2ef
 MISC metadata.xml 598 BLAKE2B 35b3b3d19a05d23031fc6eaafb3385d2489e9be3e7e1b3f303bb6ef3d4276d04e6dd5309ee65a4678407dc3d27ce0dc194702ddb35c2a325e09e924ad7118c1b SHA512 88dd258de8e3239cc819d36aa4bb8431ba6bfdbbb4e183b42ccdcdedd8bf26b9ca8a682ae024b9e878a0a7f2313f06aa8b499958c86ee136312e8ce529ffb471
diff --git a/app-accessibility/espeakup/espeakup-0.90.ebuild b/app-accessibility/espeakup/espeakup-0.90.ebuild
new file mode 100644
index 000000000000..fac584f93722
--- /dev/null
+++ b/app-accessibility/espeakup/espeakup-0.90.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/williamh/espeakup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-speakup/espeakup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit linux-info meson
+
+DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
+HOMEPAGE="https://github.com/williamh/espeakup"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="man systemd"
+
+COMMON_DEPEND="app-accessibility/espeak-ng[sound]
+	media-libs/alsa-lib"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="man? ( app-text/ronn )"
+
+CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+
+src_configure() {
+	local emesonargs
+	emesonargs=(
+		$(meson_feature man)
+		$(meson_feature systemd)
+		)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	einstalldocs
+	newconfd "${FILESDIR}"/espeakup.confd espeakup
+	newinitd "${FILESDIR}"/espeakup.initd espeakup
+}
+
+pkg_postinst() {
+	elog "To get espeakup to start automatically, it is currently recommended"
+	elog "that you add it to the default run level, by giving the following"
+	elog "command as root."
+	elog
+	elog "rc-update add espeakup default"
+	elog
+	elog "You can also set a default voice now for espeakup."
+	elog "See /etc/conf.d/espeakup for how to do this."
+}
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index 95a1e0ea06b2..a54813ed5d95 100644
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -1,53 +1,47 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/williamh/espeakup.git"
 	inherit git-r3
 else
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	inherit vcs-snapshot
+	SRC_URI="https://github.com/linux-speakup/espeakup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
-inherit linux-info
+inherit linux-info meson
 
 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
 HOMEPAGE="https://github.com/williamh/espeakup"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="man systemd"
 
-COMMON_DEPEND="|| (
-	app-accessibility/espeak[portaudio]
-	app-accessibility/espeak[pulseaudio] )"
+COMMON_DEPEND="app-accessibility/espeak-ng[sound]
+	media-libs/alsa-lib"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
+BDEPEND="man? ( app-text/ronn )"
 
 CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
-ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
-ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
-
-pkg_setup() {
-	if kernel_is -ge 2 6 37; then
-		check_extra_config
-	elif ! has_version app-accessibility/speakup; then
-		ewarn "Cannot find speakup on your system."
-		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
-		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
-		ewarn "or install app-accessibility/speakup."
-	fi
+
+src_configure() {
+	local emesonargs
+	emesonargs=(
+		$(meson_feature man)
+		$(meson_feature systemd)
+		)
+	meson_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
+	meson_src_install
 	einstalldocs
 	newconfd "${FILESDIR}"/espeakup.confd espeakup
-	newinitd "${FILESDIR}"/espeakup.rc espeakup
+	newinitd "${FILESDIR}"/espeakup.initd espeakup
 }
 
 pkg_postinst() {
diff --git a/app-accessibility/espeakup/files/espeakup.initd b/app-accessibility/espeakup/files/espeakup.initd
new file mode 100644
index 000000000000..6ef0a339d1c9
--- /dev/null
+++ b/app-accessibility/espeakup/files/espeakup.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/espeakup
+command_args="${espeakup_opts:-${ESPEAKUP_OPTS}}"
+pidfile=/run/espeakup.pid
+
+depend() {
+	after modules
+	use alsasound pulseaudio
+}
+
+start_pre() {
+	[ -f /sys/accessibility/speakup/synth ] &&
+		echo soft > /sys/accessibility/speakup/synth
+	return 0
+}