[gentoo-commits] repo/gentoo:master commit in: media-video/lxdvdrip/, media-video/lxdvdrip/files/

["Jakov Smolić" <jsmolic@gentoo.org>]

commit:     c0cd44d8b8b65fa02faf42b5965500fdf39ba231
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 21:19:27 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 21:31:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0cd44d8

media-video/lxdvdrip: Port to EAPI 8

Closes: https://bugs.gentoo.org/819435
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../lxdvdrip/files/lxdvdrip-1.77-makefile.patch    |  4 +--
 .../files/lxdvdrip-1.77-vamps-makefile.patch       |  4 +--
 ...xdvdrip-1.77.ebuild => lxdvdrip-1.77-r1.ebuild} | 32 +++++++++++-----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
index 35df8fb65400..5d2684c07c88 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-03-17 15:40:30.886570544 -0600
-+++ Makefile	2014-03-17 15:41:22.729159468 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -3,31 +3,15 @@
  HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
  HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'

diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
index 7c32d44ef371..d497773aae1b 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -1,5 +1,5 @@
---- vamps/Makefile.orig	2014-03-17 15:44:50.086513525 -0600
-+++ vamps/Makefile	2014-03-17 15:44:56.443321441 -0600
+--- a/vamps/Makefile
++++ b/vamps/Makefile
 @@ -21,7 +21,7 @@
  CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
  	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT

diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
similarity index 72%
rename from media-video/lxdvdrip/lxdvdrip-1.77.ebuild
rename to media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
index f925ac98c665..367fd0494709 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
-SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
 HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/libdvdread"
 RDEPEND="${DEPEND}
 	>=media-video/dvdauthor-0.6.9
 	media-video/streamdvd
-	media-video/mpgtx"
+	media-video/mpgtx
+"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-vamps-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-vamps-makefile.patch
+)
 
 src_compile() {
-	CC="$(tc-getCC)" emake
-	cd "${S}/vamps"
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake
+	emake -C vamps
 }
 
 src_install() {
@@ -45,6 +45,6 @@ src_install() {
 	insinto /etc
 	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
 
-	cd "${S}/vamps"
+	cd vamps || die
 	emake PREFIX="${D}/usr" install
 }