gentoo resync : 03.11.2019

4 files changed, 32 insertions, 33 deletions

diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index 1d592faa704a..8fc94982adb6 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -1,9 +1,9 @@
 AUX streamdvd-0.4-gcc41.patch 463 BLAKE2B 253bdc64df9d3711a231c877b9b80ca6a922f01569c530f1e09ee20bc767da0d994089f7dd5256e1028563307dfae8462eec8bb24fe6e7d8b67e1bb322218129 SHA512 30a9bb075935f46d7d32293817937ea3c71145a30b7ce48d5a57ff105a27bd55ee19e7ee0ad4558fb571ae91c7bb24262d3b19cd87ff32211d2feea783f6e3db
-AUX streamdvd-0.4-gcc43.patch 1249 BLAKE2B a7d0575379b4de10fd85fdcb2ef2ef268295f70698c1c3a321a6cca7bf1d57cf2bdf7fe1fff0fd3aa6b20814301502d4da511452f6181650ca9087831acad8fb SHA512 02a6c89829b8d41c52305bfef56e43a56db33b2b7f6396f73a3f1f688207fa225f266dd0841c4e5748f44bed4bfa3595b298751f45db22ea92f3a1ac2817847c
+AUX streamdvd-0.4-gcc43.patch 1249 BLAKE2B 398e85a2ecc233e47e640d17c8bfba3ff0c49231ce44ecf569e01d6c1e61352e51b5f10ce493a428c17dd14f13549518d24264b7d55a18f15093c0382e83b6a1 SHA512 89acf39169294c090e69119f003aa0bbfe81695721b5db9101310be47b97d82b6eef311623552ecc3f23d40a609a44db0fc8de753b1a4ffd71cb4853c3e528cc
 AUX streamdvd-0.4-gcc44.patch 977 BLAKE2B 79db4d3a3526c5bb38106945635acded53e99a7e51b2fd34eaa3932f0172bf354cef0abd1d091cc99e40875b98498272442a7f7036bb8dca83144a66592c93e3 SHA512 1090361522dbbe58da3884a9bc7a44729a0f27e306a0c0ce5475c57ab0a8aa693b15caef33c28b1f7e8106db662e88616a05bd840999a54d0597cb230f4af95a
 AUX streamdvd-0.4-libdvdread.patch 1460 BLAKE2B 68577f49d3c837c9d2148838459e3e3bc2b78f195b7ea0db92be913e02d86b52b3cb78a35d50b37553b57ac10e0e4adfcd3f47ce8a6ffad0c3d521fd6437541c SHA512 79ed54fcb7b3b3ac4be7cc14978f126288a39428796a61954eb36fce89764561419ba32bd2a0de7819e9f3a72283fcf71691ac93922c2ab7df7a1e7658c4b0cf
 AUX streamdvd-0.4-makefile.patch 1378 BLAKE2B d8a244cb91f246eefa9da4f39a861f9f6bef84580a0b2faff3f01d0ad7c0c7ecc2f8a62711b4f5abca8c6e985a6d70934f49724bb052be8e284c506fe70d59c3 SHA512 5234433fd985ef561c43420a6f7a1ee30c4748ce5a4c04e3a6864e95f42fae1b97c8c0e1a6adb0c6c395500a7f007263621cab8779dc57535287a6ba81a32988
-AUX streamdvd-0.4.patch 787 BLAKE2B 61b1619e478e0200a0b4607a0375f37d60b6c111cbb355670e7edf2cdc93a21c84daf24e58fd00180ceb84e67470adc9d2a7d75e2a373684db80b8bdcaaa8897 SHA512 a70535c05292bba30f211a576f6e93a2408a5c2285ded0208da9757f9c4e88e605eb572e3cbe61f02752a198849ff805dd93dcd3457d78c0f9c9294a6de7bf53
+AUX streamdvd-0.4.patch 785 BLAKE2B 665bf98e78727abeba771b5dc84eaaccadc14fafe8978e21bde1480630d197a6dfa213e9f8d662d4813078d1ab66ffd4f33bc2513f99e6d93684cb3aa086eebb SHA512 81edce3f825c38a28aeafe25fcd1dad3b71413fdc22892fcbe5d0af32235b43f2256a6f38b3997dfea1306f492d2f4c96e0b85fe39802111502bea4af17013a7
 DIST streamdvd-0.4.tar.gz 152669 BLAKE2B 700ce4f03eabf3e3531bac4ab7b618c55a96e636c459368740597124353f9639cfd7c6b00a5a4eacfd438c3a6a7966c0c8dd42dedd3ab877ad96317a8658aa1e SHA512 81e8fdaf028799be7269c239ec5717bd5da58254b7eeef35ee5d436c4408fb02f9badbc5ff8a661903d10ec43bbaca68d8792f729293f6330c2a9e92ee0c48a5
