gentoo resync : 08.06.2019

4 files changed, 2 insertions, 83 deletions

diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
index eb74cc6ac440..13efbfa2f8cb 100644
--- a/dev-games/physfs/Manifest
+++ b/dev-games/physfs/Manifest
@@ -1,7 +1,4 @@
-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.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 1399 BLAKE2B 179e615df2bc1b22d1f6843cbf1be6d4d8fad5c517840b4e5773fa48b690b6b8fbc9d9262908c3c97ff5045edba89cf449b477b8b7f0d1859c3e635201a9389c SHA512 2e7f2aa60917c72006fe1858814a5555f0c1f035aa9d8fc49c1521ae4d9c52b9224d2c6bc722196ae2d19963ea6dde62c8a6947bd1e1b5f8a08c078407aa8f50
+EBUILD physfs-3.0.2.ebuild 1398 BLAKE2B ec1f232cc44c73c5eb9d14f1c38ab144a0aba6918cc762a01bee622d28ea07377e92c6947902c85f194c0250194b3075b74849f60a2d9d6b088995a559b75312 SHA512 e2b8636e567adfb8783fa57cf83900ef2b83cc5952ff4af7d9be182a0634479122dd91743253fa4d6d3b5535ab3e912cb82e3fbe15b397de44557167d5694264
 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-2.0.3-zip_seek.diff b/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff
deleted file mode 100644
index eaab07e16034..000000000000
--- a/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-http://icculus.org/pipermail/physfs/2017-January/001217.html
-
-diff -r 34ebe997c5c0 archivers/zip.c
---- a/archivers/zip.c	Fri Jan 01 12:53:41 2016 -0500
-+++ b/archivers/zip.c	Wed Jan 25 20:56:26 2017 +0300
-@@ -327,7 +327,8 @@
-                 return(0);
- 
-             inflateEnd(&finfo->stream);
--            memcpy(&finfo->stream, &str, sizeof (z_stream));
-+            inflateCopy(&finfo->stream, &str);
-+            inflateEnd(&str);
-             finfo->uncompressed_position = finfo->compressed_position = 0;
-         } /* if */
- 
diff --git a/dev-games/physfs/physfs-2.0.3-r2.ebuild b/dev-games/physfs/physfs-2.0.3-r2.ebuild
deleted file mode 100644
index eec6c0e35460..000000000000
--- a/dev-games/physfs/physfs-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-DESCRIPTION="Abstraction layer for filesystem and archive access"
-HOMEPAGE="http://icculus.org/physfs/"
-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="doc grp hog mvl qpak static-libs wad +zip"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-zip_seek.diff"
-)
-
-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() {
-	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_GRP="$(usex grp)"
-		-DPHYSFS_ARCHIVE_HOG="$(usex hog)"
-		-DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
-		-DPHYSFS_ARCHIVE_WAD="$(usex wad)"
-		-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
-		-DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
-	)
-
-	cmake-multilib_src_configure
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-
-	if multilib_is_native_abi && use doc ; then
-		doxygen || die "doxygen failed"
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.txt CREDITS.txt TODO.txt )
-	local HTML_DOCS=$(usex doc 'docs/html/*' '')
-
-	cmake-multilib_src_install
-}
diff --git a/dev-games/physfs/physfs-3.0.2.ebuild b/dev-games/physfs/physfs-3.0.2.ebuild
index 8bb871f8cd89..afb8306b5ef2 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