* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2017-07-30 8:36 Michał Górny
0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2017-07-30 8:36 UTC (permalink / raw
To: gentoo-commits
commit: 2240534b9490f99d4198c67ce4b159bf9d892f58
Author: David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Fri Jul 28 23:20:28 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 08:35:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2240534b
app-accessibility/emacspeak: use HTTPS for GitHub
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-accessibility/emacspeak/emacspeak-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 2d661d9d9ea..203cdea8432 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ DISABLE_AUTOFORMATTING=1
inherit eutils readme.gentoo elisp
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://github.com/tvraman/emacspeak.git"
+ EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
inherit git-r3
else
SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2018-03-27 23:36 Aaron Bauman
0 siblings, 0 replies; 14+ messages in thread
From: Aaron Bauman @ 2018-03-27 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 11c05efb7def362bff4e89bb6525a2c6efa846ec
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Thu Mar 22 12:30:15 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 23:35:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c05efb
app-accessibility/emacspeak: EAPI bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../emacspeak/emacspeak-39.0-r2.ebuild | 23 ++++++++++------------
app-accessibility/emacspeak/emacspeak-9999.ebuild | 19 ++++++++----------
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
index b720e3de787..daa09b1d531 100644
--- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
NEED_EMACS=24
FORCE_PRINT_ELOG=1
DISABLE_AUTOFORMATTING=1
-inherit eutils readme.gentoo elisp
+inherit elisp readme.gentoo-r1
if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk"
- inherit subversion
+ EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
+ inherit git-r3
else
SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
KEYWORDS="amd64 ppc x86"
@@ -22,7 +22,7 @@ LICENSE="BSD GPL-2"
SLOT="0"
IUSE="+espeak"
- DEPEND="espeak? ( app-accessibility/espeak )"
+DEPEND="espeak? ( app-accessibility/espeak )"
RDEPEND="${DEPEND}
>=dev-tcltk/tclx-8.4"
@@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file:
(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
'
-src_prepare() {
- # Allow user patches to be applied without modifying the ebuild
- epatch_user
-}
+HTML_DOCS=( install-guide user-guide )
src_configure() {
emake config
@@ -51,7 +48,7 @@ src_compile() {
if [[ -z $tcl_version ]]; then
die 'Unable to detect the installed version of dev-lang/tcl.'
fi
- cd servers/linux-espeak
+ cd servers/linux-espeak || die
emake TCL_VERSION="${tcl_version}"
fi
}
@@ -72,8 +69,8 @@ src_install() {
popd > /dev/null || die
fi
dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
- dohtml -r install-guide user-guide
- cd "${D}/usr/share/emacs/site-lisp/${PN}"
+ einstalldocs
+ cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
rm -rf README etc/NEWS* etc/FAQ 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 203cdea8432..67a6062698b 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
NEED_EMACS=24
FORCE_PRINT_ELOG=1
DISABLE_AUTOFORMATTING=1
-inherit eutils readme.gentoo elisp
+inherit elisp readme.gentoo-r1
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git"
@@ -22,7 +22,7 @@ LICENSE="BSD GPL-2"
SLOT="0"
IUSE="+espeak"
- DEPEND="espeak? ( app-accessibility/espeak )"
+DEPEND="espeak? ( app-accessibility/espeak )"
RDEPEND="${DEPEND}
>=dev-tcltk/tclx-8.4"
@@ -35,10 +35,7 @@ by adding the following to your ~/.emacs file:
(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
'
-src_prepare() {
- # Allow user patches to be applied without modifying the ebuild
- epatch_user
-}
+HTML_DOCS=( install-guide user-guide )
src_configure() {
emake config
@@ -51,7 +48,7 @@ src_compile() {
if [[ -z $tcl_version ]]; then
die 'Unable to detect the installed version of dev-lang/tcl.'
fi
- cd servers/linux-espeak
+ cd servers/linux-espeak || die
emake TCL_VERSION="${tcl_version}"
fi
}
@@ -72,8 +69,8 @@ src_install() {
popd > /dev/null || die
fi
dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
- dohtml -r install-guide user-guide
- cd "${D}/usr/share/emacs/site-lisp/${PN}"
+ einstalldocs
+ cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
user-guide || die
readme.gentoo_create_doc
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-08-18 3:10 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-08-18 3:10 UTC (permalink / raw
To: gentoo-commits
commit: 09b3a728f077679df68431188a5bf7f35d595b1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 01:31:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 03:09:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b3a728
app-accessibility/emacspeak: add 56.0
Bug: https://bugs.gentoo.org/622166
Closes: https://bugs.gentoo.org/835097
Closes: https://bugs.gentoo.org/832135
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-accessibility/emacspeak/Manifest | 1 +
...emacspeak-9999.ebuild => emacspeak-56.0.ebuild} | 71 ++++++++++++++--------
app-accessibility/emacspeak/emacspeak-9999.ebuild | 71 ++++++++++++++--------
3 files changed, 89 insertions(+), 54 deletions(-)
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 1a147ca5f1d9..9245ede94a48 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1 +1,2 @@
DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173
+DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-56.0.ebuild
similarity index 50%
copy from app-accessibility/emacspeak/emacspeak-9999.ebuild
copy to app-accessibility/emacspeak/emacspeak-56.0.ebuild
index 67a6062698b4..e9ce5050771c 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0.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/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
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-08-18 3:10 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-08-18 3:10 UTC (permalink / raw
To: gentoo-commits
commit: 7b4b620c56450bbbc7e4a1b4e9ad978b871c51cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 01:02:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 03:09:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4b620c
app-accessibility/emacspeak: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-accessibility/emacspeak/metadata.xml | 1 +
1 file changed, 1 insertion(+)
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 @@
<flag name="espeak">Adds support for the espeak tts engine</flag>
</use>
<upstream>
+ <remote-id type="github">tvraman/emacspeak</remote-id>
<remote-id type="google-code">emacspeak</remote-id>
<remote-id type="sourceforge">emacspeak</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-08-19 2:40 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-08-19 2:40 UTC (permalink / raw
To: gentoo-commits
commit: 5133d269e69a7e5ce0e30810f5ccafc589237bb8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 19 02:15:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 02:15:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5133d269
app-accessibility/emacspeak: fix doc install
Closes: https://bugs.gentoo.org/865639
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../emacspeak/{emacspeak-56.0.ebuild => emacspeak-56.0-r1.ebuild} | 2 +-
app-accessibility/emacspeak/emacspeak-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-56.0.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
similarity index 98%
rename from app-accessibility/emacspeak/emacspeak-56.0.ebuild
rename to app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
index e9ce5050771c..c69eb8523dc5 100644
--- a/app-accessibility/emacspeak/emacspeak-56.0.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
@@ -42,7 +42,7 @@ by adding the following to your ~/.emacs file:
(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
'
-HTML_DOCS=( info/ )
+HTML_DOCS=( etc/ info/ )
src_configure() {
MAKEOPTS+=" -j1"
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index e9ce5050771c..c69eb8523dc5 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -42,7 +42,7 @@ by adding the following to your ~/.emacs file:
(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el")
'
-HTML_DOCS=( info/ )
+HTML_DOCS=( etc/ info/ )
src_configure() {
MAKEOPTS+=" -j1"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-09-04 23:58 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-09-04 23:58 UTC (permalink / raw
To: gentoo-commits
commit: d8eb72933f0952b4ea774cc6cedd37ef88672722
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 23:57:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 23:57:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8eb7293
app-accessibility/emacspeak: Stabilize 56.0-r1 amd64, #868510
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
index c69eb8523dc5..f56aff02bdbc 100644
--- a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
LICENSE="BSD GPL-2"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-09-05 14:02 Agostino Sarubbo
0 siblings, 0 replies; 14+ messages in thread
From: Agostino Sarubbo @ 2022-09-05 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 68808de707bffde6978366047ab6250a62969961
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 14:02:01 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 14:02:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68808de7
app-accessibility/emacspeak: ppc stable wrt bug #868510
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
index f56aff02bdbc..d2770139e482 100644
--- a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ppc ~x86"
fi
LICENSE="BSD GPL-2"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-09-05 14:36 Jakov Smolić
0 siblings, 0 replies; 14+ messages in thread
From: Jakov Smolić @ 2022-09-05 14:36 UTC (permalink / raw
To: gentoo-commits
commit: d6360648c3ce8718e4f8ef446ce8af2dca036d40
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 14:35:28 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 14:35:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6360648
app-accessibility/emacspeak: Stabilize 56.0-r1 x86, #868510
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
index d2770139e482..e080760e574e 100644
--- a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 ppc ~x86"
+ KEYWORDS="amd64 ppc x86"
fi
LICENSE="BSD GPL-2"
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-10-15 15:02 Maciej Barć
0 siblings, 0 replies; 14+ messages in thread
From: Maciej Barć @ 2022-10-15 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 6007dcfa4f79d51d92bbc17ff352d103cf47c14c
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:01:33 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:02:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6007dcfa
app-accessibility/emacspeak: fix LICENSE
Closes: https://bugs.gentoo.org/871660
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild | 4 ++--
app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild | 2 +-
app-accessibility/emacspeak/emacspeak-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
index daa09b1d5317..f79fa363068f 100644
--- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ fi
DESCRIPTION="the emacspeak audio desktop"
HOMEPAGE="http://emacspeak.sourceforge.net/"
-LICENSE="BSD GPL-2"
+LICENSE="GPL-2+ GPL-3+"
SLOT="0"
IUSE="+espeak"
diff --git a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
index e080760e574e..2fb27f565d08 100644
--- a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild
@@ -19,7 +19,7 @@ else
KEYWORDS="amd64 ppc x86"
fi
-LICENSE="BSD GPL-2"
+LICENSE="GPL-2+ GPL-3+"
SLOT="0"
IUSE="+espeak"
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index c69eb8523dc5..9c9472dcc6bf 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -19,7 +19,7 @@ else
KEYWORDS="~amd64 ~ppc ~x86"
fi
-LICENSE="BSD GPL-2"
+LICENSE="GPL-2+ GPL-3+"
SLOT="0"
IUSE="+espeak"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2022-10-20 4:03 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-10-20 4:03 UTC (permalink / raw
To: gentoo-commits
commit: 75a638fbfb200433ba393690ad5bc8f46a95852b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 03:55:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 03:55:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a638fb
app-accessibility/emacspeak: drop 39.0-r2
Closes: https://bugs.gentoo.org/622166
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-accessibility/emacspeak/Manifest | 1 -
.../emacspeak/emacspeak-39.0-r2.ebuild | 77 ----------------------
2 files changed, 78 deletions(-)
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index 9245ede94a48..b01f904e548b 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1,2 +1 @@
-DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173
DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818
diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
deleted file mode 100644
index f79fa363068f..000000000000
--- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NEED_EMACS=24
-FORCE_PRINT_ELOG=1
-DISABLE_AUTOFORMATTING=1
-inherit elisp readme.gentoo-r1
-
-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"
- KEYWORDS="amd64 ppc x86"
-fi
-
-DESCRIPTION="the emacspeak audio desktop"
-HOMEPAGE="http://emacspeak.sourceforge.net/"
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="+espeak"
-
-DEPEND="espeak? ( app-accessibility/espeak )"
-
-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=( install-guide user-guide )
-
-src_configure() {
- 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/linux-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
- 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"
- popd > /dev/null || die
- fi
- dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT
- einstalldocs
- cd "${D}/usr/share/emacs/site-lisp/${PN}" || die
- rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \
- user-guide || die
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2025-01-11 2:02 Maciej Barć
0 siblings, 0 replies; 14+ messages in thread
From: Maciej Barć @ 2025-01-11 2:02 UTC (permalink / raw
To: gentoo-commits
commit: 4cd0251c7433aaff54debe7117f8ffdb07a896c5
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 01:59:35 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 02:02:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd0251c
app-accessibility/emacspeak: bump to 60.0
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-accessibility/emacspeak/Manifest | 1 +
app-accessibility/emacspeak/emacspeak-60.0.ebuild | 103 ++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest
index b01f904e548b..25e0a9b61d29 100644
--- a/app-accessibility/emacspeak/Manifest
+++ b/app-accessibility/emacspeak/Manifest
@@ -1 +1,2 @@
DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818
+DIST emacspeak-60.0.tar.bz2 3056708 BLAKE2B 34e2112992fb95aa58e7ab1adf02c8839ab4729ffb920df7d93917c748d6d1c2d6c4ad68d8174da89f7fd6d6ea23d5a3d3f9bf1c59df0b988f3db70a9a1eeea4 SHA512 f48040f2dfaf7cb67d779d219c59477aaddb9c8b400666e5e9d9850e75575d5276f5b596ab1e8976057e5078d914a610cd537068ccc748e6c45aef64b02eaba9
diff --git a/app-accessibility/emacspeak/emacspeak-60.0.ebuild b/app-accessibility/emacspeak/emacspeak-60.0.ebuild
new file mode 100644
index 000000000000..826442309b2e
--- /dev/null
+++ b/app-accessibility/emacspeak/emacspeak-60.0.ebuild
@@ -0,0 +1,103 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2025-01-11 16:29 Maciej Barć
0 siblings, 0 replies; 14+ messages in thread
From: Maciej Barć @ 2025-01-11 16:29 UTC (permalink / raw
To: gentoo-commits
commit: c51fb6cfa262caf7808c22a5c321494eecc2a89a
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 16:17:01 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 16:29:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c51fb6cf
app-accessibility/emacspeak: update live 9999
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-9999.ebuild | 65 +++++++++++++++--------
1 file changed, 43 insertions(+), 22 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 9c9472dcc6bf..13b3d58ac497 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -1,21 +1,25 @@
-# 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"
+ SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
KEYWORDS="~amd64 ~ppc ~x86"
fi
@@ -37,39 +41,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 +97,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
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2025-01-11 16:29 Maciej Barć
0 siblings, 0 replies; 14+ messages in thread
From: Maciej Barć @ 2025-01-11 16:29 UTC (permalink / raw
To: gentoo-commits
commit: eea1492c31992f2e69d7c4241557a330f3eaec52
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 16:11:23 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 16:29:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea1492c
app-accessibility/emacspeak: use elisp_src_compile
Closes: https://bugs.gentoo.org/947898
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
...cspeak-60.0.ebuild => emacspeak-60.0-r1.ebuild} | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-60.0.ebuild b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
similarity index 85%
rename from app-accessibility/emacspeak/emacspeak-60.0.ebuild
rename to app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
index 826442309b2e..556f5a80588f 100644
--- a/app-accessibility/emacspeak/emacspeak-60.0.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
@@ -14,9 +14,9 @@ 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
+
+ EGIT_REPO_URI="https://github.com/tvraman/${PN}"
else
SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
@@ -43,11 +43,18 @@ 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")
+(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 ./lisp/emacspeak-loaddefs.el || die
+}
+
src_configure() {
MAKEOPTS+=" -j1 "
tc-export CXX
@@ -56,16 +63,21 @@ src_configure() {
}
src_compile() {
- emake -C lisp
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
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/
@ 2025-01-11 16:29 Maciej Barć
0 siblings, 0 replies; 14+ messages in thread
From: Maciej Barć @ 2025-01-11 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 4ca4fa22f96fcaed121b365f71c2a9a8adce15b9
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 16:25:21 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 16:29:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca4fa22
app-accessibility/emacspeak: add missing hydra dep
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild | 5 +++--
app-accessibility/emacspeak/emacspeak-9999.ebuild | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
index 556f5a80588f..bad87d3aa3fa 100644
--- a/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-60.0-r1.ebuild
@@ -20,7 +20,7 @@ if [[ "${PV}" == 9999 ]] ; then
else
SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64"
fi
LICENSE="GPL-2+ GPL-3+"
@@ -30,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 )
"
@@ -52,7 +53,7 @@ src_prepare() {
elisp_src_prepare
# A Make rule will regenerate it.
- rm ./lisp/emacspeak-loaddefs.el || die
+ rm -f ./lisp/emacspeak-loaddefs.el || die
}
src_configure() {
diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild
index 13b3d58ac497..bad87d3aa3fa 100644
--- a/app-accessibility/emacspeak/emacspeak-9999.ebuild
+++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -20,7 +20,7 @@ if [[ "${PV}" == 9999 ]] ; then
else
SRC_URI="https://github.com/tvraman/${PN}/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64"
fi
LICENSE="GPL-2+ GPL-3+"
@@ -30,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 )
"
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2025-01-11 16:29 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-30 8:36 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/emacspeak/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-03-27 23:36 Aaron Bauman
2022-08-18 3:10 Sam James
2022-08-18 3:10 Sam James
2022-08-19 2:40 Sam James
2022-09-04 23:58 Sam James
2022-09-05 14:02 Agostino Sarubbo
2022-09-05 14:36 Jakov Smolić
2022-10-15 15:02 Maciej Barć
2022-10-20 4:03 Sam James
2025-01-11 2:02 Maciej Barć
2025-01-11 16:29 Maciej Barć
2025-01-11 16:29 Maciej Barć
2025-01-11 16:29 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox