commit: a6d7711951a8c8636464baf48d951889ac0e6cf9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun May 12 22:40:48 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon May 13 00:17:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d77119
dev-games/physfs: Drop 3.0.1-r2 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-games/physfs/Manifest | 1 - .../physfs/files/physfs-3.0.1-setwritedir.patch | 40 --------------- dev-games/physfs/physfs-3.0.1-r2.ebuild | 58 ---------------------- 3 files changed, 99 deletions(-) diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest index d80736dbad1..bad255dab36 100644 --- a/dev-games/physfs/Manifest +++ b/dev-games/physfs/Manifest @@ -1,3 +1,2 @@ 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 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 9673e12a2b2..00000000000 --- 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 <iccu...@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/physfs-3.0.1-r2.ebuild b/dev-games/physfs/physfs-3.0.1-r2.ebuild deleted file mode 100644 index fe097f9f54e..00000000000 --- 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 -}
