gentoo resync : 28.04.2021

6 files changed, 45 insertions, 40 deletions

diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
index e8d08ed13ade..7a9221ec5ae4 100644
--- a/app-text/ttf2pt1/Manifest
+++ b/app-text/ttf2pt1/Manifest
@@ -1,7 +1,7 @@
-AUX ttf2pt1-3.4.0-man-pages.diff 1441 BLAKE2B 20257cf4dc9499641378ed32494577eb0a09dfe485acd7ff92d6e1f620651f07b5ad6fc928158a1bd9935fbae470f673b0acefb1ced83f29911982ddd32109e2 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f
-AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 BLAKE2B 278e8baf471727bb191b4cea97691982f454e978dc1d8533ba35d10cb979c107bba8665f21123a3cd8ab75db0e7efd76032ce60045dc05abcc4219569608d0d5 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf
-AUX ttf2pt1-3.4.4-Makefile.patch 2911 BLAKE2B f155d19c1a60a524c18f33b09a0c1c73b2cf7b0d2ded90eaa8b23cbc861cb7eb888f77ee6a1217ae2f6043835ebb3bdaab7bc67238d5d6504e6c412738340891 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb
-AUX ttf2pt1-3.4.4-freetype.patch 378 BLAKE2B 03adca507ae8b2556c20dd32c73a302bcb7d5793cb040c706a1e6d86de9f3eb55e8df85a578a2a9fa4cbb3216d50129d33548a7b3472bd7df5417e6a0f6b9b8c SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669
+AUX ttf2pt1-3.4.0-man-pages.diff 926 BLAKE2B 9fd3872f9c28d03ba2412fe27ed65277dfd34b3923d1e6fb2af9cac3c990446048e64ea5583386d8c34184d7c61507e2c0341c0a6f3bda56455204e9b51d4ccd SHA512 629b307fc210fff774e4675f6a819fff2f8336c6cf3f6ce1ee6c32e05503c86f80d03e978bbeabd862091b6bbcec80207c2e149d1b2a2b34a9b54c30a338240c
+AUX ttf2pt1-3.4.4-LDFLAGS.patch 870 BLAKE2B 74ab6326c92b2f9639765e6d1849f253357a15ad25d4234cc516021fc78168b5fb12a76e68c48b4755723a12300bc2f1d5031318e02bfc3c2057397699b67c5d SHA512 63e16aa71f2ae1fb1de0d97e1d76e7f075a8035cb77dbac8a55affc3784d52de350ec764113b0967e7792a45bfa9f338112022223ab50eedaef793f7b8add4dc
+AUX ttf2pt1-3.4.4-Makefile.patch 2748 BLAKE2B 131e2bfb4898bce7d98dda58255627b804d1386799af5aefd33efee9475a959954533cbae5374b34d945b8f3da6e3918463f4c1b4a9a9f083accb53344b95e91 SHA512 97d14aee0dc7196659aa2db9ece18fe8ebb6e5fc75e4c064dd1942702325ecad70b9ea66bd241932a0479cd97435953f5c5380de17177916e2d15389830a706e
+AUX ttf2pt1-3.4.4-freetype.patch 223 BLAKE2B 4f2e5a1a505329d505c705fce85d2a3729737d7c90cdf24ed318cc745edcf3279b204be0f395eadb3e95a66a89316c9d84a850510b95abc33bb50451a54b0a62 SHA512 4f5368c52fb4139995fad7cf881c2f3f722269818d045dac132856fc765e7c6e0dd21d6a74ffdbb93bdfe66924824f3bd8ef3779a020b1f22edec9e4d90b5a17
 DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
