1 |
commit: 4ca5affe87d9c4fca33efefc00f14bedfe3e29b1 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Thu Mar 22 13:14:10 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 26 20:19:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca5affe |
7 |
|
8 |
app-accessibility/flite: 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/7588 |
14 |
|
15 |
.../flite/files/flite-1.4-audio-interface.patch | 4 ++-- |
16 |
.../flite/files/flite-1.4-ldflags.patch | 9 ++++----- |
17 |
app-accessibility/flite/flite-1.4-r4.ebuild | 23 +++++++++++++--------- |
18 |
3 files changed, 20 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch b/app-accessibility/flite/files/flite-1.4-audio-interface.patch |
21 |
index bc8d25b89bc..d50428edd5a 100644 |
22 |
--- a/app-accessibility/flite/files/flite-1.4-audio-interface.patch |
23 |
+++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- configure.in 2009-08-15 06:46:38.000000000 +1000 |
26 |
-+++ configure.in 2011-08-30 00:53:26.000000000 +1000 |
27 |
+--- a/configure.in |
28 |
++++ b/configure.in |
29 |
@@ -304,7 +304,6 @@ |
30 |
[ --with-audio with specific audio support (none linux freebsd etc) ], |
31 |
AUDIODRIVER=$with_audio ) |
32 |
|
33 |
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch |
34 |
index f9295fb853b..fd8f49059e7 100644 |
35 |
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch |
36 |
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch |
37 |
@@ -1,6 +1,5 @@ |
38 |
-diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules |
39 |
---- flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.000000000 +0000 |
40 |
-+++ flite-1.4-release.new/config/common_make_rules 2011-03-26 20:22:59.000000000 +0000 |
41 |
+--- a/config/common_make_rules |
42 |
++++ b/config/common_make_rules |
43 |
@@ -68,7 +68,7 @@ |
44 |
|
45 |
FLITELIBS = $(BUILDDIR)/lib/libflite.a |
46 |
@@ -19,8 +18,8 @@ diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/conf |
47 |
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) |
48 |
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) |
49 |
@ rm -rf shared_os |
50 |
---- flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.000000000 +0100 |
51 |
-+++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220 +0000 |
52 |
+--- a/tools/Makefile |
53 |
++++ b/tools/Makefile |
54 |
@@ -62,9 +62,9 @@ |
55 |
LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort |
56 |
|
57 |
|
58 |
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild |
59 |
index 536b8f83eea..54ce1000b6a 100644 |
60 |
--- a/app-accessibility/flite/flite-1.4-r4.ebuild |
61 |
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild |
62 |
@@ -1,8 +1,8 @@ |
63 |
-# Copyright 1999-2017 Gentoo Foundation |
64 |
+# Copyright 1999-2018 Gentoo Foundation |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
|
67 |
-EAPI=5 |
68 |
-inherit autotools eutils multilib-minimal |
69 |
+EAPI=6 |
70 |
+inherit autotools multilib-minimal |
71 |
|
72 |
DESCRIPTION="Flite text to speech engine" |
73 |
HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" |
74 |
@@ -18,6 +18,14 @@ RDEPEND="${DEPEND}" |
75 |
|
76 |
S=${WORKDIR}/${P}-release |
77 |
|
78 |
+PATCHES=( |
79 |
+ "${FILESDIR}"/${PN}-1.4-tempfile.patch |
80 |
+ "${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch |
81 |
+ "${FILESDIR}"/${PN}-1.4-respect-destdir.patch |
82 |
+ "${FILESDIR}"/${PN}-1.4-ldflags.patch |
83 |
+ "${FILESDIR}"/${PN}-1.4-audio-interface.patch |
84 |
+) |
85 |
+ |
86 |
get_audio() { |
87 |
if use alsa; then |
88 |
echo alsa |
89 |
@@ -29,11 +37,8 @@ get_audio() { |
90 |
} |
91 |
|
92 |
src_prepare() { |
93 |
- epatch "${FILESDIR}"/${P}-tempfile.patch |
94 |
- epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch |
95 |
- epatch "${FILESDIR}"/${P}-respect-destdir.patch |
96 |
- epatch "${FILESDIR}"/${P}-ldflags.patch |
97 |
- epatch "${FILESDIR}"/${P}-audio-interface.patch |
98 |
+ default |
99 |
+ |
100 |
sed -i main/Makefile \ |
101 |
-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ |
102 |
|| die |
103 |
@@ -61,7 +66,7 @@ multilib_src_install_all() { |
104 |
dodoc ACKNOWLEDGEMENTS README |
105 |
|
106 |
if ! use static-libs; then |
107 |
- rm -rf "${D}"/usr/lib*/*.a |
108 |
+ find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die |
109 |
fi |
110 |
} |