[gentoo-commits] repo/gentoo:master commit in: app-text/pdf2html/files/, app-text/pdf2html/

[gentoo-commits] repo/gentoo:master commit in: app-text/pdf2html/files/, app-text/pdf2html/

[Aaron Bauman]

commit:     dc1bf48271799c32439727e29fd2738ebfdfaa8e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 00:58:54 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 00:59:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1bf482

app-text/pdf2html: port to EAPI7

* Fix QA issues on echo calls
* Fix patches
* Use PATCHES=( )

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-text/pdf2html/files/pdf2html-1.4-gentoo.patch  |  4 ++--
 .../pdf2html/files/pdf2html-1.4-libpng15.patch     |  4 ++--
 app-text/pdf2html/pdf2html-1.4.ebuild              | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
index 715b829b1c2..de1b4b4f379 100644
--- a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
+++ b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
@@ -1,5 +1,5 @@
---- pbm2png.c.orig	2003-09-16 20:12:55.000000000 +0900
-+++ pbm2png.c	2004-02-21 22:09:57.415786664 +0900
+--- a/pbm2png.c
++++ b/pbm2png.c
 @@ -145,15 +145,13 @@
   sprintf(string,"%s%d.html",basename,index);
   f=fopen(string,"w");

diff --git a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
index 72a0e1b65af..7e5635332df 100644
--- a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
+++ b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
@@ -1,5 +1,5 @@
---- pbm2png.c
-+++ pbm2png.c
+--- a/pbm2png.c
++++ b/pbm2png.c
 @@ -23,6 +23,7 @@
  #include <stdlib.h>
  #include <string.h>

diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild
index 745c0256343..3dfc5cf3542 100644
--- a/app-text/pdf2html/pdf2html-1.4.ebuild
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Converts pdf files to html files"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/"
@@ -19,22 +20,21 @@ RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
 	>=media-gfx/imagemagick-6"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+)
 
 src_compile() {
 	tc-export CC
 	# Rewrite the Makefile as that's simpler
-	echo "LDLIBS=-lpng" > Makefile
-	echo "all: pbm2png" >> Makefile
+	echo "LDLIBS=-lpng" > Makefile || die "echo failed"
+	echo "all: pbm2png" >> Makefile || die "echo #2 failed"
 	emake
-	echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile
+	echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile || die "echo #3 failed"
 	emake pbm2eps9
 
-	echo "cp \"${EPREFIX}\"/usr/share/${P}/*.png ." >> pdf2html
+	echo "cp \"${EPREFIX}\"/usr/share/${P}/*.png ." >> pdf2html || die "echo #4 failed"
 }
 
 src_install() {