gentoo resync : 02.09.2020

4 files changed, 18 insertions, 18 deletions

diff --git a/app-text/pdf2html/Manifest b/app-text/pdf2html/Manifest
index 432cc5aece54..8b1383fa0dfa 100644
--- a/app-text/pdf2html/Manifest
+++ b/app-text/pdf2html/Manifest
@@ -1,5 +1,5 @@
-AUX pdf2html-1.4-gentoo.patch 2277 BLAKE2B 4f1698da379021fc9e10cb8d04644cdc15ee45550cad0a2cc84a6f129d65d1887235206ffec4704c27a28b39f73eeae003a268a82a99dde9fc41eb40a5887224 SHA512 5639f201a04d14347e13e4ff13d3b88c534f614dfaa0dac6494420e71a0c29ccfef83984fbfe4b130d91fa21c97b32f615abb2c875a2b447e48f542ce976ced1
-AUX pdf2html-1.4-libpng15.patch 218 BLAKE2B b81712c66f6e2f90aa378861306e5184f791f6cc148b4ca7f574f48edee0b316e60a7b3b31da2ca5ac1bf5875965369e4892556f94a95f802f45174f7a215d47 SHA512 2a0a80a639432cfdb067872d12c9c6ab9e5239a2f945d0fe362d1abfa4e8d203b377981807c686fccc53ed1afaee0b651345c8cd959f8cf268b5728c4145cb56
+AUX pdf2html-1.4-gentoo.patch 2204 BLAKE2B e8183f7cc7e045c525be7d0df391f623e550030ae55e02aeda6903c10ac9300f3ed8f71834eee9c78045bb5d72de7c26c1b6c942406d2885c490c74877fb6478 SHA512 e1821b83aa229d4a73bcc6a3041fe29d22af95d39fce0d84fe654a56831769c94a03d394032043e3f1db6e3ea90ae62fc022dfe6d217ef02dd02d5a3290320a4
+AUX pdf2html-1.4-libpng15.patch 222 BLAKE2B 51eb43b3307f6346ad05502ec8cb60926de7558a8b079f6c5d50ee62181eec70fea0b7502c53275403143ceeab88637bf1076f3c3fa9e87b55bde4543b0e5415 SHA512 d44545203b53d6a755b5b7bb94ff85b84fceb008ce9aa08a62ac8d64c257c09b8674fa3e2dcaec2a657b85573397b889ae5ebc71b643087424298e8c15c41179
 DIST pdf2html-1.4.tgz 22976 BLAKE2B d0177c34065dda391204813bc0c05b16ad8a711ca3d8f9ced060e2ee2c2f276fd7f0a713c5dfec934f7f95dd37641ef6aada9bab010ed9f457698c23554906a4 SHA512 00488c5e6303e1609294e7873c892866d19f3ee820f22f2d75436de22037bf3e4e1a565b7db29df5f6b20a76c5e2df4786e39e1d803cd7cca88274da65c7bbbb
-EBUILD pdf2html-1.4.ebuild 1081 BLAKE2B 4bd6611e270f3e47072978944be9946d9632366560827a5de3f6cc277fe08d016dfed89fe166a51266fa2b932a1dfc4009424ad3be86b9051bf961085e773cca SHA512 17779a47cd27696972202ae35f3742529ff5907ed8b3419fde7067dae16438c804b656103a328e97a2798eb027451b723f684762b77b2c4516d8f50da8f63da3
+EBUILD pdf2html-1.4.ebuild 1148 BLAKE2B 482465866af54a00acaf1b2c5d05e333877305a3871481d6468115662ec16617cfbc9904e3b365ff114e82e8d9e7832a2ac179c297631d5a6d4844ac804c17ad SHA512 abe1682bc78d5a664b5afc4013363343103f569afb835f2ec5a558382bf94171972f6b30f8988de40486f8b4308531637dd7ed609411501d329c12ad40da1de3
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
index 715b829b1c2a..de1b4b4f379f 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 72a0e1b65af9..7e5635332df8 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 745c02563434..3dfc5cf35421 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() {