-EBUILD streamdvd-0.4-r1.ebuild 1523 BLAKE2B 6526bbe063750dee1e4143a5149b216e7509b8a161306a9811f803d8496acf6ec15d79c94081bf594f6f55f3f5b1de14b3299f08963a4622be0c6c6e4536050b SHA512 e3a12065c88e5c532c84dafd7c22322cb127acf1dbad6765c8eb4b153f127037ddd96d6f4abfb6aef83906368973b0bfb6006a6b85880058a6996fc012069502
+EBUILD streamdvd-0.4-r2.ebuild 1509 BLAKE2B a0c78477a3e6013ef698da81af49a3deeb7a72d1da7e866743065cb674e9550dbb01cc17867cbc076e0ee46ec11e3304dc8df740fe74bbe8ecf813804a72ece8 SHA512 1fb72131f1cc5b1ef74f56b648135179fdf06656c421c5964c75f1e80777a8102ba05d6e4337c4fc78d9012229daba8001ea9c283246d22d17f9edde25316e1f
 MISC metadata.xml 559 BLAKE2B d5dd932f55599c1f38b5c68472a7e635852dd846d3c4cb85bf99f783c861be56cf5f846da27fb81460e68b97666b2bcd229655e987380a84c74c352f20668516 SHA512 17ff5079ade1e6a7c74298fe8e6f5737cb3fd0822f3318b198c32af761043c218739bb90865c616229ffba5698711a970d48f83df02716e7f82ab819c3c8fa98
diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch
index 89e33f58db4b..5c52498af5c9 100644
--- a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch
+++ b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch
@@ -1,6 +1,6 @@
-diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp
---- mplex.old/inputstrm.cpp	2004-03-08 23:10:53.000000000 +0100
-+++ mplex/inputstrm.cpp	2008-07-07 23:28:19.000000000 +0200
+diff -aur a/mplex/inputstrm.cpp b/mplex/inputstrm.cpp
+--- a/mplex/inputstrm.cpp	2004-03-08 23:10:53.000000000 +0100
++++ b/mplex/inputstrm.cpp	2008-07-07 23:28:19.000000000 +0200
 @@ -23,6 +23,7 @@
  
  #include "config.h"
@@ -9,9 +9,9 @@ diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp
  
  #include "mjpeg_types.h"
  #include "fastintfns.h"
-diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp
---- mplex.old/multiplexor.cpp	2004-03-08 23:10:53.000000000 +0100
-+++ mplex/multiplexor.cpp	2008-07-07 23:28:19.000000000 +0200
+diff -aur a/mplex/multiplexor.cpp b/mplex/multiplexor.cpp
+--- a/mplex/multiplexor.cpp	2004-03-08 23:10:53.000000000 +0100
++++ b/mplex/multiplexor.cpp	2008-07-07 23:28:19.000000000 +0200
 @@ -22,6 +22,7 @@
  #include "config.h"
  #include <math.h>
@@ -20,9 +20,9 @@ diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp
  
  #include "mjpeg_types.h"
  #include "mjpeg_logging.h"
-diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp
---- mplex.old/padstrm.cpp	2004-03-08 23:10:53.000000000 +0100
-+++ mplex/padstrm.cpp	2008-07-07 23:28:19.000000000 +0200
+diff -aur a/mplex/padstrm.cpp b/mplex/padstrm.cpp
+--- a/mplex/padstrm.cpp	2004-03-08 23:10:53.000000000 +0100
++++ b/mplex/padstrm.cpp	2008-07-07 23:28:19.000000000 +0200
 @@ -25,6 +25,7 @@
  #endif
  
@@ -31,9 +31,9 @@ diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp
  
  
  
-diff -aur mplex.old/zalphastrm_in.cpp mplex/zalphastrm_in.cpp
---- mplex.old/zalphastrm_in.cpp	2004-03-08 23:10:53.000000000 +0100
-+++ mplex/zalphastrm_in.cpp	2008-07-07 23:28:19.000000000 +0200
+diff -aur a/mplex/zalphastrm_in.cpp b/mplex/zalphastrm_in.cpp
+--- a/mplex/zalphastrm_in.cpp	2004-03-08 23:10:53.000000000 +0100
++++ b/mplex/zalphastrm_in.cpp	2008-07-07 23:28:19.000000000 +0200
 @@ -23,6 +23,7 @@
  #include "config.h"
  #include <math.h>
diff --git a/media-video/streamdvd/files/streamdvd-0.4.patch b/media-video/streamdvd/files/streamdvd-0.4.patch
index d078aa7059a3..693a4070f61f 100644
--- a/media-video/streamdvd/files/streamdvd-0.4.patch
+++ b/media-video/streamdvd/files/streamdvd-0.4.patch
@@ -1,5 +1,5 @@
---- Gui/StreamDVD/Gui.pm.orig	2004-03-08 23:10:53.000000000 +0100
-+++ Gui/StreamDVD/Gui.pm	2004-05-30 13:24:38.342490078 +0200
+--- a/Gui/StreamDVD/Gui.pm	2004-03-08 23:10:53.000000000 +0100
++++ b/Gui/StreamDVD/Gui.pm	2004-05-30 13:24:38.342490078 +0200
 @@ -18,7 +18,7 @@
  use Tk::BrowseEntry;
  use Tk::LabFrame;
@@ -9,8 +9,8 @@
  use StreamDVD::Defs;
  use StreamDVD::Calc;
  use strict;
---- Gui/StreamDVD/Config.pm.orig	2004-03-08 23:10:53.000000000 +0100
-+++ Gui/StreamDVD/Config.pm	2004-05-30 13:24:28.314195864 +0200
+--- a/Gui/StreamDVD/Config.pm	2004-03-08 23:10:53.000000000 +0100
++++ b/Gui/StreamDVD/Config.pm	2004-05-30 13:24:28.314195864 +0200
 @@ -284,7 +284,7 @@
     $self->{MOUNT}          = "/dvd";
     $self->{TEMPDIR}        = "/tmp";
diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
index 531705d009b6..9c889d779a06 100644
--- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -23,22 +23,22 @@ DEPEND="media-libs/libdvdread
 	>=media-video/dvdauthor-0.6.5
 	>=app-cdr/dvd+rw-tools-5.13.4.7.4 )"
 
-S=${WORKDIR}/StreamDVD-${PV}
+S="${WORKDIR}"/StreamDVD-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use X && epatch "${FILESDIR}"/${P}.patch
+src_prepare() {
+	use X && eapply "${FILESDIR}"/${P}.patch
 
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-libdvdread.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply "${FILESDIR}"/${P}-gcc41.patch
+	eapply "${FILESDIR}"/${P}-libdvdread.patch
+	eapply "${FILESDIR}"/${P}-gcc43.patch
+	eapply "${FILESDIR}"/${P}-gcc44.patch
+
+	eapply_user
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon || die  # compile also optional packages
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon  # compile also optional packages
 }
 
 src_install() {
@@ -48,8 +48,7 @@ src_install() {
 	newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd
 	newdoc contrib/lsdvd/README README.lsdvd
 	newdoc contrib/StreamAnalyze/README README.streamanalyze
-	if use X
-	then
+	if use X; then
 		eval `perl '-V:installvendorlib'`
 		insinto "$installvendorlib/StreamDVD"
 		doins Gui/StreamDVD/*.pm