gentoo resync : 27.03.2018

7 files changed, 51 insertions, 39 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index dcb08da30c41..2be7c4f10b7d 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/hlsdk/Manifest b/dev-games/hlsdk/Manifest
index 036e2e22de0a..44b220c583e3 100644
--- a/dev-games/hlsdk/Manifest
+++ b/dev-games/hlsdk/Manifest
@@ -1,4 +1,4 @@
 DIST hlsdk-2.3.tgz 4542895 BLAKE2B d71fe308b29a473776fa6a116e71739ca271baf30a0f89b618077cdfd4cfb27ec2daea8700703a971d23aa4d834d5f8df7091332438883b1bffd8e6c3c3c78b4 SHA512 fbcaf03240851903ad18971acc5a522a4ad9fd48087e1c85b7d2c12999702f69d0b487f3a2f51157859f4373cecc57415e8e048facd874a45553b9b609b2df6b
-EBUILD hlsdk-2.3-r1.ebuild 550 BLAKE2B bb3f69bc0418f2409dfe9db5a0ae8a5e935805ddd9f832f80d6c3c9b4e20f5856128cdb3cf6cb83f26d0de9623622f5dc482fa7a0cfe5a74a57f512376b05c48 SHA512 ec01cfee8d8cd4c8992f46679b82aa02b36cf50b2544f307523a59953ac864fe624456fe3ec5f98a09e0d2bb980b576e0d65887bd21491fb0f346df3fefac484
+EBUILD hlsdk-2.3-r1.ebuild 549 BLAKE2B 6540e433bb48f0a313bffba1f9b14aa744cf26f5533110ce7972b899d920f830d1edf7628462d34a598404368cb072be5452ca5db03ef6f8c31d9313da5a6c1d SHA512 d11daad4b60713b4376eaa0a70c21c4f53473545b9a5c57a5d2a8b93068809500cfb7c941c50f579c46f0536f05f0fc74da9a168e12e427071e4590266b8b43d
 EBUILD hlsdk-2.3.ebuild 568 BLAKE2B 9eeade41865102b2cee859486570c93e020dd9462aac5937c9d4bc7ad7f7f6cf035d5f5c1ea336b4026e52189f525c5ff57d7303b87391ab91bb6fded0642286 SHA512 afb7041fbc3526a8c2c1dc0c80b04308efdb69e7c94d968348efb0638939663f9f674110901a25d6a06f5baa367133cc3e93d8fc99ddcdeb1d8378083238ffb6
 MISC metadata.xml 791 BLAKE2B f1d2bdcb83df16556745e5e0b32b4f1182c0e93ace650e2d0f225ea4d2bbb2aa8757241064396e880e1728dbfe0758a22b988e1d46270b24219e478e678333cf SHA512 665bcb56912ac4ae599138bf80eb7d88c314fab9bf7b87200e977c788b30a4b05576f9b2c8f85167c85c655b671683bf7159dec624f7bbfdf0e7f902eefa3fa2
diff --git a/dev-games/hlsdk/hlsdk-2.3-r1.ebuild b/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
index 02aa121b4bc3..fb397c5dcc84 100644
--- a/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
+++ b/dev-games/hlsdk/hlsdk-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.metamod.org/files/sdk/${P}.tgz"
 
 LICENSE="ValveSDK"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index d35659a88001..a0985e090d54 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,9 +1,8 @@
 AUX physfs-2.0.3-zip_seek.diff 535 BLAKE2B cfb10e446d6370c0365071d38c2d9ebedf2387959568ac5a80ea10a449f90763ae290be09631fb71bf46afefa2d245a286eb6ba255a7f0e69a4534ea8fccbecc SHA512 016f5cafecdfc7f4d2d9dcb517f0ebe7b7765912361399e2c7e239c936c287ca15c0124fd9378c23d6d0d3669c45c4d4dc498098eb052901d349459c94a29ef2
 DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
-DIST physfs-3.0.0.tar.bz2 194277 BLAKE2B 31353c61f9e8d3a598fd6e3abbbf9864557021b137da9ab424c37222a68281a2d67102cd018fae1965dab50bf7aeb6f48bd3582185483182dc94b1dd763ef764 SHA512 4293dc72a5b2e41fbd02c4426da7bfc1e94a013d8a332b3124798a91ef27b4a57adef303f23d5e03150855de69cf22fc8bb29e6395725a18e3a12f6c74b4111f
 DIST physfs-3.0.1.tar.bz2 194638 BLAKE2B a95e599ad5c8c5aafcd9b6569c8b7762bdd0fcdbf9502f8fda61f5068b25c8cf651ce6127a1f139b20baa93bd9ab001d2527aedc0180c3b60246410ab0d35acb SHA512 ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879
 EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec40f5c9cce97b089c4edbdd6a82cd220e75726b63c6c1d473f1203812e14ca587cf04131a6cbb61d963159d665b8 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de
