gentoo resync : 17.07.2021

6 files changed, 209 insertions, 0 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index cc1931ec9918..9e5733f38d66 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index d08691c3c3a3..fc6c4d8f56e8 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,4 +1,6 @@
+AUX GNUInstallDirs.patch 2430 BLAKE2B 8eeebb7bd59273ef5a35e49a98a30bb0fde320231c9482532086fd653f97636c042edf98ad58473ae1ff28c1c10a392e4ded5d0818c27ba00b2b0ec3825d00c8 SHA512 cacae41b22e06836b44f0ceba91961945d4d5cbd60318eeb89b39023dfa00d201c5cd61c5f451c33996698a4757070614486ea859bb943a31a0453b8d598b8d6
 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
+EBUILD physfs-3.0.2-r1.ebuild 1441 BLAKE2B 161353552955205041e25e28bb5927a27948f98285cba2813970f8be80ebd7d05e6a35a2718a0ea0cbac5af367328b5571ec1a5e979cf05b953a3c7e556233a8 SHA512 df9d3b5001f06515f842f99e74d604eb537c487aed2259bc1163f019d12c65bc43b5e1e717d238b10080e6146e90cb496ab4a21f3fc3ece991e87961c30bd7eb
 EBUILD physfs-3.0.2.ebuild 1389 BLAKE2B 29f19cd6330005b06d0f67bcda1bb8a3cd48dc7a414c232058f84968dc16c3e892b69bfb0ec366b22a078eadf58a252157d066f2a12d5b9500fc9010031777d4 SHA512 643cb5b1ee09c473d93eb4a86753217009d2ac8f90d51f2e16e80a5e27e76caa10447f372df29013d5f4a77bf3cdb5e2474ec00b655b1dd6229255f36ca8ee39
 EBUILD physfs-9999.ebuild 1392 BLAKE2B f3dc7a744b9c13ca021c368b7bc6dab0672d1beec8c6f7103e1e0d06ed94e445772ccf0eed0b87973cc099ee66d5e4e62e02ab7e727331f6154c584c370ddd09 SHA512 94eb68cc10fac176728c8084df9dbce5553b0250b565ea6249bd84e96bc8cd432f08e04c586b9de8e30e1d773bf5c921b34dd5dc1f8f983354471583684537ea
 MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/files/GNUInstallDirs.patch b/dev-games/physfs/files/GNUInstallDirs.patch
new file mode 100644
index 000000000000..ef7bb5d1f147
--- /dev/null
+++ b/dev-games/physfs/files/GNUInstallDirs.patch
@@ -0,0 +1,74 @@
+From 727d7a5265ad856fd473ad1c621d6c03dd306d6d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 10 Jul 2021 22:55:53 +0100
+Subject: [PATCH] Use the GNUInstallDirs CMake module to respect installation
+ locations
+
+Apparently use of LIB_SUFFIX is now discouraged. GNUInstallDirs does a
+better job of setting a default.
+
+The libdir of ${prefix}/lib in the pkg-config file caused warnings,
+and possibly even failures, when linking on multilib systems where
+/usr/lib is for 32-bit libraries rather than 64-bit libraries.
+---
+ CMakeLists.txt      | 15 ++++++++-------
+ extras/physfs.pc.in |  6 +++---
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4a67c27..6c26cb1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,8 @@ cmake_minimum_required(VERSION 2.8.4)
+ project(PhysicsFS)
+ set(PHYSFS_VERSION 3.0.2)
+ 
++include(GNUInstallDirs)
++
+ # Increment this if/when we break backwards compatibility.
+ set(PHYSFS_SOVERSION 1)
+ 
+@@ -213,11 +215,11 @@ if(PHYSFS_BUILD_TEST)
+     set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs")
+ endif()
+ 
+-install(TARGETS ${PHYSFS_INSTALL_TARGETS}
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib${LIB_SUFFIX}
+-        ARCHIVE DESTINATION lib${LIB_SUFFIX})
+-install(FILES src/physfs.h DESTINATION include)
++install(TARGETS ${PHYSFS_INSTALL_TARGETS} EXPORT PhysFSExport
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES src/physfs.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+@@ -271,7 +273,7 @@ if(NOT MSVC)
+     )
+     install(
+         FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc"
+-        DESTINATION "lib${LIB_SUFFIX}/pkgconfig"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+     )
+ endif()
+ 
+diff --git a/extras/physfs.pc.in b/extras/physfs.pc.in
+index 6cd0972..f7e0307 100644
+--- a/extras/physfs.pc.in
++++ b/extras/physfs.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ 
+ Name: PhysicsFS
+ Description: PhysicsFS is a library to provide abstract access to various archives.
+-- 
+2.31.1
+
diff --git a/dev-games/physfs/physfs-3.0.2-r1.ebuild b/dev-games/physfs/physfs-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..0d225b66a069
--- /dev/null
+++ b/dev-games/physfs/physfs-3.0.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Abstraction layer for filesystem and archive access"
+HOMEPAGE="https://icculus.org/physfs/"
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="https://hg.icculus.org/icculus/physfs"
+	inherit mercurial
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	SRC_URI="https://icculus.org/physfs/downloads/${P}.tar.bz2"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/GNUInstallDirs.patch
+)
+
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DPHYSFS_BUILD_SHARED=ON
+		-DPHYSFS_BUILD_TEST=OFF
+		-DPHYSFS_BUILD_STATIC="$(usex static-libs)"
+		-DPHYSFS_ARCHIVE_7Z="$(usex 7zip)"
+		-DPHYSFS_ARCHIVE_GRP="$(usex grp)"
+		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
+		-DPHYSFS_ARCHIVE_ISO9660="$(usex iso)"
+		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
+		-DPHYSFS_ARCHIVE_SLB="$(usex slb)"
+		-DPHYSFS_ARCHIVE_VDF="$(usex vdf)"
+		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
+		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
+		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 418c59e210c9..4de20e16ace4 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,6 +1,8 @@
 AUX tiled-1.4.3-python-38.patch 479 BLAKE2B ec7a36fbaddb9cd5b954285e25cd02e1c169e9fce4bb51dcdde528c60849086d4a0cf1bd706b909f2fd87be8174faf0f3488317fb05ed4c801dfffdda9af94f2 SHA512 6694d4bd8d79f5575e1b95fc5aa5b832e2193ff9475ea4e624db12f8305eac5b1a20cac4549ae1924e803ee6f5e9ab7835496c02a66c1e7f834671ada8549ebd
 DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
 DIST tiled-1.5.0.tar.gz 16694406 BLAKE2B ccab3ec9f5ac807126ddf5d26e4eaa06357e67ffbd63550bdad93e814ff02350f9138f62114a56b5e64bc6c7fd3f6664ab7da836cab7e478ea7075111fa1cae7 SHA512 eb25affdab481db29ab2bbaeb4abafd453b2b43ae47e4b8f9f2fd1ed0d8ed55fdb45ec1bdc0b484ba9a2d63afad5a0c9ba6376304ed4b1eab3918c36a0af29c9
