gentoo resync : 18.05.2019

7 files changed, 43 insertions, 150 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 619f0a75b71e..3d4237faba57 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index fda9413b6ef0..d68638c818ed 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,10 +1,7 @@
 AUX physfs-2.0.3-zip_seek.diff 535 BLAKE2B cfb10e446d6370c0365071d38c2d9ebedf2387959568ac5a80ea10a449f90763ae290be09631fb71bf46afefa2d245a286eb6ba255a7f0e69a4534ea8fccbecc SHA512 016f5cafecdfc7f4d2d9dcb517f0ebe7b7765912361399e2c7e239c936c287ca15c0124fd9378c23d6d0d3669c45c4d4dc498098eb052901d349459c94a29ef2
-AUX physfs-3.0.1-setwritedir.patch 1430 BLAKE2B 6dc988b221f084be60555364119688d1142ca6244358d1d3ed2b105900d43ddf037657edc67385c47bfc2b03591239b563437fcc4a86374c0695249ff78d5210 SHA512 550b604ce34ace3ae04668760941e4972e23ca9098a6b7c4c8da60c03866fc24a861e828118fa03c4a66b771afdd6d3ba729a0993fbcec14f74de3f97a4ab24e
 DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
-DIST physfs-3.0.1.tar.bz2 194638 BLAKE2B a95e599ad5c8c5aafcd9b6569c8b7762bdd0fcdbf9502f8fda61f5068b25c8cf651ce6127a1f139b20baa93bd9ab001d2527aedc0180c3b60246410ab0d35acb SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879
 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.1-r2.ebuild 1522 BLAKE2B f889a3228a5a2e2e09bd09a978d207f41124473f94a1fcf9d57808b6c87aeb6d6c22771bdc7ce4ee1edb4819611f239a3cd2d196a3c19eb53c5b09cf8bf28b89 SHA512 e34bc7afb826fbc3ca79d0549eb6f8a750f05431ba425941ff247ee312861f89444c82970c8fa244f1a80732036f3a1d704d441caed9e0b85a1c10e12a9af460
