gentoo resync : 22.05.2021

4 files changed, 24 insertions, 72 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 480b908b78f3..5d941744cca2 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 359041771241..2c43df92e460 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,4 +1,3 @@
-AUX freeciv-2.6.2-qt515.patch 1069 BLAKE2B 36d66375826386961ef393385f987b146d812c2e9ee31db7545cc7eb79d48ad4ebabc26bcbc606db31c763b5583c359e0b26da1968ba1aa26ead03310d4699ba SHA512 6a35304cb1ef35ebce91cf80f46c1f602e782dba9da4c7a65bcc88ab0dcf1e4e9b59b0df7a90fc562b9448d0b073a25998cb4d4896b3c6853d052d162da95122
-DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
-EBUILD freeciv-2.6.2.ebuild 4857 BLAKE2B f441ef92692f71d6a67ffcca49405f19f517c42b57b40ac6bd338c7c57ee09ef0b58363559085d6eca72934802bb7b28db496cc00507fad6c132b009d2235ca2 SHA512 3e7dd216d356063662e16916d66bf2580bfcd2d860293e759f5c6160b1c900c6134ac2c621b1bb853cfc52154ededda67b7bd8cccf7ec3c2c880f65c4832dc67
+DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
+EBUILD freeciv-2.6.4.ebuild 4743 BLAKE2B 617ad28e21a810514396044c77668f18f6dc2443001ffc7e62392399e3c573fc15d869daf7e18fcaa4198f261f9decf0facd4455b857a231e680cd56a9f3006a SHA512 a1961db7bc8027c1484963504c0d7a3adf9c2d3ed1e30c582379df1c55aa9074adfd9b580802f3ce35f56df953d4cd3565cd9eb52aa2cebdd7af42ec059e6717
 MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
deleted file mode 100644
index db5e657a5850..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
-From: Marko Lindqvist <cazfi74@gmail.com>
-Date: Tue, 7 Apr 2020 13:22:14 +0300
-Subject: [PATCH] Include <QPainterPath> where needed
-
-This fixes Qt-client build on OpenEmbedded
-
-See hrm Bug #868060
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
----
- client/gui-qt/canvas.cpp  | 1 +
- client/gui-qt/dialogs.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
-index 24291bc183..00fa1b8f52 100644
---- a/client/gui-qt/canvas.cpp
-+++ b/client/gui-qt/canvas.cpp
-@@ -18,6 +18,7 @@
- // Qt
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
- 
- // qt-client
- #include "canvas.h"
-diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
-index e0f9de31d4..4b3254c496 100644
---- a/client/gui-qt/dialogs.cpp
-+++ b/client/gui-qt/dialogs.cpp
-@@ -24,6 +24,7 @@
- #include <QMessageBox>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QRect>
- #include <QSignalMapper>
diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild b/games-strategy/freeciv/freeciv-2.6.4.ebuild
index e361752c4a59..93312c18dcb0 100644
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild
+++ b/games-strategy/freeciv/freeciv-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ MY_PV="${MY_PV/_rc/-RC}"
 MY_P="${PN}-${MY_PV}"
 inherit desktop flag-o-matic qmake-utils xdg
 
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
 
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
@@ -20,15 +20,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
-# postgres isn't yet really supported by upstream
-BDEPEND="
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)
-"
-DEPEND="
+RDEPEND="
 	app-arch/bzip2
 	app-arch/xz-utils
 	net-misc/curl
@@ -41,16 +33,16 @@ DEPEND="
 	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
 	!dedicated? (
 		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
+		gtk? ( x11-libs/gtk+:3 )
 		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
+		modpack? ( x11-libs/gtk+:3 )
 		nls? ( virtual/libintl )
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
 			dev-qt/qtwidgets:5
 		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+		!sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
 		sdl? (
 			media-libs/libsdl2[video]
 			media-libs/sdl2-gfx
@@ -66,19 +58,21 @@ DEPEND="
 	readline? ( sys-libs/readline:0= )
 	system-lua? ( >=dev-lang/lua-5.3:= )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	!dedicated? ( x11-base/xorg-proto )
+"
+# postgres isn't yet really supported by upstream
+BDEPEND="
+	virtual/pkgconfig
+	!dedicated? ( nls? ( sys-devel/gettext ) )
+"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-qt515.patch" #728254
-)
-
 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."
+		ewarn "Disabling server USE flag will make it impossible to start local"
+		ewarn "games, but you will still be able to join multiplayer games."
 	fi
 }
 
@@ -95,7 +89,6 @@ src_prepare() {
 		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() {
@@ -122,12 +115,11 @@ src_configure() {
 		)
 	else
 		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient=( gtk2 )
+			einfo "No client backend given, defaulting to gtk3 client!"
+			myclient=( gtk3 )
 		else
 			use sdl && myclient+=( sdl2 )
-			use gtk && myclient+=( gtk2 )
+			use gtk && myclient+=( gtk3 )
 			if use qt5 ; then
 				local -x MOCCMD=$(qt5_get_bindir)/moc
 				myclient+=( qt )
@@ -144,7 +136,7 @@ src_configure() {
 		--enable-aimodules="$(usex aimodules "yes" "no")"
 		--enable-client="${myclient[*]}"
 		--enable-fcdb="${mydatabase[*]}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
+		--enable-fcmp="$(usex modpack "gtk3" "no")"
 		# disabling shared libs will break aimodules USE flag
 		--enable-shared
 		--localedir=/usr/share/locale
@@ -179,9 +171,9 @@ src_install() {
 		if use sdl ; then
 			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
 		else
-			rm -f "${ED}"/usr/share/man/man6/freeciv-sdl*
+			rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* || die
 		fi
-		rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
+		rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* || die
 	fi
 	find "${ED}" -name "freeciv-manual*" -delete || die