gentoo resync : 02.06.2018

6 files changed, 44 insertions, 40 deletions

diff --git a/media-libs/tse3/Manifest b/media-libs/tse3/Manifest
index 481326bf0e63..f7fbea4000a5 100644
--- a/media-libs/tse3/Manifest
+++ b/media-libs/tse3/Manifest
@@ -1,8 +1,8 @@
-AUX tse3-0.2.7-gcc4.patch 290 BLAKE2B 432dad256846003e1e953a941c4c0b8b94e572b3fb234447f95e5b2bc52bfe6ff17d1008fac91c287f64e58a13ef97c9770c12a32543d0874aec7d28addbc8da SHA512 07421f043f979b02aa17caa03752bfef7dff8a4e0a04135ff947c36c75ea1c7b019cef0e74e4a03e61bbc5941e5ca82c2c7b3120f4c053774de11635c57611c8
-AUX tse3-0.2.7-size_t-64bit.patch 1089 BLAKE2B 547adf8cdc3a28bbc7f7d3b6cf0ad6fe5b936b7483be5d9011324a21cc53e72f9bfb8bde62fbef252e7f63450faaf92270d0960d9207c9a726017e1c59be893c SHA512 cffae23b4611791698b349debc9bbb7caf5650502d0ce8aee6186f7a671d7c1a7cde29a340b5b220f4df58166800cff823065d76ac8491b5819e0598e1f4b580
-AUX tse3-0.3.1+gcc-4.3.patch 1974 BLAKE2B 33a772dd38603d99e500121bbd4895ae80990084a2da3833938573758e8b24b9be218835ad156d956647eb51ab4d86975e819fec6b180ec1faf1c7a6aa03e0ad SHA512 e88dd2be90bb01bb6d6f684d9822374f9e149481200bc0ae0ae5098b36ccc64a387f234c8e5a7e8c30fb988f157a8ba8f5aa732639e60f76d3e1ba6624d688d2
-AUX tse3-0.3.1-parallelmake.patch 305 BLAKE2B 427fc002f27377905ea0333a7ae046f5aecee50eb7632c6453025d3ec6aefc6bdf104edad4fc85210e3f603737e1b2e3661627d10fc7e53b1de78206c7eb06a7 SHA512 c8b8e30122b8c52421c154e686445f79c018281582511d9f273a41b4a83602470fdae38e097dca5b912837f95d0758b61e661cbb5f6c13dc5bbb2310bb6899f3
+AUX tse3-0.2.7-gcc4.patch 217 BLAKE2B 1560902b7719f15dbefba11b5575ce0f138eba63bd95da00c8c00454f83b58b1bc3d5b2b8c4be9c6f6659817e29ede4ea65d4035e6b8c7987aa6ef0319f76509 SHA512 59e0610cf7e34872b8898b48da79decb43dfb1af26bd761791332b9bd12f981567ef20e234e20274e3492a7f736e4ab1eb4ed53a18dda07a08b78a91fad63bd0
+AUX tse3-0.2.7-size_t-64bit.patch 943 BLAKE2B 571b7663a606fe3488ae0c532fc81239d47717c0a61287dc240b10ae081eee8aa445fc64576fc10011bb93c601c0acd9f1967e26154bb10c4b9ff37d78f9dcd0 SHA512 96a14a52b3c6477555a4b6b82006c1758ab7560f7924df608b990a21481651cce28e435eb8cbafd06cc47afe1e3abea993d30de848e1561c034ea78caac1635a
+AUX tse3-0.3.1+gcc-4.3.patch 1463 BLAKE2B d5a688ef93c77481eb26d7e6ceff25242e7582db223ea5f9341824266ddd7491fb69513e2a4ade3f7bf249d608602045d0fae67325e7d5b4fd2a0df2da43ee9e SHA512 298c08104b1fa37d51031163cf84817fe0509f4b551aa38966625ff922d3164ff4fd5cbeec88214df2e26e4ad25a03f67f5c58590136f06ebd741ba59fa825b4
+AUX tse3-0.3.1-parallelmake.patch 233 BLAKE2B 69bcccd58954beeaa844b76fc4d733377520db3eb04ab76a1891c522f87a18c687c50864e5a2573789dd17dee4d64d06966d713b9281707901223d3ca0af3a5e SHA512 d5d6a9750bab5146e4f3daae271284def29bc7456905beddac0278f7a65ac705e07a4c4fe43d9a57914ec5af5134feee9b7833a72c7739856eff3a7c76645cd0
 DIST tse3-0.3.1-awe_voice.h.tbz2 5681 BLAKE2B c5bb8a3fa158adb85ebd242a3d61e41555c0f93af2f138eada59af4e3aa39a01388d26ee8e509393706260c0634bf743b28486e46528d073cfccd46edcd00413 SHA512 3b935891ed21936518ca0351fa2fc4affc2e4ba680ab7fab00073e9fa5f13f98c7af73d9a2383c7c3f1df3c323311b7ec6c0a64f2543cbbad35d9ff9db843ec3
 DIST tse3-0.3.1.tar.gz 755666 BLAKE2B 8c2f3ac18f4fabc62af63d1b037638e077fc0ee622f727fc30672cba31e2b3978a50999940c096a6f53ae24570341096eacbf8f59a0227177fdf887249f4ff3d SHA512 cff94f274f90e61257eeda532f56b77ef0d2d03371876c2e6fb739ac32dcf107254702464c9c62a672e7c3e31bd063dc84a311daa0218df710bada8399d49860