-EBUILD ttf2pt1-3.4.4-r1.ebuild 1062 BLAKE2B 77f768d23a2b22649425a746d2b993a28951090569566a298fbd0b37bfaa0a1ea18c7ca2b540c0636f40fab385db85b8babb334ddedaae4521801643c38c640d SHA512 b57372e8fde2440219d85eae0898775c2f73115788a7f0e168dc4907b5aa97b45e10a88d80d1c1c883fff989b071fbe90b506d078d9546b9874ddb046ff77088
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1297 BLAKE2B 509af7610cb0ad513623af2dad822a318016b72a38b0d55a7412d21a2ba68da71a02c6518373992892c94038e462583ac7494bacf8ee2747583e62d5d28dfb37 SHA512 edeaeef8c6907c773fa9fb0b2d994203327323c73fe814a5a2031320eb71ad50425b0aece193c79272cf1b140438ddd0a666499d720721157cf7b1a0aa07757c
 MISC metadata.xml 315 BLAKE2B e2eecb62a8d7f8a509b9b09a251e32bf3129a9c5205ea5574271fb6660226d14f4a1870481b053690d9794cef6e239051a05075586ec7e38ff6bd5219e9d537b SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
index 2d301244272c..cd8fc2c69b39 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
@@ -1,6 +1,5 @@
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
---- ttf2pt1-3.4.0.orig/ttf2pt1.1	2001-11-25 00:58:11.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1.1	2006-08-15 19:15:37.129672839 +0000
+--- a/ttf2pt1.1
++++ b/ttf2pt1.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -11,9 +10,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
  .	\" fudge factors for nroff and troff
  .if n \{\
  .	ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1	2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_convert.1	2006-08-15 19:16:14.369517359 +0000
+--- a/ttf2pt1_convert.1
++++ b/ttf2pt1_convert.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -24,9 +22,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
  .	\" fudge factors for nroff and troff
  .if n \{\
  .	ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1	2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1	2006-08-15 19:16:30.770568473 +0000
+--- a/ttf2pt1_x2gs.1
++++ b/ttf2pt1_x2gs.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
index 3d03e03e14ca..0bb7b570595b 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2616d46..cf72cba 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -179,7 +179,7 @@ app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
index 6c760f43dd21..8224c168c1a3 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
---- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
-+++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -9,7 +9,7 @@
  #
  # Use GNU C even if it's not the default compiler
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
index 8257742ebe59..a4c4e7b98716 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
-+++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+--- a/ft.c
++++ b/ft.c
 @@ -12,6 +12,7 @@
  #include <stdlib.h>
  #include <ctype.h>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
index ed543c6808a4..fcc8361c32a0 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="True Type Font to Postscript Type 1 Converter"
 HOMEPAGE="http://ttf2pt1.sourceforge.net/"
@@ -12,28 +12,40 @@ SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
 LICENSE="ttf2pt1"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 DEPEND=">=media-libs/freetype-2.5.1:2"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-3.4.0-man-pages.diff
+	"${FILESDIR}"/${P}-freetype.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
-	epatch "${FILESDIR}"/${P}-freetype.patch
-
-	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
-	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
-	sed -i -e "/^LIBS_FT=/ { s:-L/usr/lib:-L/usr/$(get_libdir): }" Makefile
-	sed -i -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" Makefile
+	default
+
+	sed -i \
+		-e "/^CC=/ { s:gcc:$(tc-getCC): }" \
+		-e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" \
+		-e "/^LIBS_FT=/ { s:-L/usr/lib:-L${ESYSROOT}/usr/$(get_libdir): }" \
+		-e "s:-I/usr/include/freetype2 -I/usr/include:$($(tc-getPKG_CONFIG) --cflags freetype2):" \
+		-e "s:-L/usr/lib -lfreetype:$($(tc-getPKG_CONFIG) --libs freetype2):" \
+		-e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" \
+		-e "/chown/d" \
+		-e "/chgrp/d" \
+		-e "/chmod/d" \
+		Makefile || die
 }
 
 src_install() {
-	emake INSTDIR="${D}"/usr install
+	emake INSTDIR="${ED}"/usr install
 	dodir /usr/share/doc/${PF}
-	pushd "${D}"/usr/share/ttf2pt1 > /dev/null
-	rm -r app other
-	mv [A-Z]* ../doc/${PF}
-	popd > /dev/null
+
+	pushd "${ED}"/usr/share/ttf2pt1 > /dev/null || die
+	rm -r app other || die
+	mv [A-Z]* ../doc/${PF} || die
+	popd > /dev/null || die
 }