gentoo resync : 28.04.2021

6 files changed, 28 insertions, 26 deletions

diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest
index f51f77ac5630..1db9d88fc223 100644
--- a/app-text/paps/Manifest
+++ b/app-text/paps/Manifest
@@ -1,7 +1,7 @@
-AUX paps-0.6.8-fix-as-needed-build.patch 1051 BLAKE2B 5e610295f72421e1a0c31388a5f49897c74abd0dcf9ab1345579b37b085543ab09c7fa88b2240d78c8a3d7db77fa170c24899dce5c2f30385458b00cf6bb265d SHA512 943a2e2d267cf339cc3958ae5622fb4f8c3cd25fca63fa6c91c5b37c34e833dbdaf3a11e038d00b23a44fc590a268729941fee790f9f513f0532f9c339141695
-AUX paps-0.6.8-fix-doxygen-acinclude.patch 699 BLAKE2B c0aa64dfd7eec7e909debd8444c8ad2490d606e3922fc1be141d3b30d314310236f886f79032a987a7cc149c50c558471c61480f33b0ed2787474eb740930267 SHA512 b3c0949e7b6579cd3c3f82692ca2e0e9479bf435cc99b8c9c71e1842e32bccd9a79c2c199541ced21812ebf5cfc0887304511aa7cd1d4eba4bb2d476c4710b7b
-AUX paps-0.6.8-fix-empty-file.patch 558 BLAKE2B 10b0726c8f788ec6e21172ec7529b2aa9e7b4412166b4b9f4b4ded5b1833045f9753c3606a4348cd529ec4317cdf6bb702429e6e0cf7a5a98f87aa7cc2cb7711 SHA512 19d28f75664a7a626564176c223df77445710d7a941d145046dfdc5697dbacab25b60329e3ddda4f7ef6dcb5c1b4f14ad5641d190d83b8a17ddfa76bfb934a01
-AUX paps-0.6.8-fix-freetype-include.patch 323 BLAKE2B 75d4030616e2efee60d1928404bb67fa9cb6ff42d9183d3c6785d1ce18c110000195962a1f5514c0d7678855a5ac179cd7d505888ae5bcfc637aa9faf3919c45 SHA512 1ace4c661972853390feaf3f4a123416a6847b5d969017884df75561255a487c0c1e0adf37a1904f17c6855996a2edb0a5e388c996d31224f713bdba9425b287
+AUX paps-0.6.8-fix-as-needed-build.patch 1015 BLAKE2B 0ec2c1e0594316ceb94bb8772c62f864d0349a660cb940f494fef1e0d48bb1b2bb5aef43aa8a2ba014d9228a461279c94f24c91378aa8f6932c1a0c5164cf0da SHA512 0cd096ad6cc4ef38ef780a1f71f65876a8e05cc21a5e5c0a6a6dc73f2ec44ae7a2a183c5bdaa1b11162a0420282729bf4e797e47bad99f274e5d25b798d9a867
+AUX paps-0.6.8-fix-doxygen-acinclude.patch 681 BLAKE2B 4ce6ef7d0dbd216b226befd4debe37e452e813a87e37442f7f790735864f1bd2f08375e6ee041064638b08eadc250d12566b2c8b197e9c80c26043375310bf7c SHA512 6f494a671ff279cbc2e799b5bb5ce0a4c0228f7c6fe290aec71120ed9c67fcaeb6a24910d8fb9eb79d6f5f99a14ffeba4e5977a3f7586067d4a86221ab54acdf
+AUX paps-0.6.8-fix-empty-file.patch 540 BLAKE2B e27efd1b2e0d5131662f601babedf9343a052679feb1a6b0b52e40127f99ca2612a0f851b1be33a698c0f76a6739e3dce63c16457a3df227e1ad3fbe039f3784 SHA512 b99e4562a53d753d130d73dd70716df47244529e1875260b417030934f9d88f9b99fd0e2c4b231f72a372d80cc7e64ff8ad1b91a6a71475e8557f3eb6ecf2609
+AUX paps-0.6.8-fix-freetype-include.patch 305 BLAKE2B eb2c989ffe9c245baac91916c0887cfe91124748e58b0e9c7c74b46c171897fee493e05ec6a789fda42d04ad2f7bed11462cb611a59bb94c0653a3693eefdb3d SHA512 9436c5b426f0f97158b3c4ac63d193f19d169b4179080c6ff483335d5d68df2fbf89dc968a9f1d51c75b1aa70efcdbcd0a9758ca84c25e9e787587323564bdc6
 DIST paps-0.6.8.tar.gz 460062 BLAKE2B 8ca34cd217a5ed26de80a1e35f5cb05d75c291a966923ddcf73fb8a6db1a3823075c480c876cff932757feb3a4767057d269bac0863236df0b513e246726b01b SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba
