[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 10eff55fcb6aad46bd0253aa413e6de61be932ce Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 29 06:58:19 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 29 06:58:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10eff55f app-accessibility/epos: Keyword 2.5.37-r3 arm64, #920870 Signed-off-by: Arthur Zamarin gentoo.org> app-accessibility/epos/epos-2.5.37-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild index 5e37997d1ed0..bb198daa9877 100644 --- a/app-accessibility/epos/epos-2.5.37-r3.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86" RESTRICT="test" # needs running eposd BDEPEND="dev-util/byacc"
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: e59f268c2686f081cf8177ab24d19731ba0c9646 Author: Sam James gentoo org> AuthorDate: Mon Feb 13 23:21:54 2023 + Commit: Sam James gentoo org> CommitDate: Mon Feb 13 23:21:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59f268c app-accessibility/epos: fix build w/ clang 16 Closes: https://bugs.gentoo.org/894178 Signed-off-by: Sam James gentoo.org> app-accessibility/epos/epos-2.5.37-r3.ebuild | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild index 81187ea939bf..5e37997d1ed0 100644 --- a/app-accessibility/epos/epos-2.5.37-r3.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic -DESCRIPTION="language independent text-to-speech system" +DESCRIPTION="Language independent text-to-speech system" HOMEPAGE="http://epos.ufe.cz/; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86" -IUSE="" +RESTRICT="test" # needs running eposd -RESTRICT=test # needs running eposd - -DEPEND="dev-util/byacc" -RDEPEND="" +BDEPEND="dev-util/byacc" PATCHES=( "${FILESDIR}"/${PN}-2.5.37-gcc43.patch @@ -36,6 +33,9 @@ src_prepare() { } src_configure() { + # Uses removed 'register' keyword, bug #894178 + append-cxxflags -std=c++03 + econf \ --enable-charsets \ --disable-portaudio \
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
commit: bd67edfb7ed3fec66643226d05641b9455f0a52f Author: Sergei Trofimovich gentoo org> AuthorDate: Mon May 10 07:42:09 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon May 10 07:42:28 2021 + 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 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 000..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
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 1eaac9dbf48a5a68f8630c7c055692fde5fcfc3c Author: Michał Górny gentoo org> AuthorDate: Sat Sep 19 07:58:33 2020 + Commit: Michał Górny gentoo org> CommitDate: Sat Sep 19 08:04:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eaac9db app-accessibility/epos: Remove unnecessary dep on sgmltools-lite The build system apparently calls sgml2html but it's not installed by sgmltools-lite, and the call is non-fatal. Signed-off-by: Michał Górny gentoo.org> .../epos/{epos-2.5.37-r2.ebuild => epos-2.5.37-r3.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild similarity index 93% rename from app-accessibility/epos/epos-2.5.37-r2.ebuild rename to app-accessibility/epos/epos-2.5.37-r3.ebuild index 89a3e1ef592..f4146ed522d 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -14,8 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86" IUSE="" -DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 - dev-util/byacc" +DEPEND="dev-util/byacc" RDEPEND="" PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 938e6d367ea01326b56648a92bc72f5f699c32c1 Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue Mar 31 16:38:44 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Mar 31 18:01:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938e6d36 app-accessibility/epos: drop to ~hppa Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-accessibility/epos/epos-2.5.37-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild index 0f1c8b1f6b4..8cffe794310 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 x86" +KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 x86" IUSE="" DEPEND=">=app-text/sgmltools-lite-3.0.3-r9
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 8e86cc9c1fdb78c4a27e4144bdb885b0079375df Author: Aaron Bauman gentoo org> AuthorDate: Fri May 25 01:58:22 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Fri May 25 01:58:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e86cc9c Revert "app-accessibility/epos: install usable voices" This reverts commit b200d21e293b99f166eadbaace8bbe1236a4199e. app-accessibility/epos/Manifest | 1 - app-accessibility/epos/epos-2.5.37-r3.ebuild | 54 app-accessibility/epos/metadata.xml | 3 -- 3 files changed, 58 deletions(-) diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest index ee944e90543..5b1848f15f7 100644 --- a/app-accessibility/epos/Manifest +++ b/app-accessibility/epos/Manifest @@ -1,2 +1 @@ DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef -DIST epos-tdp.tgz 31145030 BLAKE2B 9cfb9ae85c2db44050be7a8536da2ce2a9511c82dd9f4ae4ea9dc1ce70b29931b791518236b9649b86d8713c22535592af99875978cfd443fdbc88fc08b38eac SHA512 0ba7f22d4e150c63ab60537bcba570ee54caa84cb9e36290b46a2d48a7202969f188a9cc8fdf521154da29f1b935fb15dbe38fe4df7e3cdac19f400bbff93720 diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild deleted file mode 100644 index 37ac103df46..000 --- a/app-accessibility/epos/epos-2.5.37-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="language independent text-to-speech system" -HOMEPAGE="http://epos.ufe.cz/; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - voices? ( mirror://sourceforge/${PN}/voices/Czech%20_%20Machac%2BViolka%2C%20July%2005/epos-tdp.tgz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" -IUSE="+voices" - -DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 - dev-util/byacc" -RDEPEND="" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.37-gcc43.patch - "${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() { - default - sed -i -e "s/CCC/#CCC/" configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - --enable-charsets \ - --disable-portaudio \ - CXXFLAGS=-fno-delete-null-pointer-checks \ - YACC=byacc -} - -src_install() { - default - - doinitd "${FILESDIR}/eposd" - dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo" - if use voices ; then - insinto /usr/share/${PN}/inv/ - doins -r ../tdp - fi -} diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml index 8c2b0ba300d..ff924802b4d 100644 --- a/app-accessibility/epos/metadata.xml +++ b/app-accessibility/epos/metadata.xml @@ -8,7 +8,4 @@ epos - - Adds additional voices -
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 1b2e4282eab5a29266dce7cdd42aa75ebf887cbf Author: Aaron Bauman gentoo org> AuthorDate: Thu May 24 23:32:08 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Thu May 24 23:32:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2e4282 Revert "app-accessibility/epos: fix running on GCC-6" This reverts commit e6f97f0a34f9cce8727ec01375dede2840676544. app-accessibility/epos/epos-2.5.37-r2.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild index f07ea4ce66d..216717c781b 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild @@ -37,7 +37,6 @@ src_configure() { econf \ --enable-charsets \ --disable-portaudio \ - CXXFLAGS=-fno-delete-null-pointer-checks \ YACC=byacc }
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: b200d21e293b99f166eadbaace8bbe1236a4199e Author: Jan Breuer mobatime cz> AuthorDate: Mon Apr 9 09:50:50 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Thu May 24 21:57:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b200d21e app-accessibility/epos: install usable voices Bug: https://bugs.gentoo.org/526224 Closes: https://bugs.gentoo.org/526224 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-accessibility/epos/Manifest | 1 + app-accessibility/epos/epos-2.5.37-r3.ebuild | 54 app-accessibility/epos/metadata.xml | 3 ++ 3 files changed, 58 insertions(+) diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest index 5b1848f15f7..ee944e90543 100644 --- a/app-accessibility/epos/Manifest +++ b/app-accessibility/epos/Manifest @@ -1 +1,2 @@ DIST epos-2.5.37.tar.gz 976240 BLAKE2B 9304ea32f9506f130d13f5c1d14ad2dcc448cf978d0f7cd26f6bc97397f4590bd5456c9a529dbb941eb53f19cd64b849a1cbf5aee402a8eb171dbacfc85ada03 SHA512 870718a5e7b5048eafd62c478963de92fe8a90b3e755f79ea665dc33ad762c0ec4ebaf7c99d5f2be8983a0deacba284ae07b24d9a31bdd1a1eff5924327255ef +DIST epos-tdp.tgz 31145030 BLAKE2B 9cfb9ae85c2db44050be7a8536da2ce2a9511c82dd9f4ae4ea9dc1ce70b29931b791518236b9649b86d8713c22535592af99875978cfd443fdbc88fc08b38eac SHA512 0ba7f22d4e150c63ab60537bcba570ee54caa84cb9e36290b46a2d48a7202969f188a9cc8fdf521154da29f1b935fb15dbe38fe4df7e3cdac19f400bbff93720 diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild new file mode 100644 index 000..37ac103df46 --- /dev/null +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="language independent text-to-speech system" +HOMEPAGE="http://epos.ufe.cz/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + voices? ( mirror://sourceforge/${PN}/voices/Czech%20_%20Machac%2BViolka%2C%20July%2005/epos-tdp.tgz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="+voices" + +DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 + dev-util/byacc" +RDEPEND="" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.37-gcc43.patch + "${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() { + default + sed -i -e "s/CCC/#CCC/" configure.ac || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-charsets \ + --disable-portaudio \ + CXXFLAGS=-fno-delete-null-pointer-checks \ + YACC=byacc +} + +src_install() { + default + + doinitd "${FILESDIR}/eposd" + dodoc WELCOME THANKS Changes "${FILESDIR}/README.gentoo" + if use voices ; then + insinto /usr/share/${PN}/inv/ + doins -r ../tdp + fi +} diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml index ff924802b4d..8c2b0ba300d 100644 --- a/app-accessibility/epos/metadata.xml +++ b/app-accessibility/epos/metadata.xml @@ -8,4 +8,7 @@ epos + + Adds additional voices +
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: e6f97f0a34f9cce8727ec01375dede2840676544 Author: Jan Breuer mobatime cz> AuthorDate: Mon Apr 9 09:48:40 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Thu May 24 21:57:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f97f0a app-accessibility/epos: fix running on GCC-6 Bug: https://bugs.gentoo.org/649858 Closes: https://bugs.gentoo.org/649858 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7909 app-accessibility/epos/epos-2.5.37-r2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild index 216717c781b..f07ea4ce66d 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild @@ -37,6 +37,7 @@ src_configure() { econf \ --enable-charsets \ --disable-portaudio \ + CXXFLAGS=-fno-delete-null-pointer-checks \ YACC=byacc }
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
commit: 8fbdb72214f4e64288c4abe4b4bc6fb9eee760a7 Author: Peter Levine gmail com> AuthorDate: Sat Mar 31 08:48:54 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 4 21:09:32 2018 + 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 000..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 void CMatrix::multiplyByTransponed (const CMatrix , CMatrix ) + { + 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 void CMatrix::transponedMultiply (const CMatrix , CMatrix ) + { + int i,j,k; +- assert (rows == y.rows); ++ this->assert (rows == y.rows); + if (rows != y.rows) { retval.Realloc (0,0); return; } + + T sum;
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/, app-accessibility/epos/files/
commit: 3bd634703eb43f018ddfe0db5723ce58a92515a3 Author: Marty E. Plummer startmail com> AuthorDate: Thu Mar 22 12:48:19 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 26 20:19:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd63470 app-accessibility/epos: EAPI bump and patch updates Bump EAPI to 6, and cleanup the patches a bit Package-Manager: Portage-2.3.24, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/7589 app-accessibility/epos/epos-2.5.37-r2.ebuild| 21 - .../epos/files/epos-2.5.37-disable-tests.patch | 5 ++--- .../epos/files/epos-2.5.37-gcc43.patch | 8 .../epos/files/epos-2.5.37-gcc45.patch | 4 ++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild index 6f6c90eff6b..65a83ff55fe 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r2.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 -inherit eutils autotools +inherit autotools DESCRIPTION="language independent text-to-speech system" -HOMEPAGE="http://epos.ure.cas.cz/; +HOMEPAGE="http://epos.ufe.cz/; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -18,12 +18,15 @@ DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 dev-util/byacc" RDEPEND="" -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc45.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${FILESDIR}"/${P}-disable-tests.patch +PATCHES=( + "${FILESDIR}"/${PN}-2.5.37-gcc43.patch + "${FILESDIR}"/${PN}-2.5.37-gcc45.patch + "${FILESDIR}"/${PN}-2.5.37-gcc47.patch + "${FILESDIR}"/${PN}-2.5.37-disable-tests.patch +) +src_prepare() { + default sed -i -e "s/CCC/#CCC/" configure.ac || die eautoreconf diff --git a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch index a877ca68486..7556e7995a1 100644 --- a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch +++ b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch @@ -1,6 +1,5 @@ -diff -uNr epos-2.5.37.org/src/tests/Makefile.am epos-2.5.37/src/tests/Makefile.am epos-2.5.37.org/src/tests/Makefile.am 2012-04-14 00:38:56.0 -0400 -+++ epos-2.5.37/src/tests/Makefile.am 2012-04-14 00:39:10.0 -0400 +--- a/src/tests/Makefile.am b/src/tests/Makefile.am @@ -1,11 +1,9 @@ ##Process this file with automake run in the top directory to yield Makefile.in diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch index 4a61b5ffd04..c8b1dee857a 100644 --- a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch +++ b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch @@ -1,5 +1,5 @@ epos-2.5.37.orig/src/nnet/neural.cc -+++ epos-2.5.37/src/nnet/neural.cc +--- a/src/nnet/neural.cc b/src/nnet/neural.cc @@ -38,7 +38,7 @@ #include #include @@ -9,8 +9,8 @@ #include /* epos-2.5.37.orig/arch/win/service/install.cpp -+++ epos-2.5.37/arch/win/service/install.cpp +--- a/arch/win/service/install.cpp b/arch/win/service/install.cpp @@ -23,7 +23,7 @@ #include #include "service.h" diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch index 70af1db9440..cbc056dded9 100644 --- a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch +++ b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch @@ -2,8 +2,8 @@ Fixing build with gcc 4.5 http://bugs.gentoo.org/show_bug.cgi?id=318585 src/nnet/neural_parse.yy -+++ src/nnet/neural_parse.yy +--- a/src/nnet/neural_parse.yy b/src/nnet/neural_parse.yy @@ -255,7 +255,7 @@ int yyerror (char *s)
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 36a78fb5e76e928f1a441280cd9289686d55c10a Author: Wolfram Schlich gentoo org> AuthorDate: Thu May 4 13:32:07 2017 + Commit: Wolfram Schlich gentoo org> CommitDate: Thu May 4 13:32:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a78fb5 app-accessibility/epos: use and depend on byacc (fixes bug #513760) use and depend on byacc due to problems with =sys-devel/bison-3*, fixes bug #513760. Acked-By: William Hubbs gentoo.org> Package-Manager: Portage-2.3.5, Repoman-2.3.1 app-accessibility/epos/epos-2.5.37-r2.ebuild | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild index d1d19b1a7e3..6f6c90eff6b 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86" IUSE="" -DEPEND=">=app-text/sgmltools-lite-3.0.3-r9" +DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 + dev-util/byacc" RDEPEND="" src_prepare() { @@ -31,7 +32,8 @@ src_prepare() { src_configure() { econf \ --enable-charsets \ - --disable-portaudio + --disable-portaudio \ + YACC=byacc } src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/
commit: 61f80334f5b218e797f55287661d527f64d8e47d Author: William Hubbs gentoo org> AuthorDate: Fri May 6 22:39:48 2016 + Commit: William Hubbs gentoo org> CommitDate: Fri May 6 22:39:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f80334 app-accessibility/epos: remove old version Package-Manager: portage-2.2.26 app-accessibility/epos/epos-2.5.37-r1.ebuild | 43 1 file changed, 43 deletions(-) diff --git a/app-accessibility/epos/epos-2.5.37-r1.ebuild b/app-accessibility/epos/epos-2.5.37-r1.ebuild deleted file mode 100644 index 4cd66ac..000 --- a/app-accessibility/epos/epos-2.5.37-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -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" -}
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/epos/files/, app-accessibility/epos/
commit: 51ff0b1fe84a93efb239ad0f769a17f50b95be1c Author: William Hubbs gentoo org> AuthorDate: Fri May 6 22:35:41 2016 + Commit: William Hubbs gentoo org> CommitDate: Fri May 6 22:35:41 2016 + 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 000..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$