Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/physfs/, dev-games/physfs/files/
Date: Wed, 05 Jun 2019 06:56:20
Message-Id: 1559717694.3456f3a1e1e7265925adba549e7691ba2b6d2506.asturm@gentoo
1 commit: 3456f3a1e1e7265925adba549e7691ba2b6d2506
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 5 06:52:52 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 5 06:54:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3456f3a1
7
8 dev-games/physfs: Drop 2.0.3-r2
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.14
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-games/physfs/Manifest | 1 -
14 dev-games/physfs/files/physfs-2.0.3-zip_seek.diff | 15 ------
15 dev-games/physfs/physfs-2.0.3-r2.ebuild | 63 -----------------------
16 3 files changed, 79 deletions(-)
17
18 diff --git a/dev-games/physfs/Manifest b/dev-games/physfs/Manifest
19 index bad255dab36..310875d0eba 100644
20 --- a/dev-games/physfs/Manifest
21 +++ b/dev-games/physfs/Manifest
22 @@ -1,2 +1 @@
23 -DIST physfs-2.0.3.tar.bz2 560628 BLAKE2B 8e3e8497463886678aaa671269133513f08aab1e49a6397f61cd44a5139030326ae0889e795401a967b0641f680f353dfaa39d7102502c2b8e0680c0a5d158b5 SHA512 47eff0c81b8dc3bb526766b0a8ad2437d2951867880116d6e6e8f2ec1490e263541fb741867fed6517cc3fa8a9c5651b36e3e02a499f19cfdc5c7261c9707e80
24 DIST physfs-3.0.2.tar.bz2 194888 BLAKE2B 67b6b04e3822c2528a31a2c60345238cb5f25ad031e32a6c3416b91bad6347af9f02dcfb8dc29a71c2bfc2b7cec7f0749ffbbd0dcadbc35703576ad895f568d9 SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472
25
26 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
27 deleted file mode 100644
28 index eaab07e1603..00000000000
29 --- a/dev-games/physfs/files/physfs-2.0.3-zip_seek.diff
30 +++ /dev/null
31 @@ -1,15 +0,0 @@
32 -http://icculus.org/pipermail/physfs/2017-January/001217.html
33 -
34 -diff -r 34ebe997c5c0 archivers/zip.c
35 ---- a/archivers/zip.c Fri Jan 01 12:53:41 2016 -0500
36 -+++ b/archivers/zip.c Wed Jan 25 20:56:26 2017 +0300
37 -@@ -327,7 +327,8 @@
38 - return(0);
39 -
40 - inflateEnd(&finfo->stream);
41 -- memcpy(&finfo->stream, &str, sizeof (z_stream));
42 -+ inflateCopy(&finfo->stream, &str);
43 -+ inflateEnd(&str);
44 - finfo->uncompressed_position = finfo->compressed_position = 0;
45 - } /* if */
46 -
47
48 diff --git a/dev-games/physfs/physfs-2.0.3-r2.ebuild b/dev-games/physfs/physfs-2.0.3-r2.ebuild
49 deleted file mode 100644
50 index eec6c0e3546..00000000000
51 --- a/dev-games/physfs/physfs-2.0.3-r2.ebuild
52 +++ /dev/null
53 @@ -1,63 +0,0 @@
54 -# Copyright 1999-2017 Gentoo Foundation
55 -# Distributed under the terms of the GNU General Public License v2
56 -
57 -EAPI=6
58 -inherit cmake-multilib
59 -
60 -DESCRIPTION="Abstraction layer for filesystem and archive access"
61 -HOMEPAGE="http://icculus.org/physfs/"
62 -SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2"
63 -
64 -LICENSE="ZLIB"
65 -SLOT="0"
66 -KEYWORDS="alpha amd64 arm ~arm64 hppa ppc64 x86 ~x86-fbsd"
67 -IUSE="doc grp hog mvl qpak static-libs wad +zip"
68 -
69 -RDEPEND=""
70 -DEPEND="doc? ( app-doc/doxygen )"
71 -
72 -PATCHES=(
73 - "${FILESDIR}/${P}-zip_seek.diff"
74 -)
75 -
76 -src_prepare() {
77 - cmake-utils_src_prepare
78 -
79 - sed -i -e 's:-Werror::' CMakeLists.txt || die
80 - # make sure these libs aren't used
81 - rm -rf lzma zlib*
82 -}
83 -
84 -src_configure() {
85 - local mycmakeargs=(
86 - -DPHYSFS_ARCHIVE_7Z=OFF
87 - -DPHYSFS_BUILD_SHARED=ON
88 - -DPHYSFS_BUILD_TEST=OFF
89 - -DPHYSFS_BUILD_WX_TEST=OFF
90 - -DPHYSFS_INTERNAL_ZLIB=OFF
91 - -DPHYSFS_BUILD_STATIC="$(usex static-libs)"
92 - -DPHYSFS_ARCHIVE_GRP="$(usex grp)"
93 - -DPHYSFS_ARCHIVE_HOG="$(usex hog)"
94 - -DPHYSFS_ARCHIVE_MVL="$(usex mvl)"
95 - -DPHYSFS_ARCHIVE_WAD="$(usex wad)"
96 - -DPHYSFS_ARCHIVE_QPAK="$(usex qpak)"
97 - -DPHYSFS_ARCHIVE_ZIP="$(usex zip)"
98 - )
99 -
100 - cmake-multilib_src_configure
101 -}
102 -
103 -src_compile() {
104 - cmake-multilib_src_compile
105 -
106 - if multilib_is_native_abi && use doc ; then
107 - doxygen || die "doxygen failed"
108 - fi
109 -}
110 -
111 -src_install() {
112 - local DOCS=( CHANGELOG.txt CREDITS.txt TODO.txt )
113 - local HTML_DOCS=$(usex doc 'docs/html/*' '')
114 -
115 - cmake-multilib_src_install
116 -}