From dc9bfd846ffa3990be92029481684342bc57218e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Jan 2025 06:41:42 +0000 Subject: gentoo auto-resync : 12:01:2025 - 06:41:42 --- app-accessibility/Manifest.gz | Bin 4227 -> 4225 bytes app-accessibility/emacspeak/Manifest | 4 +- .../emacspeak/emacspeak-60.0-r1.ebuild | 116 +++++++++++++++++++++ app-accessibility/emacspeak/emacspeak-60.0.ebuild | 103 ------------------ app-accessibility/emacspeak/emacspeak-9999.ebuild | 68 ++++++++---- app-accessibility/kontrast/Manifest | 2 +- app-accessibility/kontrast/kontrast-24.12.1.ebuild | 2 +- 7 files changed, 165 insertions(+), 130 deletions(-) create mode 100644 app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild delete mode 100644 app-accessibility/emacspeak/emacspeak-60.0.ebuild (limited to 'app-accessibility') diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index eea1c77e3d84..5e0146879a42 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 d953c5615f48..67d462ed2eea 100644 --- a/app-accessibility/emacspeak/Manifest +++ b/app-accessibility/emacspeak/Manifest @@ -1,6 +1,6 @@ DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818 DIST emacspeak-60.0.tar.bz2 3056708 BLAKE2B 34e2112992fb95aa58e7ab1adf02c8839ab4729ffb920df7d93917c748d6d1c2d6c4ad68d8174da89f7fd6d6ea23d5a3d3f9bf1c59df0b988f3db70a9a1eeea4 SHA512 f48040f2dfaf7cb67d779d219c59477aaddb9c8b400666e5e9d9850e75575d5276f5b596ab1e8976057e5078d914a610cd537068ccc748e6c45aef64b02eaba9 EBUILD emacspeak-56.0-r1.ebuild 2283 BLAKE2B fb0b0ea079e257e0a1a2dd27776fadcadac4aa0d0bdcf43c5c86ef9f04b4c56e37df533ec6fb3c047bb52f254389a454560b6a038ec1586f0c4b8524b30e27b2 SHA512 c7a751d05064e3cdec174e3e521f16319a062d1f5295f0a1fa97eec4babf6a9a349ae0c4138e8eae2a12ddd39ef858b8359975d8bb3837b37859b25d4aaa9926 -EBUILD emacspeak-60.0.ebuild 2429 BLAKE2B 0764a1a6dd3fc1ab61aae42db61b62cad4789d70f5edef4b3a622e063d741ab187fb45761d53e945d004fd1397a71e4874bf64c69792ac8f6ffe6bc666eb6d86 SHA512 f8600e21c18a85dc59717a15686f44609a50319d4ce3da707493f165bb4a64671a63c3d725046407bc475677802b07c7a1a33042d71d4957dbc24cc7855147e1 -EBUILD emacspeak-9999.ebuild 2286 BLAKE2B 85fc53a57ab63441f5e0c1a66c55902e865bd23c63302cc8908538b21da65ddc25c1ee9acdd2428e0d772bc1bf6ed62a7a28fd65d548a7366c7fe88b1cf31f61 SHA512 69fe9774972fc90488cbd8b5457a0f2881e0068c7a32d9fd5b4f7f98de545b12b7ba18a2809cb5f8cc1b17ae98032f1683c6ba73a510ae0fcb18cd97c339f88e +EBUILD emacspeak-60.0-r1.ebuild 2705 BLAKE2B a0ac66e90743ceb14caf6a12040d4e802fc5731f1ce4af76eb7412d47983e5be0f80b4e548dcfbed1a5cf507dc32e69c4fc311c48b6ff8e82eda131049b547d3 SHA512 d756eb5b7d043a9136c6c23bec20db6053ef3f6b9f2238d2d145ce4d05446b24682e849243d3d35de6899051cb57683a08a55e7cbe6209db25e2aead365b8022 +EBUILD emacspeak-9999.ebuild 2705 BLAKE2B a0ac66e90743ceb14caf6a12040d4e802fc5731f1ce4af76eb7412d47983e5be0f80b4e548dcfbed1a5cf507dc32e69c4fc311c48b6ff8e82eda131049b547d3 SHA512 d756eb5b7d043a9136c6c23bec20db6053ef3f6b9f2238d2d145ce4d05446b24682e849243d3d35de6899051cb57683a08a55e7cbe6209db25e2aead365b8022 MISC metadata.xml 993 BLAKE2B e69adb1f4b3764ccbc6f716e1917ac6d29fbb0d596edc5f2aae57fafbb3ef1eef105cadb35e0f52d18f842cfa657f994cf5d38970777186c3f29125e5f9b79e2 SHA512 31a4d84e9c8910506df082217fd27f3eeb6f038e7f14903179f6b67c24cff4a7d00542565b99e9047aca80b2a78c47666e7f3670db2b9635b6c2dfdc25147bba diff --git a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild new file mode 100644 index 000000000000..bad87d3aa3fa --- /dev/null +++ b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS="29.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/ + https://github.com/tvraman/emacspeak/" + +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/tvraman/${PN}" +else + SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2" + + KEYWORDS="~amd64" +fi + +LICENSE="GPL-2+ GPL-3+" +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=" + app-emacs/hydra + 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 init file (~/.emacs or ~/.config/emacs/init.el): +(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") +' + +HTML_DOCS=( etc/ info/ ) + +src_prepare() { + elisp_src_prepare + + # A Make rule will regenerate it. + rm -f ./lisp/emacspeak-loaddefs.el || die +} + +src_configure() { + MAKEOPTS+=" -j1 " + tc-export CXX + + emake config +} + +src_compile() { + emake README + + cd "${S}/lisp" || die + emake emacspeak-loaddefs.el + local -x BYTECOMPFLAGS="-L . -l emacspeak-preamble.el -l emacspeak-loaddefs.el" + elisp_src_compile + + 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 "${S}/servers/native-espeak" || die + emake TCL_VERSION="${tcl_version}" + fi +} + +src_install() { + elisp-install emacspeak/lisp ./lisp/*.el{,c} + + 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 + + exeinto /usr/share/emacs/site-lisp/emacspeak/servers + doexe ./servers/espeak + + insinto /usr/share/emacs/site-lisp/emacspeak/servers + doins ./servers/tts-lib.tcl + fi + + dodoc README etc/NEWS* etc/COPYRIGHT + einstalldocs + + readme.gentoo_create_doc +} diff --git a/app-accessibility/emacspeak/emacspeak-60.0.ebuild b/app-accessibility/emacspeak/emacspeak-60.0.ebuild deleted file mode 100644 index 826442309b2e..000000000000 --- a/app-accessibility/emacspeak/emacspeak-60.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -NEED_EMACS="29.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/ - https://github.com/tvraman/emacspeak/" - -if [[ "${PV}" == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/tvraman/${PN}" - - inherit git-r3 -else - SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2" - - KEYWORDS="~amd64 ~ppc ~x86" -fi - -LICENSE="GPL-2+ GPL-3+" -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 init file (~/.emacs or ~/.config/emacs/init.el): -(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak.el") -' - -HTML_DOCS=( etc/ info/ ) - -src_configure() { - MAKEOPTS+=" -j1 " - tc-export CXX - - emake config -} - -src_compile() { - emake -C lisp - emake README - - 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() { - elisp-install emacspeak/lisp ./lisp/*.el{,c} - - 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 - - exeinto /usr/share/emacs/site-lisp/emacspeak/servers - doexe ./servers/espeak - - insinto /usr/share/emacs/site-lisp/emacspeak/servers - doins ./servers/tts-lib.tcl - fi - - dodoc README etc/NEWS* etc/COPYRIGHT - einstalldocs - - readme.gentoo_create_doc -} diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild index 9c9472dcc6bf..bad87d3aa3fa 100644 --- a/app-accessibility/emacspeak/emacspeak-9999.ebuild +++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild @@ -1,22 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 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 +NEED_EMACS="29.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/" +HOMEPAGE="http://emacspeak.sourceforge.net/ + https://github.com/tvraman/emacspeak/" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" +if [[ "${PV}" == 9999 ]] ; then inherit git-r3 + + EGIT_REPO_URI="https://github.com/tvraman/${PN}" else - SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~ppc ~x86" + SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2" + + KEYWORDS="~amd64" fi LICENSE="GPL-2+ GPL-3+" @@ -26,6 +30,7 @@ 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=" + app-emacs/hydra dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng ) " @@ -37,39 +42,52 @@ RDEPEND=" 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: +You should launch emacspeak by another method, for instance by adding +the following to your init file (~/.emacs or ~/.config/emacs/init.el): (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") ' HTML_DOCS=( etc/ info/ ) -src_configure() { - MAKEOPTS+=" -j1" +src_prepare() { + elisp_src_prepare + # A Make rule will regenerate it. + rm -f ./lisp/emacspeak-loaddefs.el || die +} + +src_configure() { + MAKEOPTS+=" -j1 " tc-export CXX emake config } src_compile() { - emake emacspeak - if use espeak; then + emake README + + cd "${S}/lisp" || die + emake emacspeak-loaddefs.el + local -x BYTECOMPFLAGS="-L . -l emacspeak-preamble.el -l emacspeak-loaddefs.el" + elisp_src_compile + + 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 + cd "${S}/servers/native-espeak" || die emake TCL_VERSION="${tcl_version}" fi } src_install() { - emake DESTDIR="${D}" install + elisp-install emacspeak/lisp ./lisp/*.el{,c} - if use espeak; then - pushd servers/native-espeak > /dev/null || die + 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" @@ -80,15 +98,19 @@ src_install() { rm -f "${serverfile}" || die dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ - "${orig_serverdir}/tclespeak.so" + "${orig_serverdir}/tclespeak.so" + popd > /dev/null || die + + exeinto /usr/share/emacs/site-lisp/emacspeak/servers + doexe ./servers/espeak + + insinto /usr/share/emacs/site-lisp/emacspeak/servers + doins ./servers/tts-lib.tcl 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/kontrast/Manifest b/app-accessibility/kontrast/Manifest index 4cf3b69135ea..f9036e9d588d 100644 --- a/app-accessibility/kontrast/Manifest +++ b/app-accessibility/kontrast/Manifest @@ -1,5 +1,5 @@ DIST kontrast-24.08.3.tar.xz 216192 BLAKE2B a645d18ad35da68078e811719aef0891274b711f1c6b7e4243fce28c3b3387a3583f441c50a9350525e5dc975ae392f7561de776dbbb7f3020fc2f6f384347fa SHA512 739dbcdaac77642eb3cf1b70fc163802ebf89071c10db5d2fd5ee7ce170a0648146634b5fde1570d760be92c13f7b727ae6d84b66b512ac1d2b94437ab3c1c4e DIST kontrast-24.12.1.tar.xz 217316 BLAKE2B 6e402cb7f7061f14dc07670213ec1c166c8050b04af499b28ae7567f5a2ce606dff750ac31869c1b864cf9b39d997c94d455045b782518fb2ed5454c63d3e4d8 SHA512 88221c514c28c4055e7c7bd6edf230dfffae8f43a624417dccb7ad62a03db861cb2c310085071963b883b55c5f3bb23085d477fbb6aa152604b2e9453fa36a62 EBUILD kontrast-24.08.3.ebuild 722 BLAKE2B 99252bcebb7d642bf05fb9f0087212568f0e6cb4e92c3be6df8e88df7acec50ab02d02873c3573c0ed2b8657c95f5d6de6ae93ccb835da9e3efe10a37ed40081 SHA512 d625eaf5e3b6d5a46577fb318757423ad22f29eede9fd2c5b4603594d8303f74a7b559da39534b3b450aba21baa62ce1ec18e7a06ddb972af1af0053e240d4d0 -EBUILD kontrast-24.12.1.ebuild 760 BLAKE2B 8e72b8a06b19436e19e47c7d5509809be5777fddcd6dbee4bcf98671aa8c8946ae7ed67662907534345a96dc4b46862d970f4f31c9e8dbdf762269de034d17c4 SHA512 f821dc7bd730d1b3e6055b0aad19b2f1213ecc0f51d8474b5258b621fe74592ebb3f8cdc440cb54205b317ce15ed156756f515d03800c534533ced3c7e81dd18 +EBUILD kontrast-24.12.1.ebuild 767 BLAKE2B fa9ba1f2316bd760b37f71a772b6e8a1d105ac53685bd1571d88acd86a5fb544c1f1b0e1e07ddf7f8bcc375852f00cbdb402b6c70476fa3e5c98e24d7575ab0d SHA512 19b066c2482b763356424e7fd562d76baa0af426919d200f048d8978e0ea723a2d1764107744a742c156437b343bb2c2a9657b79d278bb55ec3c79c0aec0ae72 MISC metadata.xml 384 BLAKE2B 769505c8a869e842511bb7202a31c4ac5d89dbf378199f669bfe7038d27aa63febbf2eedf8ea767545e1ab99be1718c9d67ff506842e2b624f512a98efcb0de4 SHA512 52a7f09822301efe07ad292d16d6625a22da14febe2236e69dfe7e7088750d2d2095d765a65466d80285d3b87ef8979ed0e75956f3cb9cd52127994b23de3c75 diff --git a/app-accessibility/kontrast/kontrast-24.12.1.ebuild b/app-accessibility/kontrast/kontrast-24.12.1.ebuild index 7a361c462d29..a13d7f3a7a90 100644 --- a/app-accessibility/kontrast/kontrast-24.12.1.ebuild +++ b/app-accessibility/kontrast/kontrast-24.12.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/" LICENSE="GPL-3+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" IUSE="" DEPEND=" -- cgit v1.2.3