From 933ed80ab9b645de54b16eeb7410c0a54f47574f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 18 Aug 2022 08:34:08 +0100 Subject: gentoo auto-resync : 18:08:2022 - 08:34:07 --- app-accessibility/Manifest.gz | Bin 4720 -> 4719 bytes app-accessibility/emacspeak/Manifest | 6 +- app-accessibility/emacspeak/emacspeak-56.0.ebuild | 94 ++++++++++++++++++++++ app-accessibility/emacspeak/emacspeak-9999.ebuild | 71 +++++++++------- app-accessibility/emacspeak/metadata.xml | 1 + 5 files changed, 143 insertions(+), 29 deletions(-) create mode 100644 app-accessibility/emacspeak/emacspeak-56.0.ebuild (limited to 'app-accessibility') diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index 274cfffa6887..8e5bfad5ce02 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest index b8f3ca6ea80e..3dd83b081743 100644 --- a/app-accessibility/emacspeak/Manifest +++ b/app-accessibility/emacspeak/Manifest @@ -1,4 +1,6 @@ DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173 +DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818 EBUILD emacspeak-39.0-r2.ebuild 2075 BLAKE2B 1adb4a4cade944dd77d4635f9db22face5b234e2c0d0b577902cd21e503c323c0fcbf93e254942cc7ccec3cad49adaf7b55b6f030d8b691b2887337ea9613381 SHA512 b1507eb711316486f4d026a40116d465e909c9709bae2fe4549369fc525d2dc55bd16621661296049174cb327e0e35fdc3d77511ba1edbb54b5f25a7d16da182 -EBUILD emacspeak-9999.ebuild 2078 BLAKE2B c5a3b3230f5e2ff9f321ba405aadf463f03d0a57657e4b96b00f1f0168f8a504f5689ae685ff81199a9b65ff178270b85d37470a26e1726fa68821542cbd57e9 SHA512 755477e57ed910b0142203839a2ab228eb6fd099b877024731b87fb62294d737dd79f4799a06104192209dd749342d189876ec58d18afb81281c38a7b3e619c9 -MISC metadata.xml 936 BLAKE2B 17dbe6b87657e6994fb3cfb424e7d2a053b86b704312841c92b8e8f0dac5b43f1155f2c1f96a562bd68872762b49b4dcd6ed9356c5d6c8c29746d20d62b0018d SHA512 4118b5a9d29358e3b6a2afeb8b6e5eb378adb41f95abf67514e41aa41d7973cc7f810622d2c63069020bd47e5e46b44a86d1b748d4888f6bd4842ceb29712f3d +EBUILD emacspeak-56.0.ebuild 2277 BLAKE2B 9599cb85e0419b300c23555612982a1b738096933a1195ed69b6e6c5d483710385d07d4d3028a24e7d5852bf3d479d6057c49977e630352effeb65d06edfd124 SHA512 72ad1cbad82531a9c266fce82295fdb4fbdd0afac90175d880c65adbf8c94d76a5e5ec16fa1e1196e5a72484e873f717b78d6c9f0c3b245476218a40c0f7af64 +EBUILD emacspeak-9999.ebuild 2277 BLAKE2B 9599cb85e0419b300c23555612982a1b738096933a1195ed69b6e6c5d483710385d07d4d3028a24e7d5852bf3d479d6057c49977e630352effeb65d06edfd124 SHA512 72ad1cbad82531a9c266fce82295fdb4fbdd0afac90175d880c65adbf8c94d76a5e5ec16fa1e1196e5a72484e873f717b78d6c9f0c3b245476218a40c0f7af64 +MISC metadata.xml 993 BLAKE2B e69adb1f4b3764ccbc6f716e1917ac6d29fbb0d596edc5f2aae57fafbb3ef1eef105cadb35e0f52d18f842cfa657f994cf5d38970777186c3f29125e5f9b79e2 SHA512 31a4d84e9c8910506df082217fd27f3eeb6f038e7f14903179f6b67c24cff4a7d00542565b99e9047aca80b2a78c47666e7f3670db2b9635b6c2dfdc25147bba diff --git a/app-accessibility/emacspeak/emacspeak-56.0.ebuild b/app-accessibility/emacspeak/emacspeak-56.0.ebuild new file mode 100644 index 000000000000..e9ce5050771c --- /dev/null +++ b/app-accessibility/emacspeak/emacspeak-56.0.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=26.1 +FORCE_PRINT_ELOG=1 +DISABLE_AUTOFORMATTING=1 +inherit elisp toolchain-funcs readme.gentoo-r1 + +DESCRIPTION="The emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" + inherit git-r3 +else + SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +LICENSE="BSD GPL-2" +SLOT="0" +IUSE="+espeak" + +# Usually need := dep with tcl anyway but in particular, it's needed +# here as we do a version check in src_compile and bake in the results. +DEPEND=" + dev-lang/tcl:= + espeak? ( app-accessibility/espeak-ng ) +" +RDEPEND=" + ${DEPEND} + >=dev-tcltk/tclx-8.4 +" + +DOC_CONTENTS=' +As of version 39.0 and later, the /usr/bin/emacspeak +shell script has been removed downstream in Gentoo. +You should launch emacspeak by another method, for instance +by adding the following to your ~/.emacs file: +(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") +' + +HTML_DOCS=( info/ ) + +src_configure() { + MAKEOPTS+=" -j1" + + tc-export CXX + + emake config +} + +src_compile() { + emake emacspeak + if use espeak; then + local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" + if [[ -z ${tcl_version} ]]; then + die 'Unable to detect the installed version of dev-lang/tcl.' + fi + + cd servers/native-espeak || die + emake TCL_VERSION="${tcl_version}" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + if use espeak; then + pushd servers/native-espeak > /dev/null || die + + emake DESTDIR="${D}" install + local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak" + local serverfile="${ED}${orig_serverdir}/tclespeak.so" + + install -Dm755 "${serverfile}" \ + "${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die + rm -f "${serverfile}" || die + + dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ + "${orig_serverdir}/tclespeak.so" + popd > /dev/null || die + fi + + dodoc README etc/NEWS* etc/COPYRIGHT + einstalldocs + + cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die + rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \ + user-guide || die + readme.gentoo_create_doc +} diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild index 67a6062698b4..e9ce5050771c 100644 --- a/app-accessibility/emacspeak/emacspeak-9999.ebuild +++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild @@ -1,31 +1,38 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -NEED_EMACS=24 +NEED_EMACS=26.1 FORCE_PRINT_ELOG=1 DISABLE_AUTOFORMATTING=1 -inherit elisp readme.gentoo-r1 +inherit elisp toolchain-funcs readme.gentoo-r1 -if [[ ${PV} == "9999" ]] ; then +DESCRIPTION="The emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" inherit git-r3 else - SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" + SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~x86" fi -DESCRIPTION="the emacspeak audio desktop" -HOMEPAGE="http://emacspeak.sourceforge.net/" LICENSE="BSD GPL-2" SLOT="0" IUSE="+espeak" -DEPEND="espeak? ( app-accessibility/espeak )" - -RDEPEND="${DEPEND} - >=dev-tcltk/tclx-8.4" +# Usually need := dep with tcl anyway but in particular, it's needed +# here as we do a version check in src_compile and bake in the results. +DEPEND=" + dev-lang/tcl:= + espeak? ( app-accessibility/espeak-ng ) +" +RDEPEND=" + ${DEPEND} + >=dev-tcltk/tclx-8.4 +" DOC_CONTENTS=' As of version 39.0 and later, the /usr/bin/emacspeak @@ -35,9 +42,13 @@ by adding the following to your ~/.emacs file: (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") ' -HTML_DOCS=( install-guide user-guide ) +HTML_DOCS=( info/ ) src_configure() { + MAKEOPTS+=" -j1" + + tc-export CXX + emake config } @@ -45,33 +56,39 @@ src_compile() { emake emacspeak if use espeak; then local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" - if [[ -z $tcl_version ]]; then + if [[ -z ${tcl_version} ]]; then die 'Unable to detect the installed version of dev-lang/tcl.' fi - cd servers/linux-espeak || die + + cd servers/native-espeak || die emake TCL_VERSION="${tcl_version}" fi } src_install() { emake DESTDIR="${D}" install - rm "${D}/usr/bin/emacspeak" + if use espeak; then - pushd servers/linux-espeak > /dev/null || die + pushd servers/native-espeak > /dev/null || die + emake DESTDIR="${D}" install - local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak" - local serverfile="${D}${orig_serverdir}/tclespeak.so" - install -Dm755 "$serverfile" \ - "${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die - rm -f "$serverfile" || die - dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ - "$orig_serverdir/tclespeak.so" + local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak" + local serverfile="${ED}${orig_serverdir}/tclespeak.so" + + install -Dm755 "${serverfile}" \ + "${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die + rm -f "${serverfile}" || die + + dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ + "${orig_serverdir}/tclespeak.so" popd > /dev/null || die fi - dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT + + dodoc README etc/NEWS* etc/COPYRIGHT einstalldocs - cd "${D}/usr/share/emacs/site-lisp/${PN}" || die - rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ + + cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die + rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \ user-guide || die readme.gentoo_create_doc } diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml index 85a649a04b8e..b4f85db5b90c 100644 --- a/app-accessibility/emacspeak/metadata.xml +++ b/app-accessibility/emacspeak/metadata.xml @@ -17,6 +17,7 @@ Adds support for the espeak tts engine + tvraman/emacspeak emacspeak emacspeak -- cgit v1.2.3