From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019

---
 media-video/subtitleripper/Manifest                |  2 +-
 .../subtitleripper/subtitleripper-0.3.4-r4.ebuild  | 41 +++++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'media-video/subtitleripper')

diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest
index 4b5140bda8b3..53ab8a8f6965 100644
--- a/media-video/subtitleripper/Manifest
+++ b/media-video/subtitleripper/Manifest
@@ -3,5 +3,5 @@ AUX subtitleripper-0.3.4-libpng.patch 574 BLAKE2B b988fd6863b4a9bf93fce52c7aca5b
 AUX subtitleripper-0.3.4-linkingorder.patch 732 BLAKE2B e258459ee1a9d78fac1919368368a7a7ed20980a3abb733f249be644da23fe6c86e8afa160177387a4de4d535f4252dcb64dbc98052c62978097d434700a7a66 SHA512 27d84a80217917986f945735bf66e725120e29aa88885207e8a619e372fd8bfd65c4240d98df93b51f69e83969cc0e9996debe7de87aca16853c85c752c8ca3a
 AUX subtitleripper-0.3.4-respect-ldflags.patch 762 BLAKE2B 2d46f526eebbaff2047911496209a79cbf47cfab88a33f3d465cd223d08d1016a64c5280c6f0d2a9f3e87fda3f6bb97de0f46097f0e518e1ae037e8242419563 SHA512 a3de917412395689bd3870ba0e1406b24d04a5080b57c05fb0f2ef0716e84e4f8d4693d6448a4a5415133729469cb32a06e858e6ba69984252e34d031974c328
 DIST subtitleripper-0.3-4.tgz 47299 BLAKE2B e1a25adf55727463cc7aa57e2d005597c92212b1cb1f7edd7a20c5701444967d96af268f3b6feaf6ac29aa2f9dcfe2e0248593f5197228d1d0bbff9fad67c315 SHA512 6d25a43b5b1bf8a6c69200c8bab995265356d1235a872bb641d30dbf27b765be9280325b4dd8aa625c25a865563bd7525dd277682d5baeff3c54951da7b9a86a
-EBUILD subtitleripper-0.3.4-r4.ebuild 1382 BLAKE2B 56e38e0ddf826d43400c6c9bd83cafda4e2902b49fce6d028474f7d5e671a8d2580bf0ae6dfe197d607aaef802140f2b68a8b1b28617824c28e132aeb7befe74 SHA512 92ebaa329af1820aab43cf8510102404615efc3fda863d4d30787b35d12c73179e49dd00566dc39b0b5a0fa894ca30e894156a5cb736ea182edc423cdf42c9ad
+EBUILD subtitleripper-0.3.4-r4.ebuild 1332 BLAKE2B 0f7fc3f706748bfc5f911e127637b885f19263a1c61fe04bfdf0615ae37bd67ec2c6d05305a13035aeba4ea2160469e93ed2427f80916d94125d06023c791de7 SHA512 60a037c9db2f25f5b1d176b8c094f397148c5257f90eacc87f7d86331c5faf5bb3ef54cd628c71373b0ef6b08e0d0baecfdd5d99af7eac03f5d224bfad1745f3
 MISC metadata.xml 343 BLAKE2B 414833b9d5d807e45f04b05c4a0d9e86061fc8bba6ecea6492a02a4e9d7484242510dc834b6abd9dd3ea8576d65d31e5868a576f493a3b03b7e20a99c608fc36 SHA512 7de9a159e7ed1c33d3c48b39b380f41464aa3db757a6ea222eae8162fa78898fc6ed4403f4cd86643676885a294bc0cad438884fcc10fc63a69f2856cffa5e14
diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
index 226c2b9531a7..e547faecaf76 100644
--- a/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
+++ b/media-video/subtitleripper/subtitleripper-0.3.4-r4.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator eutils toolchain-funcs
+inherit toolchain-funcs
 
-MY_PV="$(replace_version_separator 2 "-")"
+MY_PV="$(ver_rs 2 "-")"
 
 DESCRIPTION="DVD Subtitle Ripper for Linux"
 HOMEPAGE="http://subtitleripper.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
+
 RDEPEND=">=media-libs/netpbm-10.41.0
 	media-libs/libpng
 	sys-libs/zlib
@@ -22,23 +24,28 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${P}-linkingorder.patch
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-glibc210.patch
+	"${FILESDIR}"/${P}-respect-ldflags.patch
+)
+
+src_prepare() {
 	# PPM library is libnetppm
-	sed -i -e "s:ppm:netpbm:g" Makefile
+	sed -i -e "s:ppm:netpbm:g" Makefile || die
 	# fix for bug 210435
-	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c
+	sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" \
+		spudec.c subtitle2pgm.c || die
 	# we will install the gocrfilters into /usr/share/subtitleripper
-	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt
+	sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' \
+		pgm2txt || die
+
+	default
 
-	epatch "${FILESDIR}/${P}-linkingorder.patch"
-	epatch "${FILESDIR}"/${P}-libpng.patch
-	epatch "${FILESDIR}"/${P}-glibc210.patch
-	# respect CC and LDFLAGS
+	# respect CC
 	sed -i -e "s:CC =.*:CC = $(tc-getCC):" \
 		-e "/^CFLAGS/s: = :& ${CFLAGS} :" "${S}"/Makefile
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
 }
 
 src_install () {
-- 
cgit v1.2.3