Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/tse3/files/, media-libs/tse3/
Date: Tue, 29 May 2018 20:10:42
Message-Id: 1527624617.c9e005c859e69e83937ef9fc846828a87b0c79c1.bman@gentoo
1 commit: c9e005c859e69e83937ef9fc846828a87b0c79c1
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 15:56:10 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 20:10:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e005c8
7
8 media-libs/tse3: bump EAPI and drop eutils
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 media-libs/tse3/files/tse3-0.2.7-gcc4.patch | 4 ++--
13 .../tse3/files/tse3-0.2.7-size_t-64bit.patch | 8 +++----
14 media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch | 28 +++++++++++-----------
15 .../tse3/files/tse3-0.3.1-parallelmake.patch | 4 ++--
16 media-libs/tse3/tse3-0.3.1-r1.ebuild | 26 +++++++++++---------
17 5 files changed, 37 insertions(+), 33 deletions(-)
18
19 diff --git a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
20 index ed92ded207a..c009acfd156 100644
21 --- a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
22 +++ b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
23 @@ -1,5 +1,5 @@
24 ---- ./src/tse3/cmd/Phrase.h~ 2002-07-28 17:17:11.000000000 +0200
25 -+++ ./src/tse3/cmd/Phrase.h 2005-07-29 15:45:03.000000000 +0200
26 +--- a/src/tse3/cmd/Phrase.h 2002-07-28 17:17:11.000000000 +0200
27 ++++ b/src/tse3/cmd/Phrase.h 2005-07-29 15:45:03.000000000 +0200
28 @@ -19,6 +19,7 @@
29
30 #include "tse3/cmd/Command.h"
31
32 diff --git a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
33 index 29c54edc084..fbb4dd60622 100644
34 --- a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
35 +++ b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
36 @@ -1,5 +1,5 @@
37 ---- src/tse3/file/XML.h.orig 2002-07-28 18:17:11.000000000 +0300
38 -+++ src/tse3/file/XML.h 2004-04-25 14:51:56.000000000 +0300
39 +--- a/src/tse3/file/XML.h 2002-07-28 18:17:11.000000000 +0300
40 ++++ b/src/tse3/file/XML.h 2004-04-25 14:51:56.000000000 +0300
41 @@ -154,6 +154,7 @@
42 void element(const std::string &name, const char *value);
43 void element(const std::string &name, int value);
44 @@ -8,8 +8,8 @@
45 void element(const std::string &name, bool value);
46
47 void comment(const std::string &comment);
48 ---- src/tse3/file/XML.cpp.orig 2002-07-28 18:17:11.000000000 +0300
49 -+++ src/tse3/file/XML.cpp 2004-04-25 14:54:01.000000000 +0300
50 +--- a/src/tse3/file/XML.cpp 2002-07-28 18:17:11.000000000 +0300
51 ++++ b/src/tse3/file/XML.cpp 2004-04-25 14:54:01.000000000 +0300
52 @@ -116,6 +116,12 @@
53 out << "<" << name << " value=\"" << value << "\"/>\n";
54 }
55
56 diff --git a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
57 index 4581da9d0bf..ba5f27421ea 100644
58 --- a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
59 +++ b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
60 @@ -1,5 +1,5 @@
61 ---- src/tse3/Serializable.h.orig 2008-06-08 12:17:05.000000000 +0200
62 -+++ src/tse3/Serializable.h 2008-06-08 12:17:27.000000000 +0200
63 +--- a/src/tse3/Serializable.h 2008-06-08 12:17:05.000000000 +0200
64 ++++ b/src/tse3/Serializable.h 2008-06-08 12:17:27.000000000 +0200
65 @@ -20,6 +20,7 @@
66 #include <iosfwd>
67 #include <iomanip>
68 @@ -9,8 +9,8 @@
69 namespace TSE3
70 {
71
72 ---- src/tse3/TSE2MDL.h.orig 2008-06-08 12:17:41.000000000 +0200
73 -+++ src/tse3/TSE2MDL.h 2008-06-08 12:18:02.000000000 +0200
74 +--- a/src/tse3/TSE2MDL.h 2008-06-08 12:17:41.000000000 +0200
75 ++++ b/src/tse3/TSE2MDL.h 2008-06-08 12:18:02.000000000 +0200
76 @@ -22,6 +22,7 @@
77 #include <string>
78 #include <iostream>
79 @@ -20,8 +20,8 @@
80 namespace TSE3
81 {
82
83 ---- src/tse3/MidiFile.h.orig 2008-06-08 12:18:26.000000000 +0200
84 -+++ src/tse3/MidiFile.h 2008-06-08 12:18:42.000000000 +0200
85 +--- a/src/tse3/MidiFile.h 2008-06-08 12:18:26.000000000 +0200
86 ++++ b/src/tse3/MidiFile.h 2008-06-08 12:18:42.000000000 +0200
87 @@ -25,6 +25,7 @@
88 #include <string>
89 #include <iosfwd>
90 @@ -30,8 +30,8 @@
91
92 namespace TSE3
93 {
94 ---- src/examples/recording/recording.cpp.orig 2008-06-08 12:18:56.000000000 +0200
95 -+++ src/examples/recording/recording.cpp 2008-06-08 12:19:18.000000000 +0200
96 +--- a/src/examples/recording/recording.cpp 2008-06-08 12:18:56.000000000 +0200
97 ++++ b/src/examples/recording/recording.cpp 2008-06-08 12:19:18.000000000 +0200
98 @@ -26,6 +26,7 @@
99 *
100 **************************************************************/
101 @@ -41,8 +41,8 @@
102
103 // Used in step 1
104
105 ---- src/tse3play/tse3play.h.orig 2008-06-08 12:19:34.000000000 +0200
106 -+++ src/tse3play/tse3play.h 2008-06-08 12:19:53.000000000 +0200
107 +--- a/src/tse3play/tse3play.h 2008-06-08 12:19:34.000000000 +0200
108 ++++ b/src/tse3play/tse3play.h 2008-06-08 12:19:53.000000000 +0200
109 @@ -19,6 +19,7 @@
110
111 #include <string>
112 @@ -51,8 +51,8 @@
113
114 #include "tse3/Transport.h"
115
116 ---- src/tse3/plt/Alsa-0.9.cpp.orig 2008-06-08 12:39:53.000000000 +0200
117 -+++ src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:40:25.000000000 +0200
118 +--- a/src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:39:53.000000000 +0200
119 ++++ b/src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:40:25.000000000 +0200
120 @@ -25,12 +25,11 @@
121 #define HAVE_SYS_ASOUNDLIB_H
122 #endif
123 @@ -68,8 +68,8 @@
124 #include <sys/asoundlib.h>
125 #endif
126
127 ---- src/tse3/plt/OSS.h.orig 2008-06-08 12:45:46.000000000 +0200
128 -+++ src/tse3/plt/OSS.h 2008-06-08 12:46:06.000000000 +0200
129 +--- a/src/tse3/plt/OSS.h 2008-06-08 12:45:46.000000000 +0200
130 ++++ b/src/tse3/plt/OSS.h 2008-06-08 12:46:06.000000000 +0200
131 @@ -21,6 +21,7 @@
132
133 #include <string>
134
135 diff --git a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
136 index b4fc927a718..9a6abea1016 100644
137 --- a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
138 +++ b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
139 @@ -1,5 +1,5 @@
140 ---- src/tse3/Makefile.am.old 2007-02-06 23:57:38.000000000 +0100
141 -+++ src/tse3/Makefile.am 2007-02-07 00:08:01.000000000 +0100
142 +--- a/src/tse3/Makefile.am 2007-02-06 23:57:38.000000000 +0100
143 ++++ b/src/tse3/Makefile.am 2007-02-07 00:08:01.000000000 +0100
144 @@ -53,7 +53,7 @@
145
146 noinst_PROGRAMS = test
147
148 diff --git a/media-libs/tse3/tse3-0.3.1-r1.ebuild b/media-libs/tse3/tse3-0.3.1-r1.ebuild
149 index 08519f982de..77d2703ea5a 100644
150 --- a/media-libs/tse3/tse3-0.3.1-r1.ebuild
151 +++ b/media-libs/tse3/tse3-0.3.1-r1.ebuild
152 @@ -1,8 +1,8 @@
153 -# Copyright 1999-2009 Gentoo Foundation
154 +# Copyright 1999-2018 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156
157 -EAPI=2
158 -inherit autotools eutils flag-o-matic
159 +EAPI=6
160 +inherit autotools flag-o-matic
161
162 DESCRIPTION="TSE3 Sequencer library"
163 HOMEPAGE="http://TSE3.sourceforge.net"
164 @@ -17,17 +17,21 @@ IUSE="alsa oss"
165 RDEPEND="alsa? ( media-libs/alsa-lib )"
166 DEPEND="${RDEPEND}"
167
168 +PATCHES=(
169 + "${FILESDIR}/${PN}-0.2.7-size_t-64bit.patch"
170 + "${FILESDIR}/${PN}-0.2.7-gcc4.patch"
171 + "${FILESDIR}/${P}-parallelmake.patch"
172 + "${FILESDIR}/${P}+gcc-4.3.patch"
173 +)
174 +
175 src_prepare() {
176 + default
177 + mv configure.in configure.ac || die "Moving configure.in -> .ac failed"
178 if use oss; then
179 cp "${WORKDIR}"/awe_voice.h src/
180 append-flags -DHAVE_AWE_VOICE_H
181 fi
182
183 - epatch "${FILESDIR}"/${PN}-0.2.7-size_t-64bit.patch \
184 - "${FILESDIR}"/${PN}-0.2.7-gcc4.patch \
185 - "${FILESDIR}"/${P}-parallelmake.patch \
186 - "${FILESDIR}"/${P}+gcc-4.3.patch
187 -
188 eautoreconf
189 }
190
191 @@ -44,7 +48,7 @@ src_configure() {
192 }
193
194 src_install() {
195 - emake DESTDIR="${D}" install || die "emake install failed"
196 - dodoc AUTHORS NEWS README THANKS TODO doc/History
197 - dohtml doc/*.{html,gif,png}
198 + HTML_DOCS=( doc/*.{html,gif,png} )
199 + default
200 + dodoc doc/History
201 }
Report Message
Find on MARC Find on Google Groups