gentoo resync : 17.05.2018

8 files changed, 243 insertions, 186 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 0a47b7b83a86..d1f8d751acc7 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 909ba7e66308..fd644f974eae 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,7 +1,6 @@
-DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5 SHA512 198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5
+AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1
 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
-DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b SHA512 e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976
-EBUILD freeciv-2.5.10.ebuild 4479 BLAKE2B 32598e62346d6dce4a2619b3dfc0b420570096c22c0d8fd1370b3ed993ad8de94f8f19bccd2f507cbabf486c26a15242842c538e1964d44e05e9e7035bbfa45f SHA512 1c0e9534ae300177ffa95270cc2ab3771f22c10fb824595353a05347db88afbc28c394eb6be69a4a5ea2e1ea963bf6a7600196080d326e7b4e9aabbbe9c46f24
-EBUILD freeciv-2.5.11.ebuild 4479 BLAKE2B 32598e62346d6dce4a2619b3dfc0b420570096c22c0d8fd1370b3ed993ad8de94f8f19bccd2f507cbabf486c26a15242842c538e1964d44e05e9e7035bbfa45f SHA512 1c0e9534ae300177ffa95270cc2ab3771f22c10fb824595353a05347db88afbc28c394eb6be69a4a5ea2e1ea963bf6a7600196080d326e7b4e9aabbbe9c46f24
-EBUILD freeciv-2.6.0_beta2.ebuild 4645 BLAKE2B 98fcba2d7b6b879e0446c56bf380b863b9862456568b6d674260a89077bec082af9c7d792938f3550ff05ea7ff5adb4a35f74e4664a8798f2b0812e320e377c7 SHA512 1d2994b0c2b5f3eb6112ffd9ff4f51a3e8d21a7ce99f119b9e00ec1b4b86960e767860d1ec8322f3f85505ce4d55dec0451a5c71d1fd9bd673ba9acec556d75d
+DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5
+EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B a33e3fe51cca9af22fe31c9ad35e925cbcd0bd821a16c5ae1341e8f527ff36d4d4e88841a02b65fcc22fac6fbd5b54518d72e414a48dd10a792dcaad603ec0c8 SHA512 545b7db63bf0409c092d45ef7f5478db11209c94096ff18d48aaecc66ea855653ce17c0dd8eee692dc141bd1250d2ed8cb4e27f22dbf0dffa4845690a9216f4e
+EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B 98fcba2d7b6b879e0446c56bf380b863b9862456568b6d674260a89077bec082af9c7d792938f3550ff05ea7ff5adb4a35f74e4664a8798f2b0812e320e377c7 SHA512 1d2994b0c2b5f3eb6112ffd9ff4f51a3e8d21a7ce99f119b9e00ec1b4b86960e767860d1ec8322f3f85505ce4d55dec0451a5c71d1fd9bd673ba9acec556d75d
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..b41411c8a164
--- /dev/null
+++ b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
@@ -0,0 +1,229 @@
+From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 16 May 2018 20:41:22 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script no longer gets installed
+by default.
+---
+ m4/freetype2.m4  | 194 -----------------------------------------------
+ m4/sdl-client.m4 |   2 +-
+ 2 files changed, 1 insertion(+), 195 deletions(-)
+ delete mode 100644 m4/freetype2.m4
+
+diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
+deleted file mode 100644
+index 3d0ecb3554..0000000000
+--- a/m4/freetype2.m4
++++ /dev/null
+@@ -1,194 +0,0 @@
+-# Configure paths for FreeType2
+-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+-#
+-# Copyright 2001, 2003, 2007, 2009 by
+-# David Turner, Robert Wilhelm, and Werner Lemberg.
+-#
+-# This file is part of the FreeType project, and may only be used, modified,
+-# and distributed under the terms of the FreeType project license,
+-# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+-# indicate that you have read the license and understand and accept it
+-# fully.
+-#
+-# As a special exception to the FreeType project license, this file may be
+-# distributed as part of a program that contains a configuration script
+-# generated by Autoconf, under the same distribution terms as the rest of
+-# that program.
+-#
+-# serial 3
+-
+-# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
+-# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+-# FreeType 2.0.4).
+-#
+-AC_DEFUN([AC_CHECK_FT2],
+-  [# Get the cflags and libraries from the freetype-config script
+-   #
+-   AC_ARG_WITH([ft-prefix],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--with-ft-prefix=PREFIX],
+-                    [Prefix where FreeType is installed (optional)]),
+-     [ft_config_prefix="$withval"],
+-     [ft_config_prefix=""])
+-
+-   AC_ARG_WITH([ft-exec-prefix],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+-                    [Exec prefix where FreeType is installed (optional)]),
+-     [ft_config_exec_prefix="$withval"],
+-     [ft_config_exec_prefix=""])
+-
+-   AC_ARG_ENABLE([freetypetest],
+-     dnl don't quote AS_HELP_STRING!
+-     AS_HELP_STRING([--disable-freetypetest],
+-                    [Do not try to compile and run a test FreeType program]),
+-     [],
+-     [enable_fttest=yes])
+-
+-   if test x$ft_config_exec_prefix != x ; then
+-     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+-     if test x${FT2_CONFIG+set} != xset ; then
+-       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+-     fi
+-   fi
+-
+-   if test x$ft_config_prefix != x ; then
+-     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+-     if test x${FT2_CONFIG+set} != xset ; then
+-       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+-     fi
+-   fi
+-
+-   if test "x$FT2_CONFIG" = x ; then
+-     AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
+-   fi
+-
+-   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
+-   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
+-   no_ft=""
+-   if test "$FT2_CONFIG" = "no" ; then
+-     no_ft=yes
+-   else
+-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+-     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/'`
+-     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     ft_min_major_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-     ft_min_minor_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-     ft_min_micro_version=`echo $min_ft_version | \
+-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     if test x$enable_fttest = xyes ; then
+-       ft_config_is_lt=""
+-       if test $ft_config_major_version -lt $ft_min_major_version ; then
+-         ft_config_is_lt=yes
+-       else
+-         if test $ft_config_major_version -eq $ft_min_major_version ; then
+-           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+-             ft_config_is_lt=yes
+-           else
+-             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+-               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+-                 ft_config_is_lt=yes
+-               fi
+-             fi
+-           fi
+-         fi
+-       fi
+-       if test x$ft_config_is_lt = xyes ; then
+-         no_ft=yes
+-       else
+-         ac_save_CFLAGS="$CFLAGS"
+-         ac_save_LIBS="$LIBS"
+-         CFLAGS="$CFLAGS $FT2_CFLAGS"
+-         LIBS="$FT2_LIBS $LIBS"
+-
+-         #
+-         # Sanity checks for the results of freetype-config to some extent.
+-         #
+-         AC_RUN_IFELSE([
+-             AC_LANG_SOURCE([[
+-
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-int
+-main()
+-{
+-  FT_Library library;
+-  FT_Error  error;
+-
+-  error = FT_Init_FreeType(&library);
+-
+-  if (error)
+-    return 1;
+-  else
+-  {
+-    FT_Done_FreeType(library);
+-    return 0;
+-  }
+-}
+-
+-             ]])
+-           ],
+-           [],
+-           [no_ft=yes],
+-           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
+-
+-         CFLAGS="$ac_save_CFLAGS"
+-         LIBS="$ac_save_LIBS"
+-       fi             # test $ft_config_version -lt $ft_min_version
+-     fi               # test x$enable_fttest = xyes
+-   fi                 # test "$FT2_CONFIG" = "no"
+-
+-   if test x$no_ft = x ; then
+-     AC_MSG_RESULT([yes])
+-     m4_if([$2], [], [:], [$2])
+-   else
+-     AC_MSG_RESULT([no])
+-     if test "$FT2_CONFIG" = "no" ; then
+-       AC_MSG_WARN([
+-
+-  The freetype-config script installed by FreeType 2 could not be found.
+-  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+-  your path, or set the FT2_CONFIG environment variable to the
+-  full path to freetype-config.
+-       ])
+-     else
+-       if test x$ft_config_is_lt = xyes ; then
+-         AC_MSG_WARN([
+-
+-  Your installed version of the FreeType 2 library is too old.
+-  If you have different versions of FreeType 2, make sure that
+-  correct values for --with-ft-prefix or --with-ft-exec-prefix
+-  are used, or set the FT2_CONFIG environment variable to the
+-  full path to freetype-config.
+-         ])
+-       else
+-         AC_MSG_WARN([
+-
+-  The FreeType test program failed to run.  If your system uses
+-  shared libraries and they are installed outside the normal
+-  system library path, make sure the variable LD_LIBRARY_PATH
+-  (or whatever is appropriate for your system) is correctly set.
+-         ])
+-       fi
+-     fi
+-
+-     FT2_CFLAGS=""
+-     FT2_LIBS=""
+-     m4_if([$3], [], [:], [$3])
+-   fi
+-
+-   AC_SUBST([FT2_CFLAGS])
+-   AC_SUBST([FT2_LIBS])])
+-
+-# end of freetype2.m4
+diff --git a/m4/sdl-client.m4 b/m4/sdl-client.m4
+index 095cd0b287..015d948d95 100644
+--- a/m4/sdl-client.m4
++++ b/m4/sdl-client.m4
+@@ -30,7 +30,7 @@ AC_DEFUN([FC_SDL_CLIENT],
+         missing_project="SDL_gfx"
+       fi
+       if test "x$sdl_h_found" = "xyes" ; then
+-        AC_CHECK_FT2([2.1.3], [freetype_found="yes"], [freetype_found="no"])
++        PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [freetype_found="yes"], [freetype_found="no"])
+         if test "$freetype_found" = yes; then
+ 	  gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS"
+ 	  gui_sdl_libs="$gui_sdl_libs $FT2_LIBS"
+-- 
+2.17.0
+
diff --git a/games-strategy/freeciv/freeciv-2.5.10.ebuild b/games-strategy/freeciv/freeciv-2.5.10.ebuild
deleted file mode 100644
index b235bb640ff1..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-	)
-	readline? ( sys-libs/readline:0= )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-proto/xextproto
-		nls? ( sys-devel/gettext )
-	)"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient mydatabase myeconfargs
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase+=" mysql"
-			use sqlite && mydatabase+=" sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myeconfargs+=( --enable-server )
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=( $(use_enable server) --without-ggz-client )
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient}"
-		--enable-fcdb="${mydatabase}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		$(use_enable ipv6)
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${ED}" -name "freeciv-manual*" -delete
-
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild b/games-strategy/freeciv/freeciv-2.5.11.ebuild
index b235bb640ff1..d2e9a55ac115 100644
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils flag-o-matic gnome2-utils
+inherit autotools eutils flag-o-matic gnome2-utils
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
@@ -57,6 +57,10 @@ DEPEND="${RDEPEND}
 		nls? ( sys-devel/gettext )
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
+)
+
 pkg_setup() {
 	if use !dedicated && use !server ; then
 		ewarn "Disabling server USE flag will make it impossible"
@@ -68,6 +72,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	eautoreconf
+
 	# install the .desktop in /usr/share/applications
 	# install the icons in /usr/share/pixmaps
 	sed -i \
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
index 85687658671c..85687658671c 100644
--- a/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 420c819d5a66..87e041ab6bf4 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -2,5 +2,5 @@ DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336e
 DIST 7kaa-source-2.14.4.tar.bz2 27366752 BLAKE2B d80c5dcf0982cc2dddf29559c4f096392d88b916701e1fa21d2885aba254c8214920dd1be45a7ea6931e8f025647946d19b4158a22b824aa18e75c18ace8fe99 SHA512 7ee39aba89993d9f0041ab991e053069e0c3ab4298f74c0ec95e3f30f49a71731ef37d8870b1ab9afd97b1c4618a879492976006b8a513bfc4bc44dfac591bf0
 DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
 EBUILD seven-kingdoms-2.14.4.ebuild 1415 BLAKE2B 737f051f651e20eb55317ba3201d57fbd1f4a38f798e5da4274ed3f291930050a3bbb6b21b9f4a492190bb2f7e5493b4d667ae51fd53d4d2b644a81475153ead SHA512 c5d8ed264a9e8e200fae0160f55f560e38e9b9f4118b1fb14a09dfa5c618f60b450568bf5d507c41542a6b4d9ad9123f14f961df19b0b300de573a19ef9caea0
-EBUILD seven-kingdoms-2.14.7.ebuild 785 BLAKE2B cba686f10fdb80b3a21c5485baf0bf60d0bdaa19ab546364fe1186d1365b692fd8b987d4fe7535f17038141f1038c2edc2d64850c5622fc9949a5ba6080e0bfb SHA512 ab225fa354d71af874605773b4a1eb0cccbbcf0f03169342eb202c7fb6ddaa51ffe29fa4618a888a60eaa75a8be4e33d46f32f880edc769d0ada40f4c3cdf073
+EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
 MISC metadata.xml 433 BLAKE2B a88d674bc0b6dc9e2c905743f5c3c1dd02bb8e5d885108da63d68895540a1df0c224ed9365f7ada6550e1c33643f1918d84904ee6bbe338dc7574e61cd179267 SHA512 5f83ff52f28bcd4ea5e54556ab408ef1a635ce20cec2b56a1424697309d97f4a6402f6c8d5c5b194017487c00ec2eeeb215a3e1e538914afb9a3ae94e390140b
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
index 012fe8f1bc68..33a7974f04b1 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="net-libs/enet:1.3=
 	media-libs/libsdl2[X,video]