gentoo resync : 08.05.2018

3 files changed, 55 insertions, 3 deletions

diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index bb2bc3341acc..1e7c3e874bb9 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,4 +1,5 @@
 AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408aae3ca0de8e31160a9d449599ce94139438e55638808bb667042f0c0e3dcf3f6b5de9959314f17bed3e3f11e090f871 SHA512 69a445d41856e4a567c253d5a0a1f63128ad8f71d8c418da855d62e2f1ff13e2a19a6887a22cfdaa8682811695b79b3bc736b569756f88e8472d294d89561005
+AUX ming-0.4.8-freetype_pkgconfig.patch 1605 BLAKE2B bf247ebadff2c223c00dbf8e8bce22de9d0fdaa651cc08dee5cc0cb01b8799ef3f713e1ce20bb613db5baa842c6c6deaf04af66df6809711c3e3df3cca9f74f8 SHA512 fc07a00f24c10875ae1e0e8be259673486602c7702c30c75a4f088283be0504e6e26831ba93c0d4a0d3606a908da5ff8ce0365ef3f587d37925540f9720c42d7
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
-EBUILD ming-0.4.8-r1.ebuild 2185 BLAKE2B 0ee8885e23283b655b6770367cd2b742a91e808bfbbc1cc4e724e2e6870ec7299037f488948dac935203fb08c6898d65d1de47a57af6ecea45d4baa099ec46e6 SHA512 701d0be12876a3d143960f6478d499f7cc2d9906f18675a1aef51b983f0ed40d5a0c153b612f630d8c7477f397e246c07e12a083f08b9eb87ff976852e196ae6
+EBUILD ming-0.4.8-r1.ebuild 2257 BLAKE2B c6134cd272270764346d8fe80ae1897ad9353a131ade67d820c4fa4f1a3dd525b4a12851c79a357daaa83c52a84b8fa82eace830836b9d10c061880708cdb90f SHA512 2c7a0af6e4792d9ffce756dac6416432543912fd86bb1c7552b3d67fedd7968a19c971a6db7ea24707d73e2970af43469678d76c0097c83e9c53c00ec1eff1aa
 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..5c2de7554d46
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
@@ -0,0 +1,47 @@
+From ef3719d39e8bb7e96c6ec57d60261f1516353460 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 4 May 2018 17:40:04 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script has been deprecated and
+is no longer shipped by default.
+---
+ configure.in | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 95943a0b..f1685c26 100644
+--- a/configure.in
++++ b/configure.in
+@@ -257,26 +257,8 @@ freetype_support=yes)
+ 
+ if test "$freetype_support" = "yes"; then
+ 	dnl Check for the freetype library
+-	AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
+-	if test "$freetype_config" = "yes"; then 
+-		AC_PATH_PROG(ft_config,freetype-config,no)
+-        	if test "$ft_config" = "no"; then
+-			echo "To compile ming please install freetype:"
+-			echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
+-			echo ""
+-			echo "or disable the freetype configuration option:"
+-			echo " --disable-freetype"
+-                	AC_MSG_ERROR([Could not detect freetype-config!])
+-        	fi
+-	else
+-        	ft_config="$freetype_config"
+-	fi
+-
+-	FREETYPE_CFLAGS="`$ft_config --cflags`"
+-	FREETYPE_LIBS="`$ft_config --libs`"
+-
+-	AC_SUBST(FREETYPE_LIBS)
+-	AC_SUBST(FREETYPE_CFLAGS)
++	PKG_PROG_PKG_CONFIG
++	PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype]))
+ fi
+ 
+ dnl Check for the ungif or gif (new or old) libraries
+-- 
+2.17.0
+
diff --git a/media-libs/ming/ming-0.4.8-r1.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild
index 8015aff99bfa..eba066b84485 100644
--- a/media-libs/ming/ming-0.4.8-r1.ebuild
+++ b/media-libs/ming/ming-0.4.8-r1.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
@@ -28,13 +28,17 @@ RDEPEND="perl? ( dev-lang/perl:= )
 	!media-libs/libswf"
 DEPEND="${RDEPEND}
 	sys-devel/flex
+	virtual/pkgconfig
 	virtual/yacc"
 PDEPEND="php? ( dev-php/ming-php )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S=${WORKDIR}/${P//./_}
 
-PATCHES=( "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch
+	"${FILESDIR}"/${PN}-0.4.8-freetype_pkgconfig.patch
+)
 
 # Tests only work when the package is tested on a system
 # which does not presently have any version of ming installed.