media-libs/tse3: bump EAPI and drop eutils
authorAaron Bauman <bman@gentoo.org>
Tue, 29 May 2018 15:56:10 +0000 (11:56 -0400)
committerAaron Bauman <bman@gentoo.org>
Tue, 29 May 2018 20:10:17 +0000 (16:10 -0400)
Package-Manager: Portage-2.3.40, Repoman-2.3.9

media-libs/tse3/files/tse3-0.2.7-gcc4.patch
media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
media-libs/tse3/tse3-0.3.1-r1.ebuild

index ed92ded207ab30ca9231f8224bbe68158e60e0c8..c009acfd156c489b0e401837eea5943728aa4aea 100644 (file)
@@ -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"
index 29c54edc084ff5fe8c07fedbd7319cbfb9bdff80..fbb4dd60622f2055947a4006a0f90e592cc5d0cc 100644 (file)
@@ -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";
  }
index 4581da9d0bf76af1e5076d911fb9fc78cb142adb..ba5f27421ea6ecbbe09fbfbd3d2b721c63c7879b 100644 (file)
@@ -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>
index b4fc927a7183d6e4f2820e427bcf1722b09e9093..9a6abea1016ef51a2b8620f6f1d95bbdc9f95078 100644 (file)
@@ -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
index 08519f982de11d7da26ed89ac4421a2516066c33..77d2703ea5a18fe1e74c948ec0307d8b32b28d5c 100644 (file)
@@ -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
 }