From c210c56f95a0ee9f892d8c76ea9bba35416b8e33 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Thu, 28 Dec 2017 12:35:16 +0100 Subject: app-cdr/dvdshrink: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild | 19 +++++++------------ .../files/dvdshrink-2.6.1_p10-fix-paths.patch | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild index 0dd1d1b19267..c7e5f5c4269e 100644 --- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild +++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils +EAPI=6 + +inherit desktop DESCRIPTION="Scriptable DVD copy software" HOMEPAGE="http://dvdshrink.sourceforge.net" @@ -24,21 +25,15 @@ RDEPEND=">=media-video/transcode-1.0.2-r2[dvd] DEPEND="" S=${WORKDIR}/${PN} - -src_prepare() { - sed -e 's:applications/::g' -i usr/bin/dvdsfunctions \ - -i usr/bin/xdvdshrink.pl || die "sed failed." -} +PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch ) src_install() { - dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} || die "dobin failed." + dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} - if use gtk; then - dobin usr/bin/xdvdshrink.pl || die "dobin failed." - fi + use gtk && dobin usr/bin/xdvdshrink.pl insinto /usr/share - doins -r usr/share/applications/dvdshrink || die "doins failed." + doins -r usr/share/applications/dvdshrink dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt} diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch new file mode 100644 index 000000000000..8acbb70073e0 --- /dev/null +++ b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch @@ -0,0 +1,22 @@ +--- a/usr/bin/dvdsfunctions ++++ b/usr/bin/dvdsfunctions +@@ -1933,7 +1933,7 @@ + if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi + SAVEISO=0 # Save an ISO along with the burn(s) + +- APPDIR=/usr/share/applications/dvdshrink ++ APPDIR=/usr/share/dvdshrink + } + + # Build a minimal but usable XML file for 'dvdauthor' +--- a/usr/bin/xdvdshrink.pl ++++ b/usr/bin/xdvdshrink.pl +@@ -22,7 +22,7 @@ + + my $login = getlogin || getpwuid($<); # Userid of current user + my $homedir = "/home/" . $login; # Home dir of current user +-my $app_dir = "/usr/share/applications/dvdshrink"; ++my $app_dir = "/usr/share/dvdshrink"; + my $false = 0; # A 'false' + my $true = 1; # A 'true' + my $srunning = 0; # Is the bash script running -- cgit v1.2.3-65-gdbad