---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -437,7 +437,7 @@
- if test "$FT2_CONFIG" = "no" ; then
- no_ft=yes
- else
-- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
---- a/src/client/GLEXT/GLFont2dFreeType.h
-+++ b/src/client/GLEXT/GLFont2dFreeType.h
-@@ -23,10 +23,10 @@
- \r
- #include <GLEXT/GLFont2dStorage.h>\r
- #include <ft2build.h>\r
--#include <freetype/freetype.h>\r
--#include <freetype/ftglyph.h>\r
--#include <freetype/ftoutln.h>\r
--#include <freetype/fttrigon.h>\r
-+#include <freetype.h>\r
-+#include <ftglyph.h>\r
-+#include <ftoutln.h>\r
-+#include <fttrigon.h>\r
- #include <string>\r
- \r
- class GLFont2dFreeType\r
---- a/src/launcher/wxdialogs/TrueTypeFont.h
-+++ b/src/launcher/wxdialogs/TrueTypeFont.h
-@@ -25,10 +25,10 @@
- #include <wx/image.h>\r
- #include <ft2build.h>\r
- #include <string>\r
--#include <freetype/freetype.h>\r
--#include <freetype/ftglyph.h>\r
--#include <freetype/ftoutln.h>\r
--#include <freetype/fttrigon.h>\r
-+#include <freetype.h>\r
-+#include <ftglyph.h>\r
-+#include <ftoutln.h>\r
-+#include <fttrigon.h>\r
- \r
- class TrueTypeFont\r
- {\r
+diff --git a/configure-ft.m4 b/configure-ft.m4
+index d27678ca..ce369bf4 100644
+--- a/configure-ft.m4
++++ b/configure-ft.m4
+@@ -1,14 +1,2 @@
+ dnl Check for FreeType2
+-AC_CHECK_FT2(7.0.1, ftype=1)
+-if test "$ftype" != 1; then
+- AC_MSG_ERROR([
+- FreeType2 must be installed on your system
+- but freetype-config couldn't be found.
+- Please check that freetype-config is in the path, the directory
+- where the freetype libraries are installed (returned by
+- 'freetype-config --libs' command) is in LD_LIBRARY_PATH or
+- equivalent variable and freetype version is 7.0.1 or above
+- Try http://www.freetype.org to download freetype.
+- ])
+-fi
+-
++PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1)
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# remove bundled fonts
rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
- dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
- dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
- dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
+ dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
+ dosym ../../../fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
+ dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
if ! use dedicated; then
newicon data/images/tank-old.bmp ${PN}.bmp