-EBUILD tse3-0.3.1-r1.ebuild 1104 BLAKE2B e5eb3783c0879092905b35fbdaa85443bb53b3cf26535dbc47c9ba75d449488d77bc7e1f5f8210b02aaf317ed8e9f0cb2f9fdf669e55c0506ac66ca8364bdc6c SHA512 6b34f816e3b87379c8816c7c7007b30fe1332ae3401b7d361b7a66fcf65dc507764b85de6ee331e0c061b3aa8aab2d8ebe64feae8fbc32b1f5f8c7e2b91a1a14
+EBUILD tse3-0.3.1-r1.ebuild 1123 BLAKE2B 42883031b5a1bfcddaaa44bcdd48b836abde3968e3d7d9d7ad81caddd9394a7d97f666bd5bdd426fb69ce10e1e9bcf226d326433f265583d8e63eff457b14051 SHA512 3bb2244db65008534ca69087dc30af34a658803da245e3379d9144649e82a17b1eff944af7aad73dfa265e5acf1a510b1ebd290215bbe04c49f57f0a6e197c11
 MISC metadata.xml 327 BLAKE2B a5bdf33e3a72f1e66a8619edb0c29d58b27b8266d4101d0c9f0151df0039d68e584d509fa35003b5804971f3c717b571fb9707313a7ef63106790fe7f0b84f8b SHA512 b46483abcf9d26839bbc36b40b20971a9a397ae2b45c32a5a406e91c7bd95eec3ad324d7163c3e37e96e1a3d5ba837720bfd5276a310333ac5f2e5557def12b0
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 ed92ded207ab..b58e538b8fed 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
++++ b/src/tse3/cmd/Phrase.h
 @@ -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 29c54edc084f..fe628c306670 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
++++ b/src/tse3/file/XML.h
 @@ -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
++++ b/src/tse3/file/XML.cpp
 @@ -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 4581da9d0bf7..0ff1ebb6ea1d 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
++++ b/src/tse3/Serializable.h
 @@ -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
++++ b/src/tse3/TSE2MDL.h
 @@ -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
++++ b/src/tse3/MidiFile.h
 @@ -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
++++ b/src/examples/recording/recording.cpp
 @@ -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
++++ b/src/tse3play/tse3play.h
 @@ -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
++++ b/src/tse3/plt/Alsa-0.9.cpp
 @@ -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
++++ b/src/tse3/plt/OSS.h
 @@ -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 b4fc927a7183..7a0d0918b142 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
++++ b/src/tse3/Makefile.am
 @@ -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 08519f982de1..9c10927b83eb 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
+		cp "${WORKDIR}"/awe_voice.h src/ || die "copy failed"
+		append-cppflags -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
 }