gentoo resync : 28.04.2021

4 files changed, 15 insertions, 14 deletions

diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
index 906e0fb0075f..197a0b57babb 100644
--- a/gnustep-base/mknfonts/Manifest
+++ b/gnustep-base/mknfonts/Manifest
@@ -1,6 +1,6 @@
-AUX mknfonts-0.5-pkgconfig.patch 510 BLAKE2B b74790dbad72f52c0075114861ecbb66a428c41cda8510252e41611a57a16eaff34461f18d87659bce469167e28d75bcfe20fdf5b5419acb2b5d12416236f506 SHA512 c45b6eb60365cb6b0125127cfaf9292756a5f6490249f5fa5be600054ec4743f84bd1c56e9d199441e74de829a4ebf63241c4aae5e13a64af449a1ec4ba6a00f
-AUX mknfonts-rename.patch 499 BLAKE2B 50430871a2f4a99bf1c4996291dadacf1bf6cbd296b1ae5ef25d896a7d48d034ea2fbfc91f5f490661d0ba3c5b87ead5794a4402104e670c090ac654c117c5c0 SHA512 9107b0e6de1d228bce2e4796dd69a65a5644ca290dbe7c2953f44576d5485204bb52659895302e243d2f92bb3dbdf33991cbfa62a59d2486914b62a8e4675f7f
+AUX mknfonts-0.5-pkgconfig.patch 351 BLAKE2B c31a0552df4eaf7848a359581365c972f0a05f3bde2daabaebb8024d4b51f59745f1d04513d66b606aad083f856065dc2a457fed67d721876942d7d16b2dc8bf SHA512 a85248ba9459cf145ec68e86b87103cc1c5f5802a0fb0ea789132938a925c8bac1dfff6fd717b6f526ea4d25dfcc34ef2a2d33f10b85c0422eb9eb2d2737f940
+AUX mknfonts-rename.patch 400 BLAKE2B b285fa4a861648df5750a0adbd9cd398193bccc0206875b97454aceda18a85b7473d1f373bdd665d77afc494c7174a25e9443d09238d183e102ea09e677f7448 SHA512 4068bb4881f72f1679b539536b7a4147c0ad47b6ce9cc0ff88f0af7b39895dec781eae7c6660473ebdce9b628e1a2cf20b90db8d71974721eaac639dda6d8beb
 DIST mknfonts.tool_0.5.orig.tar.gz 2890 BLAKE2B 584989b90c0fb44d62f69174e0dca706a8bcfab942442228ae4e5c98dfb8221e9bfc43cb32b4f48609b51ff7217f591f2d7acaccf219a2ed34b99fb9f5ea2f4e SHA512 a6ad5810576285f16a8dc3596205b64bc6b183a6b9377df1c9e40d28cdba7ce2ae6e6b883478429f8c931bdd3f9f23396c6f5cd3fa1d155025638bb77ccd86ed
 EBUILD mknfonts-0.5-r2.ebuild 739 BLAKE2B 8ab135c1c469b872477d59f2692ad42ef8297c7955fc4c2ebba1e9667804a63bc6212fe65777b91ce88b8d6a2dfab4d155c5f28176d125815e6d9b6672ef8614 SHA512 69da2c1eaaa4ac84be7d0ee8f2a168895ef28ebf02b4f7f44a36e59bef2552133950120c350e6ca5eb72ee82171f27d483b9183851717422c13642e198abb6ba
-EBUILD mknfonts-0.5-r3.ebuild 787 BLAKE2B d700765e5b44ee42c607435db7e0d2c4c807668f18d6fbaaa1d0f03d8873309a41a10642c22f5865fa6824c5833a785a6676125b8c28884ee6e172c01f9fdcbc SHA512 dd962aac428abca33a4797a6b4a5f61e15b9014a54928744f297057f5bd482a16422b64479e88fe1abbd6dfee23eaaab77d26fa21b11455c942ffed5333dd79d
+EBUILD mknfonts-0.5-r3.ebuild 832 BLAKE2B 4793f5d24630baee1e79361ac7bf71501af0d844376c682fe989b4f28d88a03ecaf941c68d5864b7c54638826fb6c36ad51c4797cfd9441cd0e369049d0f838e SHA512 23cf1fe0d8b5cd1cfa6f8a7eb5a5c7432f054eeb4f5836453f2c9f91e831b4a95692b72eb17b11533f071361e09a5840413b860a914a4bec404e5afe27fe8946
 MISC metadata.xml 253 BLAKE2B 3b0c2aef2a8a4a9d91417347a62b76bee2b27a774bee648874d8a4d20800ed78d3452f3c5289b6d47c6bd2188752b41ef94f0919cff5de8cc7d4aafa5bbcffe4 SHA512 2adb9b9e4859c6d1063e67c509015594eec484e91882e3a71b70ac031e02b6f01ab5a2ad4e1a12329c284b34f7d69b19e08b593a0dc3901e2470eabb3e8d3fb5
diff --git a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
index e73bac5c1ddf..f375b0277dc2 100644
--- a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
+++ b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
@@ -1,14 +1,13 @@
-diff -Naur mknfonts-0.5.orig/GNUmakefile mknfonts-0.5/GNUmakefile
---- mknfonts-0.5.orig/GNUmakefile	2002-09-28 12:27:26.000000000 +0200
-+++ mknfonts-0.5/GNUmakefile	2018-06-29 11:27:01.871588321 +0200
+--- a/GNUmakefile
++++ b/GNUmakefile
 @@ -9,8 +9,8 @@
  
  ADDITIONAL_OBJCFLAGS += -Wall -O2
  
 -ADDITIONAL_INCLUDE_DIRS += `freetype-config --cflags`
 -ADDITIONAL_LDFLAGS += `freetype-config --libs`
-+ADDITIONAL_INCLUDE_DIRS += `pkg-config --cflags freetype2`
-+ADDITIONAL_LDFLAGS += `pkg-config --libs freetype2`
++ADDITIONAL_INCLUDE_DIRS += `${PKG_CONFIG} --cflags freetype2`
++ADDITIONAL_LDFLAGS += `${PKG_CONFIG} --libs freetype2`
  
  mknfonts_OBJC_FILES = mknfonts.m
  
diff --git a/gnustep-base/mknfonts/files/mknfonts-rename.patch b/gnustep-base/mknfonts/files/mknfonts-rename.patch
index e62618b7844c..426d7c92640b 100644
--- a/gnustep-base/mknfonts/files/mknfonts-rename.patch
+++ b/gnustep-base/mknfonts/files/mknfonts-rename.patch
@@ -1,5 +1,5 @@
---- mknfonts-0.5/mknfonts.m.orig	2007-05-03 11:46:27.000000000 +0200
-+++ mknfonts-0.5/mknfonts.m	2007-05-03 11:47:34.000000000 +0200
+--- a/mknfonts.m
++++ b/mknfonts.m
 @@ -310,12 +310,6 @@
  			{
  				fi=[faceinfos objectAtIndex: i];
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
index af4957771143..b0aa579764ee 100644
--- a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
+++ b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnustep-base
+inherit gnustep-base toolchain-funcs
 
 DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
 HOMEPAGE="https://packages.debian.org/mknfonts.tool"
@@ -15,8 +15,8 @@ IUSE=""
 
 RDEPEND="gnustep-base/gnustep-gui
 	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-rename.patch
@@ -26,6 +26,8 @@ PATCHES=(
 src_prepare() {
 	default
 
+	tc-export PKG_CONFIG
+
 	# Correct link command for --as-needed
 	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die
 }