-EBUILD physfs-3.0.2.ebuild 1472 BLAKE2B fe172cc56145cc865f6b306d4affc325428b6feaa70ab205e3fbb348aeb1a7964b348e5743299437777d8a1855f6b4b33ee78a5b33872a01328f727d20710d1d SHA512 951755e06e99f6f1dd0bb0fbbd693b847d3028b6e5e12fd4c43ff438db65553f1de063bbc5cbde0458c211f9db3179cd9970f0c286a8cc17df08900666276c5d
-EBUILD physfs-9999.ebuild 1472 BLAKE2B fe172cc56145cc865f6b306d4affc325428b6feaa70ab205e3fbb348aeb1a7964b348e5743299437777d8a1855f6b4b33ee78a5b33872a01328f727d20710d1d SHA512 951755e06e99f6f1dd0bb0fbbd693b847d3028b6e5e12fd4c43ff438db65553f1de063bbc5cbde0458c211f9db3179cd9970f0c286a8cc17df08900666276c5d
-MISC metadata.xml 2002 BLAKE2B 4b4c48bdbb19836f3a2e5b09c737c1c0390dba6d2cdccb126a0f8caa6e593e0861b9ddf1d3d70b1da00385b323b86c2842482ccfa10de421a6ea57251fab703b SHA512 4a06786fe7cd30dc87225656ae0b09322f23f19fdd3919695629f76c54d7abb6ee970b8a67c59ef5895e460c5e65074ec7ffb06680f1572898aa15f2fb78fbdc
+EBUILD physfs-3.0.2.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
+EBUILD physfs-9999.ebuild 1401 BLAKE2B 2f0d1e876a515e6d09ce9441dbf0c67d62ea0cb7a773f2a9c668d6c2e88226b9d69991df44f2f8827fec4466c7a193370767d17b4d019414d578ce48380d0b5a SHA512 6f4f3619d3705b5d355d288e2673e066ec9ceec32c9a549495c87fb317f85646b049d05aaf8fba4ad81be99b2d387e5ee891dd43c32ce86b4062e25d6a3dd920
+MISC metadata.xml 2046 BLAKE2B 0bc4d4b847a4749f128b4a01d9a956182cd6b3b8bbb7c523ec62e4d9ab727e583e5265ea49fc835c32c3a43b4561d204b4fd07b93d2f09d5b6c19dc092734554 SHA512 93ef7139120382d372585bf5b9584c13ab9f8d40c4d99ad51fbf413490ca8451c12fae5be99e1740bf589401e49f2bddc9e804072f3b1bba9b3bee2fa91f5b80
diff --git a/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch b/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch
deleted file mode 100644
index 9673e12a2b23..000000000000
--- a/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Backport
-[https://hg.icculus.org/icculus/physfs/rev/a29fef4a20fd]
-
-# HG changeset patch
-# User Ryan C. Gordon <icculus@icculus.org>
-# Date 1526514891 14400
-# Node ID a29fef4a20fd79ead82998c91dc4828ed5061cb5
-# Parent  db8f944df5c56f0244229813203fb5b24e8d9968
-PHYSFS_setWriteDir() shouldn't create an empty file if the dir doesn't exist.
-(transplanted from 2653b3bc19c9ba7d1e6bf53566719e4e30935382)
-
-diff -r db8f944df5c5 -r a29fef4a20fd src/physfs.c
---- a/src/physfs.c	Thu Apr 19 10:06:38 2018 -0400
-+++ b/src/physfs.c	Wed May 16 19:54:51 2018 -0400
-@@ -879,13 +879,20 @@
- 
-     if (io == NULL)
-     {
-+        /* file doesn't exist, etc? Just fail out. */
-+        PHYSFS_Stat statbuf;
-+        BAIL_IF_ERRPASS(!__PHYSFS_platformStat(d, &statbuf, 1), NULL);
-+
-         /* DIR gets first shot (unlike the rest, it doesn't deal with files). */
--        retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
--        if (retval || claimed)
--            return retval;
-+        if (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY)
-+        {
-+            retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting, &claimed);
-+            if (retval || claimed)
-+                return retval;
-+        } /* if */
- 
-         io = __PHYSFS_createNativeIo(d, forWriting ? 'w' : 'r');
--        BAIL_IF_ERRPASS(!io, 0);
-+        BAIL_IF_ERRPASS(!io, NULL);
-         created_io = 1;
-     } /* if */
- 
-
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index 4c12a220b846..2a68749c367a 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-PhysicsFS is a library to provide abstract access to various archives. It is 
-intended for use in video games, and the design was somewhat inspired by Quake 3's 
-file subsystem. The programmer defines a "write directory" on the physical 
-filesystem. No file writing done through the PhysicsFS API can leave that write 
-directory, for security. For example, an embedded scripting language cannot write 
-outside of this path if it uses PhysFS for all of its I/O, which means that 
-untrusted scripts can run more safely. Symbolic links can be disabled as well, for 
-added safety. For file reading, the programmer lists directories and archives that 
-form a "search path". Once the search path is defined, it becomes a single, 
-transparent hierarchical filesystem. This makes for easy access to ZIP files in the 
-same way as you access a file directly on the disk, and it makes it easy to ship a 
-new archive that will override a previous archive on a per-file basis. Finally, 
-PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are available, 
-the user's home directory, where in the real filesystem your program is running, 
-etc.
-</longdescription>
-<use>
-<flag name="7zip">Enable 7zip/lzma archive support</flag>
-<flag name="grp">Enable Build Engine GRP archive support</flag>
-<flag name="hog">Enable Descent I/II HOG archive support</flag>
-<flag name="iso">Enable ISO9660 file support</flag>
-<flag name="mvl">Enable Descent I/II MVL archive support</flag>
-<flag name="slb">Enable Independence War SLB archive support</flag>
-<flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag>
-<flag name="wad">Enable Doom WAD archive support</flag>
-<flag name="qpak">Enable Quake I/II QPAK archive support</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+		PhysicsFS is a library to provide abstract access to various archives. It is
+		intended for use in video games, and the design was somewhat inspired by Quake 3's
+		file subsystem. The programmer defines a "write directory" on the physical
+		filesystem. No file writing done through the PhysicsFS API can leave that write
+		directory, for security. For example, an embedded scripting language cannot write
+		outside of this path if it uses PhysFS for all of its I/O, which means that
+		untrusted scripts can run more safely. Symbolic links can be disabled as well, for
+		added safety. For file reading, the programmer lists directories and archives that
+		form a "search path". Once the search path is defined, it becomes a single,
+		transparent hierarchical filesystem. This makes for easy access to ZIP files in the
+		same way as you access a file directly on the disk, and it makes it easy to ship a
+		new archive that will override a previous archive on a per-file basis. Finally,
+		PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are available,
+		the user's home directory, where in the real filesystem your program is running,
+		etc.
+	</longdescription>
+	<use>
+		<flag name="7zip">Enable 7zip/lzma archive support</flag>
+		<flag name="grp">Enable Build Engine GRP archive support</flag>
+		<flag name="hog">Enable Descent I/II HOG archive support</flag>
+		<flag name="iso">Enable ISO9660 file support</flag>
+		<flag name="mvl">Enable Descent I/II MVL archive support</flag>
+		<flag name="slb">Enable Independence War SLB archive support</flag>
+		<flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag>
+		<flag name="wad">Enable Doom WAD archive support</flag>
+		<flag name="qpak">Enable Quake I/II QPAK archive support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-games/physfs/physfs-3.0.1-r2.ebuild b/dev-games/physfs/physfs-3.0.1-r2.ebuild
deleted file mode 100644
index fe097f9f54ed..000000000000
--- a/dev-games/physfs/physfs-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~x86-fbsd"
-	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 )"
-
-DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
-
-PATCHES=( "${FILESDIR}/${P}-setwritedir.patch" )
-
-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-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
-	fi
-}
diff --git a/dev-games/physfs/physfs-3.0.2.ebuild b/dev-games/physfs/physfs-3.0.2.ebuild
index 683b49ac714d..91229a1b6d98 100644
--- a/dev-games/physfs/physfs-3.0.2.ebuild
+++ b/dev-games/physfs/physfs-3.0.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake-multilib
 
 DESCRIPTION="Abstraction layer for filesystem and archive access"
@@ -44,13 +45,9 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
 
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_compile docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
 }
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
index 683b49ac714d..91229a1b6d98 100644
--- a/dev-games/physfs/physfs-9999.ebuild
+++ b/dev-games/physfs/physfs-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake-multilib
 
 DESCRIPTION="Abstraction layer for filesystem and archive access"
@@ -44,13 +45,9 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
 
-multilib_src_install_all() {
-	einstalldocs
-	if use doc ; then
-		docinto html
-		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_compile docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
 	fi
 }