1 |
commit: 3bd634703eb43f018ddfe0db5723ce58a92515a3 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Thu Mar 22 12:48:19 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 26 20:19:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd63470 |
7 |
|
8 |
app-accessibility/epos: EAPI bump and patch updates |
9 |
|
10 |
Bump EAPI to 6, and cleanup the patches a bit |
11 |
|
12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/7589 |
14 |
|
15 |
app-accessibility/epos/epos-2.5.37-r2.ebuild | 21 ++++++++++++--------- |
16 |
.../epos/files/epos-2.5.37-disable-tests.patch | 5 ++--- |
17 |
.../epos/files/epos-2.5.37-gcc43.patch | 8 ++++---- |
18 |
.../epos/files/epos-2.5.37-gcc45.patch | 4 ++-- |
19 |
4 files changed, 20 insertions(+), 18 deletions(-) |
20 |
|
21 |
diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild |
22 |
index 6f6c90eff6b..65a83ff55fe 100644 |
23 |
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild |
24 |
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild |
25 |
@@ -1,12 +1,12 @@ |
26 |
-# Copyright 1999-2017 Gentoo Foundation |
27 |
+# Copyright 1999-2018 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
|
30 |
-EAPI=5 |
31 |
+EAPI=6 |
32 |
|
33 |
-inherit eutils autotools |
34 |
+inherit autotools |
35 |
|
36 |
DESCRIPTION="language independent text-to-speech system" |
37 |
-HOMEPAGE="http://epos.ure.cas.cz/" |
38 |
+HOMEPAGE="http://epos.ufe.cz/" |
39 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
40 |
|
41 |
LICENSE="GPL-2" |
42 |
@@ -18,12 +18,15 @@ DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 |
43 |
dev-util/byacc" |
44 |
RDEPEND="" |
45 |
|
46 |
-src_prepare() { |
47 |
- epatch "${FILESDIR}"/${P}-gcc43.patch \ |
48 |
- "${FILESDIR}"/${P}-gcc45.patch \ |
49 |
- "${FILESDIR}"/${P}-gcc47.patch \ |
50 |
- "${FILESDIR}"/${P}-disable-tests.patch |
51 |
+PATCHES=( |
52 |
+ "${FILESDIR}"/${PN}-2.5.37-gcc43.patch |
53 |
+ "${FILESDIR}"/${PN}-2.5.37-gcc45.patch |
54 |
+ "${FILESDIR}"/${PN}-2.5.37-gcc47.patch |
55 |
+ "${FILESDIR}"/${PN}-2.5.37-disable-tests.patch |
56 |
+) |
57 |
|
58 |
+src_prepare() { |
59 |
+ default |
60 |
sed -i -e "s/CCC/#CCC/" configure.ac || die |
61 |
|
62 |
eautoreconf |
63 |
|
64 |
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 |
65 |
index a877ca68486..7556e7995a1 100644 |
66 |
--- a/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch |
67 |
+++ b/app-accessibility/epos/files/epos-2.5.37-disable-tests.patch |
68 |
@@ -1,6 +1,5 @@ |
69 |
-diff -uNr epos-2.5.37.org/src/tests/Makefile.am epos-2.5.37/src/tests/Makefile.am |
70 |
---- epos-2.5.37.org/src/tests/Makefile.am 2012-04-14 00:38:56.000000000 -0400 |
71 |
-+++ epos-2.5.37/src/tests/Makefile.am 2012-04-14 00:39:10.000000000 -0400 |
72 |
+--- a/src/tests/Makefile.am |
73 |
++++ b/src/tests/Makefile.am |
74 |
@@ -1,11 +1,9 @@ |
75 |
## Process this file with automake run in the top directory to yield Makefile.in |
76 |
|
77 |
|
78 |
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch |
79 |
index 4a61b5ffd04..c8b1dee857a 100644 |
80 |
--- a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch |
81 |
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch |
82 |
@@ -1,5 +1,5 @@ |
83 |
---- epos-2.5.37.orig/src/nnet/neural.cc |
84 |
-+++ epos-2.5.37/src/nnet/neural.cc |
85 |
+--- a/src/nnet/neural.cc |
86 |
++++ b/src/nnet/neural.cc |
87 |
@@ -38,7 +38,7 @@ |
88 |
#include <string.h> |
89 |
#include <ctype.h> |
90 |
@@ -9,8 +9,8 @@ |
91 |
#include <time.h> |
92 |
|
93 |
/* |
94 |
---- epos-2.5.37.orig/arch/win/service/install.cpp |
95 |
-+++ epos-2.5.37/arch/win/service/install.cpp |
96 |
+--- a/arch/win/service/install.cpp |
97 |
++++ b/arch/win/service/install.cpp |
98 |
@@ -23,7 +23,7 @@ |
99 |
#include <winsvc.h> |
100 |
#include "service.h" |
101 |
|
102 |
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch |
103 |
index 70af1db9440..cbc056dded9 100644 |
104 |
--- a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch |
105 |
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch |
106 |
@@ -2,8 +2,8 @@ Fixing build with gcc 4.5 |
107 |
|
108 |
http://bugs.gentoo.org/show_bug.cgi?id=318585 |
109 |
|
110 |
---- src/nnet/neural_parse.yy |
111 |
-+++ src/nnet/neural_parse.yy |
112 |
+--- a/src/nnet/neural_parse.yy |
113 |
++++ b/src/nnet/neural_parse.yy |
114 |
@@ -255,7 +255,7 @@ |
115 |
|
116 |
int yyerror (char *s) |