gentoo resync : 30.06.2018

4 files changed, 47 insertions, 7 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 0abed37ea1d8..5572aeed0a88 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
index eeac2efe41dd..8e4786acd600 100644
--- a/games-strategy/asc/Manifest
+++ b/games-strategy/asc/Manifest
@@ -1,7 +1,8 @@
+AUX asc-2.6.0.0-freetype_pkgconfig.patch 1012 BLAKE2B 8e6619f39c1ac5dfcc9e07c0bfd160ed55300aba75eda17aa9d40620d5be4f1da6a3233699f5cdea7a016580f02a8b456143a5c96f6b62f2ed78591d91d3df1c SHA512 f27e02554711bad885a53929f6049607201ea2090fa686b4d680c47470a0f7fec53c84a3f4657341fa46a3ef0369f204246b4bf2d3b25d588953e288edaa8a19
 AUX asc-2.6.0.0-gcc6-nothrow-in-dtors.patch 741 BLAKE2B f74d9e7529433ee86dd3f0406cc79a52ddcd0cca0880749268f5878f1aaacc7c67fce131af1d568c3f19549dfa21c5c20eed8a7116fc7fccefd689dc8bcf05b8 SHA512 d92086128b2b491a6f0c96d0b92f2e5ae9a7d521070405b7971fafa4ab953e6d4996784a6c5837b8cbf2811a18e043481c0278d960f6fe9804d8da68c8afa32d
 DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
 DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
 DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
 DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
-EBUILD asc-2.6.0.0-r2.ebuild 1599 BLAKE2B 2410fa65c91f561e4885566de0a60b00946b10d29b305d1a16430f55c3f6d180ed202e53239f0b7c52c9c3e6aac920a6dfa89d88a5e7eb9030965c90e333e779 SHA512 e03b3ba88482b90b44847e92a657f58317f320af8c96f25ce5939f64a1f14cb6f4c43c6d84a36dd097be220b3c0d3e9d2d80536e4d737ad5293c075819c84b70
+EBUILD asc-2.6.0.0-r2.ebuild 1777 BLAKE2B 04c24eaf6ed938e37bf6660a91f2ce8ff00ea5b106741436e50c4a6cf26b41c2eb1148903178685849131e51ad02699795d0b581b04cc3d17b0fb840c7426e04 SHA512 5df6fc0a21c2102049456591f00aab405559d9881117eb6bfda6e354c2d66f02d2cdede9598866d3288c3dd7f269880ae9e9c8eb2ffee1f79a2a4c098935268c
 MISC metadata.xml 329 BLAKE2B 0289ce2add055169d9f1b87baa936fe3b1066e11f9cf774fa46c26adfc534c7edc7c16e568000d3ebcb9936849be0c73fa44a2508a6d05c723cda6be1ba05dbd SHA512 1fa38f0da7bfc4cc3f1193758234379a9932c58742b914deebfc2d8101154e6303497b61c018eec7f52d5e8561ea2d7df89ad89f5d1cbe3f8a7732a1c922b051
diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
index 9f44b9d7d539..6f17949ef838 100644
--- a/games-strategy/asc/asc-2.6.0.0-r2.ebuild
+++ b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER=3.0
-inherit eutils toolchain-funcs flag-o-matic wxwidgets
+inherit autotools toolchain-funcs flag-o-matic wxwidgets
 
 DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
 HOMEPAGE="http://www.asc-hq.org/"
@@ -37,7 +37,10 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch )
+PATCHES=(
+	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
+	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
+)
 
 src_unpack() {
 	local f
@@ -53,6 +56,12 @@ src_unpack() {
 	done
 }
 
+src_prepare() {
+	default
+	# required for freetype_pkgconfig patch
+	eautoreconf
+}
+
 src_configure() {
 	need-wxwidgets unicode
 	# Added --disable-paraguitest for bugs 26402 and 4488
@@ -61,10 +70,12 @@ src_configure() {
 	if [[ $(gcc-major-version) -eq 4 ]] ; then
 		replace-flags -O3 -O2
 	fi
-	econf \
-		--disable-paraguitest \
-		--disable-paragui \
+	local myeconfargs=(
+		--disable-paraguitest
+		--disable-paragui
 		--datadir="/usr/share"
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..a07cd2f86274
--- /dev/null
+++ b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/657998
+
+--- asc-2.6.0.0/configure.ac
++++ asc-2.6.0.0/configure.ac
+@@ -401,22 +401,7 @@
+       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
+       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
+    else
+-      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
+-      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
+-      if test "$have_ft2build" != "yes"; then
+-         have_freetype="no"
+-      elif test "$have_freetype" = "yes"; then
+-         FREETYPE_LIBS="-lfreetype"
+-         ft2inc="no"
+-         AC_MSG_CHECKING(freetype2 include directory)
+-         if test -d /usr/local/include/freetype2; then
+-            ft2inc="/usr/local/include/freetype2"
+-         elif test -d /usr/include/freetype2; then
+-            ft2inc="/usr/include/freetype2"
+-         fi
+-         AC_MSG_RESULT($ft2inc)
+-         FREETYPE_CFLAGS="-I$ft2inc"
+-      fi
++      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
+    fi
+ 
+    if test x$have_freetype = xno; then