gentoo resync : 08.05.2018

4 files changed, 86 insertions, 36 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index c0e59d97f564..361f179cf336 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ea6065e0442a..719bb82ab845 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,6 @@
-AUX scummvm-2.0.0-freetype_pkgconfig.patch 1268 BLAKE2B 5e8ba330de40cd2c7165ab76b3d282f5c2fd94a3caeace93e6c4953fb72486a515f5ebcb0a40d3ca2e38759402c28cf243755cac438c6e4d5d78c34752327644 SHA512 efe188427c15b8442eb49dbbd431fb87c48d59057b5d941fe7a4f41d022a846f6b4f24e7f3bec8496ae306c2b56ed5eb53cc270e15fb767672b090fed9309118
+AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
 DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773 SHA512 c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
 DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
 EBUILD scummvm-1.9.0.ebuild 2572 BLAKE2B 31a15a603f5b6fa33ad38da05a439e0285e4af3cf9212c8e9e403775184045a60ccff0910733ad258772420325d2395f52a54a75582f177b87bd3ad628324f0d SHA512 6d6d2bbddd94c21be730b1903f6c315a2fffe0d4ac95b41ab5cc41e08c67871a74936faaacdd49b3c2a0118caef8c7a5703ff850bc938449e233a7acfa08b606
-EBUILD scummvm-2.0.0.ebuild 2641 BLAKE2B 6ea118364671f276388e1528faf3028cce59707edbd3d517e943873e641864458d9a16bb8d9194c6d8e2c21a3e2e1b5e3236c66de07bd850571f5dd6603a3948 SHA512 856bbfb2567125ab8e94c672d4e379952928be2fec3ce97f9fa08711f66375b8c4c1c07973ad2c582fb473e8037a6b717f3e446d9211ea7d55f3ece27c98788f
+EBUILD scummvm-2.0.0.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7
 MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
index 669cffc945ce..ca5c5e892710 100644
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
@@ -1,50 +1,99 @@
-From 86c7fd67e5ab2e721de8493d162d7605b1b08823 Mon Sep 17 00:00:00 2001
+From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 6 May 2018 10:22:48 +0200
-Subject: [PATCH] Use pkg-config to find freetype if freetype-config is not
- available
+Date: Sun, 6 May 2018 20:55:29 +0200
+Subject: [PATCH] Prefer pkg-config over freetype-config if possible
 
+As of freetype-2.9.1 the freetype-config script no longer gets installed
+by default.
 ---
- configure | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
+ configure | 56 ++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 37 insertions(+), 19 deletions(-)
 
 diff --git a/configure b/configure
-index 8e2a387acc..e3c15a9a2a 100755
+index 8e2a387acc..210951e343 100755
 --- a/configure
 +++ b/configure
-@@ -4674,7 +4674,13 @@ if test "$_freetype2" != "no"; then
- 	find_freetypeconfig
- 
- 	if test -z "$_freetypeconfig"; then
+@@ -204,6 +204,7 @@ _sparklepath=
+ _sdlconfig=sdl2-config
+ _libcurlconfig=curl-config
+ _freetypeconfig=freetype-config
++_freetype_found="false"
+ _sdlpath="$PATH"
+ _freetypepath="$PATH"
+ _libcurlpath="$PATH"
+@@ -4668,28 +4669,45 @@ echo "$_libunity"
+ #
+ # Check for FreeType2 to be present
+ #
+-if test "$_freetype2" != "no"; then
+-
+-	# Look for the freetype-config script
+-	find_freetypeconfig
+-
+-	if test -z "$_freetypeconfig"; then
 -		_freetype2=no
-+		if pkg-config --exists freetype2; then
-+			FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+			FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+			_freetype2=yes
-+		else
-+			_freetype2=no
-+		fi
++find_freetype() {
++        # Wrapper function which tries to find freetype
++        # either by callimg freetype-config or by using
++        # pkg-config.
++        # As of freetype-2.9.1 the freetype-config file
++        # no longer gets installed by default.
++
++	if pkg-config --exists freetype2; then
++		FREETYPE2_LIBS=`pkg-config --libs freetype2`
++		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
++		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
++		_freetype_found="true"
  	else
- 		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
- 		# This means we can't pass it a --prefix that includes $SYSROOT.
-@@ -4714,13 +4720,12 @@ EOF
+-		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
+-		# This means we can't pass it a --prefix that includes $SYSROOT.
+-		freetypeprefix="$_freetypepath"
+-		if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
+-			teststring=VeryImplausibleSysrootX1Y2Z3
+-			if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
+-				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
+-				freetypeprefix="${freetypeprefix##$SYSROOT}"
++		# Look for the freetype-config script
++		find_freetypeconfig
++		if test -n "$_freetypeconfig"; then
++			# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
++			# This means we can't pass it a --prefix that includes $SYSROOT.
++			freetypeprefix="$_freetypepath"
++			if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
++				teststring=VeryImplausibleSysrootX1Y2Z3
++				if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
++					echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
++					freetypeprefix="${freetypeprefix##$SYSROOT}"
++				fi
  			fi
- 			cc_check_clean
++			FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
++			FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
++			FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null`
++			_freetype_found="true"
  		fi
--
--		if test "$_freetype2" = "yes"; then
--			append_var LIBS "$FREETYPE2_LIBS"
--			append_var INCLUDES "$FREETYPE2_CFLAGS"
--		fi
- 	fi
- 
-+	if test "$_freetype2" = "yes"; then
-+		append_var LIBS "$FREETYPE2_LIBS"
-+		append_var INCLUDES "$FREETYPE2_CFLAGS"
 +	fi
- fi
++}
+ 
+-		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
+-		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
+-
++if test "$_freetype2" != "no"; then
++	find_freetype
++	if test $_freetype_found != true; then
++		_freetype2=no
++	else
+ 		if test "$_freetype2" = "auto"; then
+ 			_freetype2=no
  
- echocheck "FreeType2"
+@@ -4709,7 +4727,7 @@ EOF
+ 			# required flags for static linking. We abuse this to detect
+ 			# FreeType2 builds which are static themselves.
+ 			if test "$_freetype2" != "yes"; then
+-				FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
++				FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS"
+ 				cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
+ 			fi
+ 			cc_check_clean
 -- 
 2.17.0
 
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
index 0df104f23aa1..b4df47b76af2 100644
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0.ebuild
@@ -30,6 +30,7 @@ RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
 	fluidsynth? ( media-sound/fluidsynth )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
+	truetype? ( virtual/pkgconfig )
 	x86? ( dev-lang/nasm )"
 
 S="${WORKDIR}/${P/_/}"