-EBUILD physfs-3.0.0.ebuild 1149 BLAKE2B 4d1741230adecf1df5380d3a15cc00d1fa1a2d21b5b5b5efa31e2dd11b7fdb44ebaf062bd4c8124bdfeed05f330edabd401e62720a432d4ff895dd7be635edfb SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff
+EBUILD physfs-3.0.1-r1.ebuild 1357 BLAKE2B ccc70d74bc537f05b2ebe2cd64e0b6376e3791380d5d00a367f30d1f6169c0281addfa0e26b713c6ed74ff2882193f0dc84edd1d17b16582834f52a4dc898895 SHA512 f7a3c0d29d45754ceca70388d1fc93ae218bcce727006951089df7744038f88823cce3767e079ce41d6cb2bf7837731cd9f04e3e4417f0df2b64e254f72f2cfd
 EBUILD physfs-3.0.1.ebuild 1149 BLAKE2B 4d1741230adecf1df5380d3a15cc00d1fa1a2d21b5b5b5efa31e2dd11b7fdb44ebaf062bd4c8124bdfeed05f330edabd401e62720a432d4ff895dd7be635edfb SHA512 34a700288cb901ba432c748e47203e8234e0f1ba68af56edf490ea798c2afabf6f905cc8d95f602fe8fa66518e2e82d051b95ec7004a913e394bb525478f6dff
-EBUILD physfs-9999.ebuild 1263 BLAKE2B 575b67f4c06673c9d063c36c3f47df941c1ee6b59df958d837ccb6c9d6259c8680e02b7fd1636292bc6bb134e5ecd0d8e4baccf37a6d1818724a216d52010fe2 SHA512 d37b4df1abea4e27a33fde03b8dd63871c68b77abba72214aa6fedd0fc351a4898fd4290590fbf5ac3b494f42f8e9f46c6cb975d66485f54bae473105d99b70c
-MISC metadata.xml 1807 BLAKE2B 4e2a59f4a32e6df630d18589a37cab798f1a9f04115b1b7d46f9bf872d53802fa1419dd21e657a177796b9cb632a4ba38297fbea3ce38c88cc66416c5f7f1469 SHA512 914416e5632d1587b4677b8c8997eed056603049bf71424ccc679a6a4fa050ad2c9f5bf2db0927a5925bdc662565fc2d49901c9de419a623a830a2c6da65341e
+EBUILD physfs-9999.ebuild 1458 BLAKE2B 903117df8a7c78a3e08aadaba7d418666ab387dd14172a48e5a63bf4a277c73fc96f2f49a3f81faad62a4aeed47304b64e72ad55253d238ed480568b785c04a8 SHA512 fd7fa508248f2e917cc11cf165da5c6b6fdde20d3d0340410de44ecc175dcfce8a9035b20a971998eb4733125860ad52aed9f6e34b0401266fff02dc7f15d84b
+MISC metadata.xml 2053 BLAKE2B 72bacd7ea9c8484446c109a062ca9f68eaa4e7d481d6b0d1e32eb3c7c1afc093c0550a20cb4280a7d3ce60929b204cde0499e20262fe591ca97c0c697e8e9bce SHA512 178d6468849870d0e557c04f899edf8513c3e695df0ce1b543de90ca57f87629a2a6c2ebdefeaf00ffe7891dcc9e340200136f94de0579e2e7f43897b138f3a2
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml
index 5bca86689c43..62272a610b69 100644
--- a/dev-games/physfs/metadata.xml
+++ b/dev-games/physfs/metadata.xml
@@ -23,9 +23,13 @@ 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>
 <flag name="zip">Enable ZIP archive support</flag>
diff --git a/dev-games/physfs/physfs-3.0.0.ebuild b/dev-games/physfs/physfs-3.0.1-r1.ebuild
index 4b0afd2bd59b..237ccc126998 100644
--- a/dev-games/physfs/physfs-3.0.0.ebuild
+++ b/dev-games/physfs/physfs-3.0.1-r1.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
@@ -11,36 +11,40 @@ SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd"
-IUSE="grp hog mvl qpak static-libs wad +zip"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
 
-RDEPEND=""
-DEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's:-Werror::' CMakeLists.txt || die
-	# make sure these libs aren't used
-	rm -rf lzma zlib*
-}
-
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
-		-DPHYSFS_ARCHIVE_7Z=OFF
 		-DPHYSFS_BUILD_SHARED=ON
 		-DPHYSFS_BUILD_TEST=OFF
-		-DPHYSFS_BUILD_WX_TEST=OFF
-		-DPHYSFS_INTERNAL_ZLIB=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
+}
 
-	cmake-multilib_src_configure
+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-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild
index a3cfee4fd576..d001542c16ed 100644
--- a/dev-games/physfs/physfs-9999.ebuild
+++ b/dev-games/physfs/physfs-9999.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
@@ -16,36 +16,41 @@ fi
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="grp hog mvl qpak static-libs wad +zip"
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip"
 
 RDEPEND=""
 DEPEND=""
 
 DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt )
 
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's:-Werror::' CMakeLists.txt || die
-	# make sure these libs aren't used
-	rm -rf lzma zlib*
-}
-
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
-		-DPHYSFS_ARCHIVE_7Z=OFF
 		-DPHYSFS_BUILD_SHARED=ON
 		-DPHYSFS_BUILD_TEST=OFF
-		-DPHYSFS_BUILD_WX_TEST=OFF
-		-DPHYSFS_INTERNAL_ZLIB=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
+}
 
-	cmake-multilib_src_configure
+multilib_src_install_all() {
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
+	fi
 }