From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 19 Jun 2018 00:29:09 +0000 (-0400)
Subject: net-dialup/ppp: clean up pkg-config usage for glib & openssl
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0ea402f42a5367f22085853ec0f7993c94ec2bb;p=gentoo.git

net-dialup/ppp: clean up pkg-config usage for glib & openssl
---

diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
index 5e0743255bf3..ed2dfd4c8c2e 100644
--- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
@@ -86,11 +86,19 @@ src_prepare() {
 		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
 	fi
 
+	# Respect our pkg-config settings.
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		contrib/pppgetpass/Makefile.linux || die
+	sed -i \
+		-e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
+		pppd/Makefile.linux || die
+
 	eapply_user #549588
 }
 
 src_compile() {
-	tc-export AR CC
+	tc-export AR CC PKG_CONFIG
 	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
 
 	# build pppgetpass