1 |
commit: 9fa283b13aa8846ede5af588ae3aebe2154c7c05 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Mar 21 11:55:26 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 25 19:51:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa283b1 |
7 |
|
8 |
dev-games/physfs: added new USE-flags |
9 |
|
10 |
Added 7zip (Bug #381973), iso, vdf, slb file formats support, cleanup for |
11 |
outdated code (Bug #649456). |
12 |
|
13 |
Closes: https://bugs.gentoo.org/381973 |
14 |
Closes: https://bugs.gentoo.org/649456 |
15 |
|
16 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
17 |
Closes: https://github.com/gentoo/gentoo/pull/7532 |
18 |
|
19 |
dev-games/physfs/metadata.xml | 4 +++ |
20 |
dev-games/physfs/physfs-3.0.1-r1.ebuild | 50 +++++++++++++++++++++++++++++++++ |
21 |
dev-games/physfs/physfs-9999.ebuild | 35 +++++++++++++---------- |
22 |
3 files changed, 74 insertions(+), 15 deletions(-) |
23 |
|
24 |
diff --git a/dev-games/physfs/metadata.xml b/dev-games/physfs/metadata.xml |
25 |
index 5bca86689c4..62272a610b6 100644 |
26 |
--- a/dev-games/physfs/metadata.xml |
27 |
+++ b/dev-games/physfs/metadata.xml |
28 |
@@ -23,9 +23,13 @@ the user's home directory, where in the real filesystem your program is running, |
29 |
etc. |
30 |
</longdescription> |
31 |
<use> |
32 |
+<flag name="7zip">Enable 7zip/lzma archive support</flag> |
33 |
<flag name="grp">Enable Build Engine GRP archive support</flag> |
34 |
<flag name="hog">Enable Descent I/II HOG archive support</flag> |
35 |
+<flag name="iso">Enable ISO9660 file support</flag> |
36 |
<flag name="mvl">Enable Descent I/II MVL archive support</flag> |
37 |
+<flag name="slb">Enable Independence War SLB archive support</flag> |
38 |
+<flag name="vdf">Enable Gothic/Gothic II VDF archive support</flag> |
39 |
<flag name="wad">Enable Doom WAD archive support</flag> |
40 |
<flag name="qpak">Enable Quake I/II QPAK archive support</flag> |
41 |
<flag name="zip">Enable ZIP archive support</flag> |
42 |
|
43 |
diff --git a/dev-games/physfs/physfs-3.0.1-r1.ebuild b/dev-games/physfs/physfs-3.0.1-r1.ebuild |
44 |
new file mode 100644 |
45 |
index 00000000000..237ccc12699 |
46 |
--- /dev/null |
47 |
+++ b/dev-games/physfs/physfs-3.0.1-r1.ebuild |
48 |
@@ -0,0 +1,50 @@ |
49 |
+# Copyright 1999-2018 Gentoo Foundation |
50 |
+# Distributed under the terms of the GNU General Public License v2 |
51 |
+ |
52 |
+EAPI=6 |
53 |
+inherit cmake-multilib |
54 |
+ |
55 |
+DESCRIPTION="Abstraction layer for filesystem and archive access" |
56 |
+HOMEPAGE="http://icculus.org/physfs/" |
57 |
+SRC_URI="http://icculus.org/physfs/downloads/${P}.tar.bz2" |
58 |
+ |
59 |
+LICENSE="ZLIB" |
60 |
+SLOT="0" |
61 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~x86-fbsd" |
62 |
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip" |
63 |
+ |
64 |
+DEPEND="doc? ( app-doc/doxygen )" |
65 |
+ |
66 |
+DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt ) |
67 |
+ |
68 |
+multilib_src_configure() { |
69 |
+ local mycmakeargs=( |
70 |
+ -DPHYSFS_BUILD_SHARED=ON |
71 |
+ -DPHYSFS_BUILD_TEST=OFF |
72 |
+ -DPHYSFS_BUILD_STATIC="$(usex static-libs)" |
73 |
+ -DPHYSFS_ARCHIVE_7Z="$(usex 7zip)" |
74 |
+ -DPHYSFS_ARCHIVE_GRP="$(usex grp)" |
75 |
+ -DPHYSFS_ARCHIVE_HOG="$(usex hog)" |
76 |
+ -DPHYSFS_ARCHIVE_ISO9660="$(usex iso)" |
77 |
+ -DPHYSFS_ARCHIVE_MVL="$(usex mvl)" |
78 |
+ -DPHYSFS_ARCHIVE_SLB="$(usex slb)" |
79 |
+ -DPHYSFS_ARCHIVE_VDF="$(usex vdf)" |
80 |
+ -DPHYSFS_ARCHIVE_WAD="$(usex wad)" |
81 |
+ -DPHYSFS_ARCHIVE_QPAK="$(usex qpak)" |
82 |
+ -DPHYSFS_ARCHIVE_ZIP="$(usex zip)" |
83 |
+ ) |
84 |
+ cmake-utils_src_configure |
85 |
+} |
86 |
+ |
87 |
+multilib_src_compile() { |
88 |
+ cmake-utils_src_compile |
89 |
+ multilib_is_native_abi && use doc && cmake-utils_src_compile docs |
90 |
+} |
91 |
+ |
92 |
+multilib_src_install_all() { |
93 |
+ einstalldocs |
94 |
+ if use doc ; then |
95 |
+ docinto html |
96 |
+ dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* |
97 |
+ fi |
98 |
+} |
99 |
|
100 |
diff --git a/dev-games/physfs/physfs-9999.ebuild b/dev-games/physfs/physfs-9999.ebuild |
101 |
index a3cfee4fd57..d001542c16e 100644 |
102 |
--- a/dev-games/physfs/physfs-9999.ebuild |
103 |
+++ b/dev-games/physfs/physfs-9999.ebuild |
104 |
@@ -1,4 +1,4 @@ |
105 |
-# Copyright 1999-2017 Gentoo Foundation |
106 |
+# Copyright 1999-2018 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
|
109 |
EAPI=6 |
110 |
@@ -16,36 +16,41 @@ fi |
111 |
|
112 |
LICENSE="ZLIB" |
113 |
SLOT="0" |
114 |
-IUSE="grp hog mvl qpak static-libs wad +zip" |
115 |
+IUSE="7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip" |
116 |
|
117 |
RDEPEND="" |
118 |
DEPEND="" |
119 |
|
120 |
DOCS=( docs/CHANGELOG.txt docs/CREDITS.txt docs/TODO.txt ) |
121 |
|
122 |
-src_prepare() { |
123 |
- cmake-utils_src_prepare |
124 |
- |
125 |
- sed -i -e 's:-Werror::' CMakeLists.txt || die |
126 |
- # make sure these libs aren't used |
127 |
- rm -rf lzma zlib* |
128 |
-} |
129 |
- |
130 |
-src_configure() { |
131 |
+multilib_src_configure() { |
132 |
local mycmakeargs=( |
133 |
- -DPHYSFS_ARCHIVE_7Z=OFF |
134 |
-DPHYSFS_BUILD_SHARED=ON |
135 |
-DPHYSFS_BUILD_TEST=OFF |
136 |
- -DPHYSFS_BUILD_WX_TEST=OFF |
137 |
- -DPHYSFS_INTERNAL_ZLIB=OFF |
138 |
-DPHYSFS_BUILD_STATIC="$(usex static-libs)" |
139 |
+ -DPHYSFS_ARCHIVE_7Z="$(usex 7zip)" |
140 |
-DPHYSFS_ARCHIVE_GRP="$(usex grp)" |
141 |
-DPHYSFS_ARCHIVE_HOG="$(usex hog)" |
142 |
+ -DPHYSFS_ARCHIVE_ISO9660="$(usex iso)" |
143 |
-DPHYSFS_ARCHIVE_MVL="$(usex mvl)" |
144 |
+ -DPHYSFS_ARCHIVE_SLB="$(usex slb)" |
145 |
+ -DPHYSFS_ARCHIVE_VDF="$(usex vdf)" |
146 |
-DPHYSFS_ARCHIVE_WAD="$(usex wad)" |
147 |
-DPHYSFS_ARCHIVE_QPAK="$(usex qpak)" |
148 |
-DPHYSFS_ARCHIVE_ZIP="$(usex zip)" |
149 |
) |
150 |
+ cmake-utils_src_configure |
151 |
+} |
152 |
+ |
153 |
+multilib_src_compile() { |
154 |
+ cmake-utils_src_compile |
155 |
+ multilib_is_native_abi && use doc && cmake-utils_src_compile docs |
156 |
+} |
157 |
|
158 |
- cmake-multilib_src_configure |
159 |
+multilib_src_install_all() { |
160 |
+ einstalldocs |
161 |
+ if use doc ; then |
162 |
+ docinto html |
163 |
+ dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/* |
164 |
+ fi |
165 |
} |