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

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

[Michał Górny]

commit:     25a72f598ee6e2dc6e2a8f3815d1b797bf3b64ff
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 08:41:30 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 08:53:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a72f59

media-video/vdrsync: Bump to EAPI 7

Closes: https://bugs.gentoo.org/697262
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/vdrsync-0.1.3_pre050322-path.diff        |  4 +--
 .../vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild      | 37 ++++++++--------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
index 768665be62a..3babee396df 100644
--- a/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
+++ b/media-video/vdrsync/files/vdrsync-0.1.3_pre050322-path.diff
@@ -2,8 +2,8 @@ fix not founded path to some progs
 
 Joerg Bornkessel <hd_brummy@gentoo.org> ( 29 May 2005 )
 
---- vdrsync.pl.orig	2006-05-29 19:10:25.146198500 +0200
-+++ vdrsync.pl	2006-05-29 19:09:06.937310750 +0200
+--- a/vdrsync.pl	2006-05-29 19:10:25.146198500 +0200
++++ b/vdrsync.pl	2006-05-29 19:09:06.937310750 +0200
 @@ -37,19 +37,19 @@
  # Hash that lists potential helper Programs
  #########################################################################

diff --git a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
index fb37db3df2e..c6248cefd7b 100644
--- a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
+++ b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r1.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 MY_P="${PN}-${PV#*_pre}"
 
-S=${WORKDIR}/vdrsync-${MY_SNAPSHOT}
-
 DESCRIPTION="converting vdr-recordings to mpeg2, dvd or other similar formats"
 HOMEPAGE="http://vdrsync.vdr-portal.de/"
 SRC_URI="http://vdrsync.vdr-portal.de/releases/${MY_P}.tgz"
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,30 +17,22 @@ IUSE="dvdr"
 
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.8.0
-		media-fonts/corefonts
-		dvdr? (
-			>=media-libs/gd-2.0.15
-			>=dev-perl/GD-2.0.7
-			>=dev-perl/GDTextUtil-0.86
-			>=media-video/dvdauthor-0.6.8
-		)"
+	media-fonts/corefonts
+	dvdr? (
+		>=media-libs/gd-2.0.15
+		>=dev-perl/GD-2.0.7
+		>=dev-perl/GDTextUtil-0.86
+		>=media-video/dvdauthor-0.6.8
+	)"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
+	default
 	sed -e "s:/usr/X11R6/lib/X11/fonts/truetype/arial.ttf:/usr/share/fonts/corefonts/arial.ttf:g" \
-		-i dvd-menu.pl
-
-	epatch "${FILESDIR}/${P}-path.diff"
+		-i dvd-menu.pl || die
+	eapply "${FILESDIR}/${P}-path.diff"
 }
-# vdrsync/dvd-menu use hardcoded tmp-directory for large (up to and
-# greater than 1G). Uncomment and change the next two lines to your
-# needs if you need another tmp-Dir
-#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/dvd-menu.pl
-#sed -e 's:"/tmp/":"/temp/":g' /usr/bin/vdrsync.pl
 
 src_install() {
 	dobin check-vdrsync.pl vdrsync.pl vdrsync_buffer.pl