From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- dev-games/physfs/Manifest | 6 +-- .../physfs/files/physfs-3.0.1-setwritedir.patch | 40 +++++++++++++++ dev-games/physfs/physfs-3.0.1-r1.ebuild | 50 ------------------- dev-games/physfs/physfs-3.0.1-r2.ebuild | 58 ++++++++++++++++++++++ dev-games/physfs/physfs-3.0.1.ebuild | 46 ----------------- dev-games/physfs/physfs-9999.ebuild | 12 ++--- 6 files changed, 107 insertions(+), 105 deletions(-) create mode 100644 dev-games/physfs/files/physfs-3.0.1-setwritedir.patch delete mode 100644 dev-games/physfs/physfs-3.0.1-r1.ebuild create mode 100644 dev-games/physfs/physfs-3.0.1-r2.ebuild delete mode 100644 dev-games/physfs/physfs-3.0.1.ebuild (limited to 'dev-games/physfs') diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest index 36d7a36b7104..c16e45fb922c 100644 --- a/dev-games/physfs/Manifest +++ b/dev-games/physfs/Manifest @@ -1,8 +1,8 @@ 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 EBUILD physfs-2.0.3-r2.ebuild 1434 BLAKE2B e90dfa9de136d2d0c6df7247b7681cfae7dec40f5c9cce97b089c4edbdd6a82cd220e75726b63c6c1d473f1203812e14ca587cf04131a6cbb61d963159d665b8 SHA512 543e02d9f4c5653c385295beb92c3e002cfb153fa968dfeb386fba205523197f35d0dbb9e57e82960583ae5ded4232001a91a39628ceaf2a195c3215ac6ce6de -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 1458 BLAKE2B 903117df8a7c78a3e08aadaba7d418666ab387dd14172a48e5a63bf4a277c73fc96f2f49a3f81faad62a4aeed47304b64e72ad55253d238ed480568b785c04a8 SHA512 fd7fa508248f2e917cc11cf165da5c6b6fdde20d3d0340410de44ecc175dcfce8a9035b20a971998eb4733125860ad52aed9f6e34b0401266fff02dc7f15d84b +EBUILD physfs-3.0.1-r2.ebuild 1522 BLAKE2B f889a3228a5a2e2e09bd09a978d207f41124473f94a1fcf9d57808b6c87aeb6d6c22771bdc7ce4ee1edb4819611f239a3cd2d196a3c19eb53c5b09cf8bf28b89 SHA512 e34bc7afb826fbc3ca79d0549eb6f8a750f05431ba425941ff247ee312861f89444c82970c8fa244f1a80732036f3a1d704d441caed9e0b85a1c10e12a9af460 +EBUILD physfs-9999.ebuild 1472 BLAKE2B fe172cc56145cc865f6b306d4affc325428b6feaa70ab205e3fbb348aeb1a7964b348e5743299437777d8a1855f6b4b33ee78a5b33872a01328f727d20710d1d SHA512 951755e06e99f6f1dd0bb0fbbd693b847d3028b6e5e12fd4c43ff438db65553f1de063bbc5cbde0458c211f9db3179cd9970f0c286a8cc17df08900666276c5d MISC metadata.xml 2002 BLAKE2B 4b4c48bdbb19836f3a2e5b09c737c1c0390dba6d2cdccb126a0f8caa6e593e0861b9ddf1d3d70b1da00385b323b86c2842482ccfa10de421a6ea57251fab703b SHA512 4a06786fe7cd30dc87225656ae0b09322f23f19fdd3919695629f76c54d7abb6ee970b8a67c59ef5895e460c5e65074ec7ffb06680f1572898aa15f2fb78fbdc diff --git a/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch b/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch new file mode 100644 index 000000000000..9673e12a2b23 --- /dev/null +++ b/dev-games/physfs/files/physfs-3.0.1-setwritedir.patch @@ -0,0 +1,40 @@ +Upstream-Status: Backport +[https://hg.icculus.org/icculus/physfs/rev/a29fef4a20fd] + +# HG changeset patch +# User Ryan C. Gordon +# 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-r1.ebuild b/dev-games/physfs/physfs-3.0.1-r1.ebuild deleted file mode 100644 index 237ccc126998..000000000000 --- a/dev-games/physfs/physfs-3.0.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 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="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip" - -DEPEND="doc? ( app-doc/doxygen )" - -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-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.1-r2.ebuild b/dev-games/physfs/physfs-3.0.1-r2.ebuild new file mode 100644 index 000000000000..fe097f9f54ed --- /dev/null +++ b/dev-games/physfs/physfs-3.0.1-r2.ebuild @@ -0,0 +1,58 @@ +# 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.1.ebuild b/dev-games/physfs/physfs-3.0.1.ebuild deleted file mode 100644 index 4b0afd2bd59b..000000000000 --- a/dev-games/physfs/physfs-3.0.1.ebuild +++ /dev/null @@ -1,46 +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="grp hog mvl qpak static-libs 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() { - 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 -} diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild index d001542c16ed..683b49ac714d 100644 --- a/dev-games/physfs/physfs-9999.ebuild +++ b/dev-games/physfs/physfs-9999.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-multilib DESCRIPTION="Abstraction layer for filesystem and archive access" -HOMEPAGE="http://icculus.org/physfs/" +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="http://icculus.org/physfs/downloads/${P}.tar.bz2" + 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" -RDEPEND="" -DEPEND="" +BDEPEND="doc? ( app-doc/doxygen )" DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt ) -- cgit v1.2.3