[gentoo-commits] repo/gentoo:master commit in: app-accessibility/espeakup/

[William Hubbs]

commit:     ae2b76c08dfb897f93b6124bfcaa8cd6b090920d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 19:59:00 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 19:59:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2b76c0

app-accessibility/espeakup: sync live

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-accessibility/espeakup/espeakup-9999.ebuild | 44 +++++++++++--------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index 95a1e0ea06b..a54813ed5d9 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() {