+DIST tiled-1.7.1.tar.gz 16741752 BLAKE2B 2f9d2d43aa3aa52a2999a6e9e56bfe3846e095ac41236921e9ab42df40b93d0c3373d2f5f13a5f7c9a945ea0c03c4fe6b123ea6a8b3bc71ddc9863c714fccc17 SHA512 ed6ba20015434d9de6ae02aecb165a7fb7569a3d74471a7baec5d0f1b78b7905dd12cd565e1f9d1e41ff47e225cdfb81915ae09e3672efc21f16cefb39e03998
 EBUILD tiled-1.4.3-r1.ebuild 1449 BLAKE2B 017f74d6e359199357991d1c6077a9665dd3bdfcabce2a5a4c68a240aee3010059cd367ae64cfaa6c56f698182292a3725a1b6bb2a363af2e3ddf38b42dbe6ca SHA512 4c23db0081e14bae7e0b0bb6be5c949e46a4ecba6ea7a7f53f4920867ca9538b4201e31f342eae76e85182ca4da0fda2d88ef9a43ca9ef2cc92b39c3ef24b4f7
 EBUILD tiled-1.5.0.ebuild 1403 BLAKE2B f4f514d3f4f1f0a449d3074d214bfafb1e034a4a9343b2a834ddcdb7a8bc126a66d26947a367a9850eae36377f23d3528e3b1bbe7b4542e35e6c0bff89c7f858 SHA512 3763cd55f12be9f94e1342630d1c4dffdac36b5c8f3eef4db7f82782479c3f6edbdbbd97c7d16a3fe7fda312e64fc2ee2f95360e589189664033b4404dfbdcd6
+EBUILD tiled-1.7.1.ebuild 1429 BLAKE2B 0f1522f7dad4a0e8b17934da3588928083bd5775541b2da7343181c5021b0583df0d114371f8285b9a6a503993728b9b150e8c27ecbd889c215bac035e76a5aa SHA512 e8e2e1877ae5128be87aeb89f61b92b86e0ed0d98bf1658ad15d323598a90fed3053dbf4616ea690a36ece0689b34fdb197eca46eebd554ceb2597c26281e711
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.7.1.ebuild b/dev-games/tiled/tiled-1.7.1.ebuild
new file mode 100644
index 000000000000..e5119614dc18
--- /dev/null
+++ b/dev-games/tiled/tiled-1.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit 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="
+	app-arch/zstd:=
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtdbus-5.15:5
+	>=dev-qt/qtdeclarative-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=dev-qt/qtnetwork-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+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" \
+		SYSTEM_ZSTD="yes" \
+		DISABLE_PYTHON_PLUGIN="$(usex !python)" \
+		USE_FHS_PLUGIN_PATH="true"
+}
+
+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
+}