commit: c9e005c859e69e83937ef9fc846828a87b0c79c1
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 15:56:10 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 20:10:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e005c8
media-libs/tse3: bump EAPI and drop eutils
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-libs/tse3/files/tse3-0.2.7-gcc4.patch | 4 ++--
.../tse3/files/tse3-0.2.7-size_t-64bit.patch | 8 +++----
media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch | 28 +++++++++++-----------
.../tse3/files/tse3-0.3.1-parallelmake.patch | 4 ++--
media-libs/tse3/tse3-0.3.1-r1.ebuild | 26 +++++++++++---------
5 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
index ed92ded207a..c009acfd156 100644
--- a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
+++ b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
@@ -1,5 +1,5 @@
---- ./src/tse3/cmd/Phrase.h~ 2002-07-28 17:17:11.000000000 +0200
-+++ ./src/tse3/cmd/Phrase.h 2005-07-29 15:45:03.000000000 +0200
+--- a/src/tse3/cmd/Phrase.h 2002-07-28 17:17:11.000000000 +0200
++++ b/src/tse3/cmd/Phrase.h 2005-07-29 15:45:03.000000000 +0200
@@ -19,6 +19,7 @@
#include "tse3/cmd/Command.h"
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
index 29c54edc084..fbb4dd60622 100644
--- 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
@@ -1,5 +1,5 @@
---- src/tse3/file/XML.h.orig 2002-07-28 18:17:11.000000000 +0300
-+++ src/tse3/file/XML.h 2004-04-25 14:51:56.000000000 +0300
+--- a/src/tse3/file/XML.h 2002-07-28 18:17:11.000000000 +0300
++++ b/src/tse3/file/XML.h 2004-04-25 14:51:56.000000000 +0300
@@ -154,6 +154,7 @@
void element(const std::string &name, const char
*value);
void element(const std::string &name, int
value);
@@ -8,8 +8,8 @@
void element(const std::string &name, bool
value);
void comment(const std::string &comment);
---- src/tse3/file/XML.cpp.orig 2002-07-28 18:17:11.000000000 +0300
-+++ src/tse3/file/XML.cpp 2004-04-25 14:54:01.000000000 +0300
+--- a/src/tse3/file/XML.cpp 2002-07-28 18:17:11.000000000 +0300
++++ b/src/tse3/file/XML.cpp 2004-04-25 14:54:01.000000000 +0300
@@ -116,6 +116,12 @@
out << "<" << name << " value=\"" << value << "\"/>\n";
}
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
index 4581da9d0bf..ba5f27421ea 100644
--- 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
@@ -1,5 +1,5 @@
---- src/tse3/Serializable.h.orig 2008-06-08 12:17:05.000000000 +0200
-+++ src/tse3/Serializable.h 2008-06-08 12:17:27.000000000 +0200
+--- a/src/tse3/Serializable.h 2008-06-08 12:17:05.000000000 +0200
++++ b/src/tse3/Serializable.h 2008-06-08 12:17:27.000000000 +0200
@@ -20,6 +20,7 @@
#include <iosfwd>
#include <iomanip>
@@ -9,8 +9,8 @@
namespace TSE3
{
---- src/tse3/TSE2MDL.h.orig 2008-06-08 12:17:41.000000000 +0200
-+++ src/tse3/TSE2MDL.h 2008-06-08 12:18:02.000000000 +0200
+--- a/src/tse3/TSE2MDL.h 2008-06-08 12:17:41.000000000 +0200
++++ b/src/tse3/TSE2MDL.h 2008-06-08 12:18:02.000000000 +0200
@@ -22,6 +22,7 @@
#include <string>
#include <iostream>
@@ -20,8 +20,8 @@
namespace TSE3
{
---- src/tse3/MidiFile.h.orig 2008-06-08 12:18:26.000000000 +0200
-+++ src/tse3/MidiFile.h 2008-06-08 12:18:42.000000000 +0200
+--- a/src/tse3/MidiFile.h 2008-06-08 12:18:26.000000000 +0200
++++ b/src/tse3/MidiFile.h 2008-06-08 12:18:42.000000000 +0200
@@ -25,6 +25,7 @@
#include <string>
#include <iosfwd>
@@ -30,8 +30,8 @@
namespace TSE3
{
---- src/examples/recording/recording.cpp.orig 2008-06-08 12:18:56.000000000
+0200
-+++ src/examples/recording/recording.cpp 2008-06-08 12:19:18.000000000
+0200
+--- a/src/examples/recording/recording.cpp 2008-06-08 12:18:56.000000000
+0200
++++ b/src/examples/recording/recording.cpp 2008-06-08 12:19:18.000000000
+0200
@@ -26,6 +26,7 @@
*
**************************************************************/
@@ -41,8 +41,8 @@
// Used in step 1
---- src/tse3play/tse3play.h.orig 2008-06-08 12:19:34.000000000 +0200
-+++ src/tse3play/tse3play.h 2008-06-08 12:19:53.000000000 +0200
+--- a/src/tse3play/tse3play.h 2008-06-08 12:19:34.000000000 +0200
++++ b/src/tse3play/tse3play.h 2008-06-08 12:19:53.000000000 +0200
@@ -19,6 +19,7 @@
#include <string>
@@ -51,8 +51,8 @@
#include "tse3/Transport.h"
---- src/tse3/plt/Alsa-0.9.cpp.orig 2008-06-08 12:39:53.000000000 +0200
-+++ src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:40:25.000000000 +0200
+--- a/src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:39:53.000000000 +0200
++++ b/src/tse3/plt/Alsa-0.9.cpp 2008-06-08 12:40:25.000000000 +0200
@@ -25,12 +25,11 @@
#define HAVE_SYS_ASOUNDLIB_H
#endif
@@ -68,8 +68,8 @@
#include <sys/asoundlib.h>
#endif
---- src/tse3/plt/OSS.h.orig 2008-06-08 12:45:46.000000000 +0200
-+++ src/tse3/plt/OSS.h 2008-06-08 12:46:06.000000000 +0200
+--- a/src/tse3/plt/OSS.h 2008-06-08 12:45:46.000000000 +0200
++++ b/src/tse3/plt/OSS.h 2008-06-08 12:46:06.000000000 +0200
@@ -21,6 +21,7 @@
#include <string>
diff --git a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
index b4fc927a718..9a6abea1016 100644
--- a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
+++ b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
@@ -1,5 +1,5 @@
---- src/tse3/Makefile.am.old 2007-02-06 23:57:38.000000000 +0100
-+++ src/tse3/Makefile.am 2007-02-07 00:08:01.000000000 +0100
+--- a/src/tse3/Makefile.am 2007-02-06 23:57:38.000000000 +0100
++++ b/src/tse3/Makefile.am 2007-02-07 00:08:01.000000000 +0100
@@ -53,7 +53,7 @@
noinst_PROGRAMS = test
diff --git a/media-libs/tse3/tse3-0.3.1-r1.ebuild
b/media-libs/tse3/tse3-0.3.1-r1.ebuild
index 08519f982de..77d2703ea5a 100644
--- a/media-libs/tse3/tse3-0.3.1-r1.ebuild
+++ b/media-libs/tse3/tse3-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=2
-inherit autotools eutils flag-o-matic
+EAPI=6
+inherit autotools flag-o-matic
DESCRIPTION="TSE3 Sequencer library"
HOMEPAGE="http://TSE3.sourceforge.net";
@@ -17,17 +17,21 @@ IUSE="alsa oss"
RDEPEND="alsa? ( media-libs/alsa-lib )"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.2.7-size_t-64bit.patch"
+ "${FILESDIR}/${PN}-0.2.7-gcc4.patch"
+ "${FILESDIR}/${P}-parallelmake.patch"
+ "${FILESDIR}/${P}+gcc-4.3.patch"
+)
+
src_prepare() {
+ default
+ mv configure.in configure.ac || die "Moving configure.in -> .ac failed"
if use oss; then
cp "${WORKDIR}"/awe_voice.h src/
append-flags -DHAVE_AWE_VOICE_H
fi
- epatch "${FILESDIR}"/${PN}-0.2.7-size_t-64bit.patch \
- "${FILESDIR}"/${PN}-0.2.7-gcc4.patch \
- "${FILESDIR}"/${P}-parallelmake.patch \
- "${FILESDIR}"/${P}+gcc-4.3.patch
-
eautoreconf
}
@@ -44,7 +48,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS NEWS README THANKS TODO doc/History
- dohtml doc/*.{html,gif,png}
+ HTML_DOCS=( doc/*.{html,gif,png} )
+ default
+ dodoc doc/History
}