-EBUILD paps-0.6.8-r2.ebuild 777 BLAKE2B 9f025ffddc995a851fb48ca6ec2e3f72845df836cb6757f2074ad35ef7d03129b9088c1618c372331894595e1eadd72c8dbab7f719aeaba573dcfec2e6edc74d SHA512 bfccabf0ecdea578b095022acd26280ff4d2ed9cdcc342787169dbc6d6040dc13221ee4d6c36ccc756645de785b75b48307437db5aab2d28f7445d6fba0f754c
+EBUILD paps-0.6.8-r2.ebuild 770 BLAKE2B f7ae236fb6335efb674f188c8e52536a618eb9eff3361c197eaed6b1f65dfd24574d1834f76d724354b7cd16b1485df00b52a5fc3422bbb27b89a8629d89c9d1 SHA512 51d3c392d91ef2b30723ca0e461c314121aba15b574ba479610f2d4aca9b05435b3474bcafc3681dfe7146032a56b4fb22c4f9ccfb2cc81e23eeb12c4e96a777
 MISC metadata.xml 241 BLAKE2B d711ad02c7fdc064fbef09dafb39412c4af3ddc374f88bc1ed8ba1812a9d07c1a948592632a58bd059f8d476c1ad86ce575587c0045c94a9c5134432021ab1f6 SHA512 8eb60a6869898218688205e0915f7aef34bd3639d6ed8e3303c19ade6ead67bc15ae781bd5856214d8ee0d69bbd80682013b68750bfd73f125c45a5ea0fdc9cb
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
index ec4ba8b2b180..d4bb69e39730 100644
--- a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/configure.in
-+++ paps-0.6.8/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -18,4 +18,6 @@
  
  DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
@@ -7,8 +7,8 @@
 +PKG_CHECK_MODULES([PANGO], [pangoft2])
 +
  AC_OUTPUT(Makefile src/Makefile)
---- paps-0.6.8/src/Makefile.am
-+++ paps-0.6.8/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,21 +7,19 @@
  bin_PROGRAMS = paps
  paps_CFLAGS  = -Wall 
diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
index baba74b4b8bb..449e776f5e6b 100644
--- a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/acinclude.m4
-+++ paps-0.6.8/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -78,7 +78,7 @@
  AC_PATH_TOOL([$1], [$2])
  if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
index ae334d1d28c0..2c83abf8d576 100644
--- a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/show_bug.cgi?id=566050#c2
 
---- paps-0.6.8/src/paps.c
-+++ paps-0.6.8/src/paps.c
+--- a/src/paps.c
++++ b/src/paps.c
 @@ -569,11 +569,14 @@
  
    fclose (file);
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
index ab97d22a2957..7504b66f6693 100644
--- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/src/libpaps.c
-+++ paps-0.6.8/src/libpaps.c
+--- a/src/libpaps.c
++++ b/src/libpaps.c
 @@ -25,8 +25,9 @@
  
  #include <pango/pango.h>
diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild
index 3b8795277278..bf4df11e9b57 100644
--- a/app-text/paps/paps-0.6.8-r2.ebuild
+++ b/app-text/paps/paps-0.6.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Unicode-aware text to PostScript converter"
 HOMEPAGE="http://paps.sourceforge.net/"
@@ -12,18 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-as-needed-build.patch
+	"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch
+	"${FILESDIR}"/${P}-fix-freetype-include.patch
+	"${FILESDIR}"/${P}-fix-empty-file.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-as-needed-build.patch \
-		"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
-		"${FILESDIR}"/${P}-fix-freetype-include.patch \
-		"${FILESDIR}"/${P}-fix-empty-file.patch
+	default
 
 	mv configure.in configure.ac || die