app-misc/graphlcd-base: Use pkg-config instead of freetype-config.

Closes: https://bugs.gentoo.org/654902
Package-Manager: Portage-2.3.41, Repoman-2.3.9

diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
new file mode 100644 (file)
index 0000000..cbdaf1c
--- /dev/null
+++ b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
@@ -0,0 +1,30 @@
+--- graphlcd-base-0.1.9/glcdgraphics/Makefile
++++ graphlcd-base-0.1.9/glcdgraphics/Makefile
+@@ -33,9 +33,9 @@
+ -include $(DEPFILE)
+ 
+ ifdef HAVE_FREETYPE2
+-      ifneq ($(shell which freetype-config),)
+-              INCLUDES += $(shell freetype-config --cflags)
+-              LIBS += $(shell freetype-config --libs)
++      ifneq ($(shell which pkg-config),)
++              INCLUDES += $(shell pkg-config --cflags freetype2)
++              LIBS += $(shell pkg-config --libs freetype2)
+       else
+               INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
+               LIBS += -lfreetype
+--- graphlcd-base-0.1.9/tools/genfont/Makefile
++++ graphlcd-base-0.1.9/tools/genfont/Makefile
+@@ -9,10 +9,10 @@
+ OBJS = genfont.o
+ 
+ INCLUDES += -I../../
+-INCLUDES += `freetype-config --cflags`
++INCLUDES += `pkg-config --cflags freetype2`
+ 
+ LIBDIRS += -L../../glcdgraphics/
+-LIBS += `freetype-config --libs`
++LIBS += `pkg-config --libs freetype2`
+ 
+ all: $(PRGNAME)
+ .PHONY: all

diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
index 8a56840395735980999d188255cd7a6af5bb270a..7c3f216d977164d1fa25b8ce42be923ff4683e41 100644 (file)
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,20 +16,26 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="g15"
 
-DEPEND="media-libs/freetype"
-RDEPEND="g15? ( app-misc/g15daemon )
-               media-libs/freetype"
+CDEPEND="media-libs/freetype"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       g15? ( app-misc/g15daemon )"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+       "${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch"
+)
 
 src_prepare() {
        sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-       eapply "${FILESDIR}/${PN}-0.1.5-nostrip.patch"
+
+       default
 
        sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
 
        #gcc-6 fix
        sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:"
-
-       default
 }
 
 src_install() {