gentoo resync : 02.06.2019

8 files changed, 94 insertions, 3 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 3d4237faba57..7a9a3e669db4 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index d68638c818ed..eb74cc6ac440 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -2,6 +2,6 @@ AUX physfs-2.0.3-zip_seek.diff 535 BLAKE2B cfb10e446d6370c0365071d38c2d9ebedf238
 DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
 EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec40f5c9cce97b089c4edbdd6a82cd220e75726b63c6c1d473f1203812e14ca587cf04131a6cbb61d963159d665b8 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de
-EBUILD physfs-3.0.2.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
+EBUILD physfs-3.0.2.ebuild 1399 BLAKE2B 179e615df2bc1b22d1f6843cbf1be6d4d8fad5c517840b4e5773fa48b690b6b8fbc9d9262908c3c97ff5045edba89cf449b477b8b7f0d1859c3e635201a9389c SHA512 2e7f2aa60917c72006fe1858814a5555f0c1f035aa9d8fc49c1521ae4d9c52b9224d2c6bc722196ae2d19963ea6dde62c8a6947bd1e1b5f8a08c078407aa8f50
 EBUILD physfs-9999.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
 MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/physfs-3.0.2.ebuild b/dev-games/physfs/physfs-3.0.2.ebuild
index 91229a1b6d98..8bb871f8cd89 100644
--- a/dev-games/physfs/physfs-3.0.2.ebuild
+++ b/dev-games/physfs/physfs-3.0.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
 	inherit mercurial
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc64 x86 ~x86-fbsd"
 	SRC_URI="https://icculus.org/physfs/downloads/${P}.tar.bz2"
 fi
 
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index cdf8ce2f1975..d3731a594f52 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,6 +1,7 @@
+AUX simgear-2018.3.2-boost-1.69.patch 669 BLAKE2B 76d25e88ebc6b47ea60ad59771d95b1f676a781424bacd9ce3e56ff41810fea000437bdd9dea6bad176cada9a70d1f0c6105f9394461cd29c3fa603b87334661 SHA512 92387eec8cadacfbb6d3ed3e827abdba49a6f9699dad665eac17ec3099423bb38e3ae28894ffe92670f9e823020ee88279f8f96f71acfcfff03f9502f76d8636
 DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
 DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b SHA512 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
 EBUILD simgear-2018.3.1.ebuild 1287 BLAKE2B 24ab62ed87377e3768837df1142b60a7b4643aad77997f2b58499ceb9451258aa4e040b603deb14fd3281e27286c0567663a958cf558c576481364f405a094af SHA512 3fe5d0ee5312bddc9d943ba565222834611fbb64446ee3f2455e03f389876586e2f118d4077a3c859320018db2a4879fc7ec48a36b225c5ac82ea377eac8936d
-EBUILD simgear-2018.3.2.ebuild 1473 BLAKE2B bfc47edecae046092dd64493fa574961c274cfed77b2ffe23821ff741407593b83e49398a4b8b85a0de069e90e31478eaa281ad4de6ad0b45d9efc79565d42d9 SHA512 bec365a0b3dd69204a5d66ce74254d4a9b1869f5f4c5712dccfb2312a74ce034ae52455bc0f1096b36cc78146e6b022b5bc403a6db49a7d75a9c7b2c33ca934b
+EBUILD simgear-2018.3.2.ebuild 1522 BLAKE2B da14df468a2b45f76db471237ea0e2cf4d3ec717f97b9bd4acf875d8f2857c6be01ebc71301ca4c589a80c0d16e21aa42dd2b59667856206ebeb5c00c43cfcc5 SHA512 b8f4ebcef5fa3f63837d77c1d318e93805c959a30e4305849eedf9ded103325520e16d3be1b5c7a0f229d679b5becbb733000198e137fc951c4c8ce4f7d38bf3
 EBUILD simgear-9999.ebuild 1535 BLAKE2B cabc0460fe4527432239370e2e9e9c4585071a9efb2771a8d5100fda599e07d7a2b3351932eea6d82ee54dc4e43b6fbe233adbbeebe12c39f643920b3c498b7f SHA512 2b0998e84aca57859e563e823161ef1dcc7e1079f0363d7a9a18517439ae98160dfdf754d22365cfacb65df5803d83ffa1a0da73eee37c255be550d449d7d225
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
new file mode 100644
index 000000000000..2372c8c58adf
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
@@ -0,0 +1,24 @@
+From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Fri, 1 Feb 2019 09:29:40 +0100
+Subject: [PATCH] fix for boost 1.69
+
+---
+ simgear/nasal/cppbind/NasalHash.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
+index aac672fd..2ee7d044 100644
+--- a/simgear/nasal/cppbind/NasalHash.hxx
++++ b/simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+ 
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+ 
+ namespace nasal
+-- 
+2.20.1
+
diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
index a65b51665aac..ead30a3c496f 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 7e144784f587..93e7dc95eb7f 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,3 +1,5 @@
 DIST tiled-1.2.3.tar.gz 16848125 BLAKE2B cc2ab2a2ab14a575da1f47a415e1c544de9a80417ea5a081684893bad253fc742f89f5e17739bfe0617f859f6921ab214c2e8bdefe321545008b277684e654b1 SHA512 0c9e818872b1e8de67ff8d943dc47abb63667bc45917b29dca959b0a32594be4ffb156469375c0f5c4a4fa71ee85b05c018c58a2f581a860405cbb12c9c0aac5
+DIST tiled-1.2.4.tar.gz 16875074 BLAKE2B 19d9e000949a889af90f48c31862aab8d00cbd968d518bc48e58775763ff2b293d5e82f10b8ec45dda936bf81b177f88aa4962900c7b70b01ce514fabf717c46 SHA512 a16fcb3fcceb11397cc981f10a558215264cf2c340639fbc001d384cfd9bc138c05ed40894a03d103af8a7d629c0be9fa6d5a4058fd9c563806920efef8e2cb7
 EBUILD tiled-1.2.3.ebuild 1281 BLAKE2B 317a129e11a98236de269a835fbbb19f07f89910a434bc9563b31bd4709bb3904389b1e734b7f1c636adbdabcd05f15902c68b9ce28277f3b1546e21b9be2608 SHA512 468eae31ce23e157dda0434e17c1b3a06b1a3351c9d552f99605b78c5a9ac39e412b6f36a3850fd2f1de5081c1e3be266601c65162f10c09cd76c4f076be4ced
+EBUILD tiled-1.2.4.ebuild 1282 BLAKE2B bf8237182f14bb63c4108d9b17d28ffa1976b25984839df9989d788f11475a5fe18b446833693ace31f41107617323e575f932b6563e28ad1a83bdf9e189529b SHA512 a609f4f85a6bc015e16d79abae91d5731ba4c8fb8b3ac572bce7fceb6fff3910f4c34ad2329ed42cc74b5be4692bee63049ede4b0fbe0681aeccd1e90f63a10a
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.2.4.ebuild b/dev-games/tiled/tiled-1.2.4.ebuild
new file mode 100644
index 000000000000..56763ea7c4f4
--- /dev/null
+++ b/dev-games/tiled/tiled-1.2.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}