commit: a798af66cf18f6f929ddaa3944d38dc0440bb62a Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Oct 27 13:10:15 2019 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Oct 27 13:12:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a798af66
media-video/streamdvd: EAPI 7 Bug: https://bugs.gentoo.org/697264 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-2.3.78, Repoman-2.3.16 .../streamdvd/files/streamdvd-0.4-gcc43.patch | 24 +++++++++---------- media-video/streamdvd/files/streamdvd-0.4.patch | 8 +++---- ...amdvd-0.4-r1.ebuild => streamdvd-0.4-r2.ebuild} | 27 +++++++++++----------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch index 89e33f58db4..5c52498af5c 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 d078aa7059a..693a4070f61 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 similarity index 71% rename from media-video/streamdvd/streamdvd-0.4-r1.ebuild rename to media-video/streamdvd/streamdvd-0.4-r2.ebuild index 531705d009b..9c889d779a0 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
