* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
@ 2016-05-06 22:47 William Hubbs
0 siblings, 0 replies; 3+ messages in thread
From: William Hubbs @ 2016-05-06 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 51ff0b1fe84a93efb239ad0f769a17f50b95be1c
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 22:35:41 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri May 6 22:35:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ff0b1f
app-accessibility/epos: revision bump for /sbin/openrc-run migration
Package-Manager: portage-2.2.26
RepoMan-Options: --force
app-accessibility/epos/epos-2.5.37-r2.ebuild | 43 ++++++++++++++++++++++++++++
app-accessibility/epos/files/eposd | 2 +-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild
new file mode 100644
index 0000000..0381723
--- /dev/null
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="language independent text-to-speech system"
+HOMEPAGE="http://epos.ure.cas.cz/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=">=app-text/sgmltools-lite-3.0.3-r9"
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-gcc45.patch \
+ "${FILESDIR}"/${P}-gcc47.patch \
+ "${FILESDIR}"/${P}-disable-tests.patch
+
+ sed -i -e "s/CCC/#CCC/" configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-charsets \
+ --disable-portaudio
+}
+
+src_install() {
+ default
+
+ doinitd "${FILESDIR}/eposd"
+ dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo"
+}
diff --git a/app-accessibility/epos/files/eposd b/app-accessibility/epos/files/eposd
index b245da9..8301c62 100644
--- a/app-accessibility/epos/files/eposd
+++ b/app-accessibility/epos/files/eposd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
@ 2018-04-04 21:10 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-04-04 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 8fbdb72214f4e64288c4abe4b4bc6fb9eee760a7
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 31 08:48:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 4 21:09:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbdb722
app-accessibility/epos: Fix building with GCC-7
Bug: https://bugs.gentoo.org/638596
Closes: https://bugs.gentoo.org/638596
Closes: https://github.com/gentoo/gentoo/pull/7760
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7760
app-accessibility/epos/epos-2.5.37-r2.ebuild | 1 +
.../epos/files/epos-2.5.37-gcc7.patch | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild
index 65a83ff55fe..216717c781b 100644
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.37-gcc45.patch
"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+ "${FILESDIR}"/${PN}-2.5.37-gcc7.patch
)
src_prepare() {
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
new file mode 100644
index 00000000000..6c889a662c2
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/638596
+
+--- a/src/nnet/matrix.cc
++++ b/src/nnet/matrix.cc
+@@ -63,7 +63,7 @@
+ template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
+ {
+ int i,j,k;
+- assert (cols == y.cols);
++ this->assert (cols == y.cols);
+ if (cols != y.cols) { retval.Realloc (0,0); return; }
+
+ T sum;
+@@ -80,7 +80,7 @@
+ template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
+ {
+ int i,j,k;
+- assert (rows == y.rows);
++ this->assert (rows == y.rows);
+ if (rows != y.rows) { retval.Realloc (0,0); return; }
+
+ T sum;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
@ 2021-05-10 7:42 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2021-05-10 7:42 UTC (permalink / raw
To: gentoo-commits
commit: bd67edfb7ed3fec66643226d05641b9455f0a52f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 07:42:09 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 10 07:42:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd67edfb
app-accessibility/epos: tweak for gcc-11
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/786264
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-accessibility/epos/epos-2.5.37-r3.ebuild | 7 +-
.../epos/files/epos-2.5.37-gcc-11.patch | 81 ++++++++++++++++++++++
2 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild
index f4146ed522d..81187ea939b 100644
--- a/app-accessibility/epos/epos-2.5.37-r3.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -14,6 +14,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86"
IUSE=""
+RESTRICT=test # needs running eposd
+
DEPEND="dev-util/byacc"
RDEPEND=""
@@ -23,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.37-gcc47.patch
"${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
"${FILESDIR}"/${PN}-2.5.37-gcc7.patch
+ "${FILESDIR}"/${PN}-2.5.37-gcc-11.patch
)
src_prepare() {
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
new file mode 100644
index 00000000000..a14488b7d34
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch
@@ -0,0 +1,81 @@
+Avoid `container` namespace clash with gcc-11's libstdc++ headers.
+
+https://bugs.gentoo.org/786264
+--- a/src/nnet/xmltempl.cc
++++ b/src/nnet/xmltempl.cc
+@@ -22,10 +22,10 @@ CXml * x ::print () const { \
+ #define RP(x) x
+
+ #define child(x,tag) retval->AddChild (*xml_print (x,tag));
+-#define container(x,tag) retval->AddChild (*xml_print_container (x,tag));
++#define epos_container(x,tag) retval->AddChild (*xml_print_container (x,tag));
+ #define child_opt(x,tag) if(x) child(x,tag)
+ #define child_enum(x,tag,enumS) retval->AddChild (*xml_print (enumS[x],tag));
+-#define container_opt(x,tag) if(x.size()) container(x,tag)
++#define container_opt(x,tag) if(x.size()) epos_container(x,tag)
+ #define structure(x,tag) retval->AddChild (*xml_print_str (x,tag));
+ #define structure_opt(x,tag,write_cond) if (write_cond) structure(x,tag)
+
+@@ -40,7 +40,7 @@ CXml * x ::print () const { \
+ #define CHILD(x) child(x,#x)
+ #define CHILD_OPT(x) child_opt(x,#x)
+ #define CHILD_ENUM(x,enumS) child_enum(x,#x,enumS)
+-#define CONTAINER(x) container(x,#x)
++#define CONTAINER(x) epos_container(x,#x)
+ #define CONTAINER_OPT(x) container_opt (x,#x)
+ #define STRUCTURE(x) structure(x,#x)
+ #define STRUCTURE_OPT(x,cond) structure_opt(x,#x,cond)
+@@ -60,7 +60,7 @@ return retval; }
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -82,7 +82,7 @@ CString x ::read (CRox *xml) { \
+ #define child(x,tag) err += xml_read (xml,x,tag);
+ #define child_opt(x,tag) err += xml_read(xml,x,tag,false);
+ #define child_enum(x,tag,enumS) err += xml_read_enum(xml,x,enumS,tag);
+-#define container(x,tag) err += xml_read_container (xml,x,tag);
++#define epos_container(x,tag) err += xml_read_container (xml,x,tag);
+ #define container_opt(x,tag) err += xml_read_container (xml,x,tag,false);
+ #define structure(x,tag) err += xml_read_str (xml,x,tag);
+ #define structure_opt(x,tag,write_cond) err += xml_read_str (xml,x,tag,false);
+@@ -105,7 +105,7 @@ else return ""; }
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -119,7 +119,7 @@ else return ""; }
+
+ #define XMLIZE(x,tag) x tmp##tag; retval->AddChild (*tmp##tag.printTemplate ());
+ #define child(x,tag)
+-#define container(x,tag)
++#define epos_container(x,tag)
+ #define child_opt(x,tag)
+ #define child_enum(x,tag,enumS)
+ #define container_opt(x,tag)
+@@ -145,7 +145,7 @@ CRox *xmltempl ()
+ #undef child
+ #undef child_opt
+ #undef child_enum
+-#undef container
++#undef epos_container
+ #undef container_opt
+ #undef structure
+ #undef structure_opt
+@@ -171,7 +171,7 @@ CXml * x ::printTemplate () const { \
+ CXml *retval = new CXml (#tag,1,0,"comment","structure " #x); \
+ retval->SetFF(DODELETE);
+ #define child(x,tag) retval->AddChild (*(new CXml(tag,1,0,"comment",#x))->SetFF(DODELETE));
+-#define container(x,tag)
++#define epos_container(x,tag)
+ #define child_opt(x,tag)
+ #define child_enum(x,tag,enumS)
+ #define container_opt(x,tag)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-10 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-04 21:10 [gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-05-10 7:42 Sergei Trofimovich
2016-05-06 22:47 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox