Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/zziplib/, dev-libs/zziplib/files/
Date: Sat, 15 Aug 2020 09:30:58
Message-Id: 1597483788.48f85b04cad6910dfeda4f6f7bae80b3a19c6cd3.juippis@gentoo
1 commit: 48f85b04cad6910dfeda4f6f7bae80b3a19c6cd3
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Mon Jul 27 10:26:42 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 09:29:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f85b04
7
8 dev-libs/zziplib: 0.13.71 version bump
9
10 Closes: https://bugs.gentoo.org/723418
11 Thanks to Nico R. for the ebuild attached to the bug
12 Adding myself as a proxied maintainer
13
14 Package-Manager: Portage-2.3.103, Repoman-2.3.23
15 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
16 Closes: https://github.com/gentoo/gentoo/pull/16851
17 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
18
19 dev-libs/zziplib/Manifest | 1 +
20 .../zziplib/files/zziplib-0.13.69-009-perror.patch | 13 ++
21 .../zziplib/files/zziplib-0.13.71-find-bash.patch | 44 +++++++
22 .../zziplib-0.13.71-join-paths-pc-zzipsdldir.patch | 26 ++++
23 .../files/zziplib-0.13.71-shell-DESTDIR.patch | 51 ++++++++
24 ...-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch | 137 +++++++++++++++++++++
25 dev-libs/zziplib/metadata.xml | 9 +-
26 dev-libs/zziplib/zziplib-0.13.71.ebuild | 68 ++++++++++
27 8 files changed, 348 insertions(+), 1 deletion(-)
28
29 diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
30 index 9c8fa1075fe..84aef6fe9d6 100644
31 --- a/dev-libs/zziplib/Manifest
32 +++ b/dev-libs/zziplib/Manifest
33 @@ -2,3 +2,4 @@ DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc161422
34 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
35 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
36 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
37 +DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
38
39 diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
40 new file mode 100644
41 index 00000000000..678ff3670df
42 --- /dev/null
43 +++ b/dev-libs/zziplib/files/zziplib-0.13.69-009-perror.patch
44 @@ -0,0 +1,13 @@
45 +Index: zziplib-0.13.69/bins/unzip-mem.c
46 +===================================================================
47 +--- zziplib-0.13.69.orig/bins/unzip-mem.c
48 ++++ zziplib-0.13.69/bins/unzip-mem.c
49 +@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
50 + {
51 + FILE* file = fopen (entry->zz_name, "wb");
52 + if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
53 +- perror (entry->zz_name);
54 ++ else perror (entry->zz_name);
55 + if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
56 + }
57 +
58
59 diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
60 new file mode 100644
61 index 00000000000..e29599c1b2d
62 --- /dev/null
63 +++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
64 @@ -0,0 +1,44 @@
65 +diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
66 +index 7ceba4a..c1b8172 100644
67 +--- a/SDL/CMakeLists.txt
68 ++++ b/SDL/CMakeLists.txt
69 +@@ -47,6 +47,7 @@ endif()
70 +
71 + if(SDL_FOUND)
72 + if(UNIX)
73 ++find_package ( UnixCommands REQUIRED ) # bash
74 + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
75 + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
76 + add_custom_command(OUTPUT SDL_rwops_zzip.pc
77 +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
78 +index a9f6e3a..2cdd275 100644
79 +--- a/zzip/CMakeLists.txt
80 ++++ b/zzip/CMakeLists.txt
81 +@@ -194,6 +194,7 @@ SET_TARGET_PROPERTIES(libzzipmmapped PROPERTIES VERSION ${VERNUM}.${FIXNUM} SOVE
82 + endif()
83 +
84 + if(ZZIPCOMPAT)
85 ++find_package ( UnixCommands REQUIRED ) # bash
86 + add_custom_command(OUTPUT compat/zzip.h
87 + COMMAND ${BASH} -c "rm -rf compat; mkdir compat"
88 + COMMAND ${BASH} -c "echo '#ifndef ZZIP_WARNING' > compat/zzip.h"
89 +@@ -215,6 +216,7 @@ add_custom_target(compat ALL DEPENDS compat/zzip.h)
90 + endif()
91 +
92 + if(UNIX)
93 ++find_package ( UnixCommands REQUIRED ) # bash
94 + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
95 + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
96 + add_custom_command(OUTPUT zziplib.pc
97 +diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
98 +index 220d93b..d0bf1ae 100644
99 +--- a/zzipwrap/CMakeLists.txt
100 ++++ b/zzipwrap/CMakeLists.txt
101 +@@ -49,6 +49,7 @@ target_link_libraries(zzipwrap libzzipwrap )
102 + target_include_directories(zzipwrap PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
103 +
104 + if(UNIX)
105 ++find_package ( UnixCommands REQUIRED ) # bash
106 + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
107 + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
108 + add_custom_command(OUTPUT zzipwrap.pc
109
110 diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
111 new file mode 100644
112 index 00000000000..7597f989dcc
113 --- /dev/null
114 +++ b/dev-libs/zziplib/files/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
115 @@ -0,0 +1,26 @@
116 +commit 497c1598cea9dcb13d210de59b1dc65425ca5fdb
117 +Author: Jan Tojnar <jtojnar@×××××.com>
118 +Date: Thu Apr 16 20:09:11 2020 +0200
119 +
120 + build: Produce more correct pc file with zzipsdldir
121 +
122 + Just like described in commit 892dea3b82208654cc9f57ffc4ef555d0d934cf5,
123 + the CMAKE_INSTALL_INCLUDEDIR variable can be absolute path so simply
124 + appending it to \${prefix} might not work.
125 +
126 +diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
127 +index 7ceba4a..6a4f860 100644
128 +--- a/SDL/CMakeLists.txt
129 ++++ b/SDL/CMakeLists.txt
130 +@@ -49,9 +49,10 @@ if(SDL_FOUND)
131 + if(UNIX)
132 + join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
133 + join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
134 ++join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
135 + add_custom_command(OUTPUT SDL_rwops_zzip.pc
136 + COMMAND ${BASH} -c "echo 'prefix=${CMAKE_INSTALL_PREFIX}' > SDL_rwops_zzip.pc"
137 +- COMMAND ${BASH} -c "echo 'zzipsdldir=\${prefix}/${zzipsdldir}' >> SDL_rwops_zzip.pc"
138 ++ COMMAND ${BASH} -c "echo 'zzipsdldir=${pc_zzipsdldir}' >> SDL_rwops_zzip.pc"
139 + COMMAND ${BASH} -c "echo '' >> SDL_rwops_zzip.pc"
140 + COMMAND ${BASH} -c "echo 'Name: SDL_rwops_zzip' >> SDL_rwops_zzip.pc"
141 + COMMAND ${BASH} -c "echo 'Version: ${PROJECT_VERSION}' >> SDL_rwops_zzip.pc"
142
143 diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
144 new file mode 100644
145 index 00000000000..582a1504ee0
146 --- /dev/null
147 +++ b/dev-libs/zziplib/files/zziplib-0.13.71-shell-DESTDIR.patch
148 @@ -0,0 +1,51 @@
149 +commit 75e22f3c365b62acbad8d8645d5404242800dfba
150 +Author: Guido Draheim <guidod@×××.de>
151 +Date: Fri Apr 17 20:47:59 2020 +0200
152 +
153 + #88 use shell $DESTDIR instead of make $(DESTDIR)
154 +
155 +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
156 +index 442e877..d1284e6 100644
157 +--- a/docs/CMakeLists.txt
158 ++++ b/docs/CMakeLists.txt
159 +@@ -145,27 +145,27 @@ string(REPLACE ";" " " all_bins_FILES "${bins_FILES}")
160 + string(REPLACE ";" " " all_SDLs_FILES "${SDLs_FILES}")
161 + add_custom_target(install-site
162 + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/site.html"
163 +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
164 +- COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $(DESTDIR)${docdir}/"
165 +- COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $(DESTDIR)${docdir}/"
166 +- COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $(DESTDIR)${docdir}/"
167 +- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $(DESTDIR)${docdir}/"
168 +- COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $(DESTDIR)${docdir}/"
169 +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && cp ${outdir}/*.html ."
170 +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && ln -s zzip-index.html index.html"
171 ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
172 ++ COMMAND ${BASH} -c "cd ${outdir} && cp zziplib.html zzipmmapped.html zzipfseeko.html $DESTDIR${docdir}/"
173 ++ COMMAND ${BASH} -c "cd ${srcdir} && cp README.* COPYING.* $DESTDIR${docdir}/"
174 ++ COMMAND ${BASH} -c "cd ${topdir} && cp ChangeLog $DESTDIR${docdir}/"
175 ++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_bins_FILES} $DESTDIR${docdir}/"
176 ++ COMMAND ${BASH} -c "cd ${topdir} && cp ${all_SDLs_FILES} $DESTDIR${docdir}/"
177 ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && cp ${outdir}/*.html ."
178 ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && ln -s zzip-index.html index.html"
179 + DEPENDS site.html zziplib.html zzipmmapped.html zzipfseeko.html
180 + VERBATIM)
181 + add_custom_target(install-htmpages
182 + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
183 +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${docdir} >&2 || ls -ld $(DESTDIR)${docdir} >&2"
184 +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && tar x -f ${outdir}/htmpages.tar"
185 +- COMMAND ${BASH} -c "cd $(DESTDIR)${docdir} && mv html man"
186 ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${docdir} >&2 || ls -ld $DESTDIR${docdir} >&2"
187 ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && tar x -f ${outdir}/htmpages.tar"
188 ++ COMMAND ${BASH} -c "cd $DESTDIR${docdir} && mv html man"
189 + DEPENDS htmpages.tar
190 + VERBATIM)
191 + add_custom_target(install-manpages
192 + COMMAND ${BASH} -c "ls -l ${CMAKE_CURRENT_BINARY_DIR}/*pages.tar"
193 +- COMMAND ${BASH} -c "mkdir -vp $(DESTDIR)${mandir} >&2 || ls -ld $(DESTDIR)${mandir} >&2"
194 +- COMMAND ${BASH} -c "cd $(DESTDIR)${mandir} && tar xf ${outdir}/manpages.tar"
195 ++ COMMAND ${BASH} -c "mkdir -vp $DESTDIR${mandir} >&2 || ls -ld $DESTDIR${mandir} >&2"
196 ++ COMMAND ${BASH} -c "cd $DESTDIR${mandir} && tar xf ${outdir}/manpages.tar"
197 + DEPENDS manpages.tar
198 + VERBATIM)
199 + add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
200
201 diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
202 new file mode 100644
203 index 00000000000..d2436ae9012
204 --- /dev/null
205 +++ b/dev-libs/zziplib/files/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
206 @@ -0,0 +1,137 @@
207 +commit ddaa538e8cfa46413b0e92613b54123e4b759616
208 +Author: Guido Draheim <guidod@×××.de>
209 +Date: Fri Apr 17 20:46:30 2020 +0200
210 +
211 + #88 adding testbuilds/opensuse15-ninja-sdl2.dockerfile
212 +
213 +diff --git a/testbuilds.py b/testbuilds.py
214 +index 756e77e..35ac70c 100755
215 +--- a/testbuilds.py
216 ++++ b/testbuilds.py
217 +@@ -1080,6 +1080,42 @@ class ZZiplibBuildTest(unittest.TestCase):
218 + cmd = "docker rmi {images}:{testname}"
219 + sx____(cmd.format(**locals()))
220 + self.rm_testdir()
221 ++ def test_431_opensuse15_ninja_sdl2_dockerfile(self):
222 ++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
223 ++ testname=self.testname()
224 ++ testdir = self.testdir()
225 ++ dockerfile="testbuilds/opensuse15-ninja-sdl2.dockerfile"
226 ++ addhosts = self.local_addhosts(dockerfile)
227 ++ savename = docname(dockerfile)
228 ++ saveto = SAVETO
229 ++ images = IMAGES
230 ++ build = "build --build-arg=no_check=true"
231 ++ cmd = "docker {build} . -f {dockerfile} {addhosts} --tag {images}:{testname}"
232 ++ sh____(cmd.format(**locals()))
233 ++ cmd = "docker rm --force {testname}"
234 ++ sx____(cmd.format(**locals()))
235 ++ cmd = "docker run -d --name {testname} {images}:{testname} sleep 60"
236 ++ sh____(cmd.format(**locals()))
237 ++ #:# container = self.ip_container(testname)
238 ++ cmd = "docker exec {testname} ls -l /usr/local/bin"
239 ++ sh____(cmd.format(**locals()))
240 ++ cmd = "docker exec {testname} find /usr/local/include -type f"
241 ++ sh____(cmd.format(**locals()))
242 ++ cmd = "docker exec {testname} bash -c 'ls -l /usr/local/lib64/libzz*'"
243 ++ sh____(cmd.format(**locals()))
244 ++ #
245 ++ cmd = "docker exec {testname} bash -c 'test -d /usr/local/include/SDL_rwops_zzip'"
246 ++ sh____(cmd.format(**locals()))
247 ++ #
248 ++ cmd = "docker rm --force {testname}"
249 ++ sx____(cmd.format(**locals()))
250 ++ cmd = "docker rmi {saveto}/{savename}:latest"
251 ++ sx____(cmd.format(**locals()))
252 ++ cmd = "docker tag {images}:{testname} {saveto}/{savename}:latest"
253 ++ sh____(cmd.format(**locals()))
254 ++ cmd = "docker rmi {images}:{testname}"
255 ++ sx____(cmd.format(**locals()))
256 ++ self.rm_testdir()
257 + def test_701_centos7_am_docs_dockerfile(self):
258 + if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
259 + testname=self.testname()
260 +@@ -1520,6 +1556,53 @@ class ZZiplibBuildTest(unittest.TestCase):
261 + cmd = "docker rm --force {testname2}"
262 + sx____(cmd.format(**locals()))
263 + self.rm_testdir()
264 ++ def test_9431_opensuse_ninja_sdl2_dockerfile(self):
265 ++ if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
266 ++ testname1=self.testname() + "_1"
267 ++ testname2=self.testname() + "_2"
268 ++ testdir = self.testdir()
269 ++ dockerfile1="testbuilds/opensuse15-sdl2.dockerfile"
270 ++ dockerfile2="testbuilds/opensuse15-ninja-sdl2.dockerfile"
271 ++ addhosts = self.local_addhosts(dockerfile1)
272 ++ savename1 = docname(dockerfile1)
273 ++ savename2 = docname(dockerfile2)
274 ++ saveto = SAVETO
275 ++ images = IMAGES
276 ++ cmd = "docker rm --force {testname1}"
277 ++ sx____(cmd.format(**locals()))
278 ++ cmd = "docker rm --force {testname2}"
279 ++ sx____(cmd.format(**locals()))
280 ++ cmd = "docker run -d --name {testname1} {addhosts} {saveto}/{savename1} sleep 600"
281 ++ sh____(cmd.format(**locals()))
282 ++ cmd = "docker run -d --name {testname2} {addhosts} {saveto}/{savename2} sleep 600"
283 ++ #
284 ++ sh____(cmd.format(**locals()))
285 ++ cmd = "docker exec {testname2} bash -c 'cd /usr/local && tar czvf /local.tgz .'"
286 ++ sh____(cmd.format(**locals()))
287 ++ cmd = "docker cp {testname2}:/local.tgz tmp.local.tgz"
288 ++ sh____(cmd.format(**locals()))
289 ++ cmd = "docker cp tmp.local.tgz {testname1}:/local.tgz"
290 ++ sh____(cmd.format(**locals()))
291 ++ cmd = "rm tmp.local.tgz"
292 ++ sh____(cmd.format(**locals()))
293 ++ cmd = "docker exec {testname1} mkdir -p /new/local"
294 ++ sh____(cmd.format(**locals()))
295 ++ cmd = "docker exec {testname1} bash -c 'cd /new/local && tar xzvf /local.tgz'"
296 ++ sh____(cmd.format(**locals()))
297 ++ #
298 ++ item="{}"
299 ++ end="\\;"
300 ++ cmd = "docker exec {testname1} diff -urw --no-dereference /usr/local /new/local"
301 ++ sx____(cmd.format(**locals()))
302 ++ out = output(cmd.format(**locals()))
303 ++ self.assertFalse(greps(out, "---"))
304 ++ self.assertFalse(greps(out, "Only"))
305 ++ #
306 ++ cmd = "docker rm --force {testname1}"
307 ++ sx____(cmd.format(**locals()))
308 ++ cmd = "docker rm --force {testname2}"
309 ++ sx____(cmd.format(**locals()))
310 ++ self.rm_testdir()
311 + def test_9711_centos7_docs_dockerfile(self):
312 + if not os.path.exists(DOCKER_SOCKET): self.skipTest("docker-based test")
313 + testname1=self.testname() + "_1"
314 +diff --git a/testbuilds/opensuse15-ninja-sdl2.dockerfile b/testbuilds/opensuse15-ninja-sdl2.dockerfile
315 +new file mode 100644
316 +index 0000000..8a46dd4
317 +--- /dev/null
318 ++++ b/testbuilds/opensuse15-ninja-sdl2.dockerfile
319 +@@ -0,0 +1,24 @@
320 ++FROM opensuse/leap:15.1
321 ++ARG no_check=false
322 ++ARG no_install=false
323 ++# -DMAKE_INSTALL_PREFIX:PATH=/usr
324 ++
325 ++RUN zypper refresh repo-oss
326 ++RUN zypper install -r repo-oss -y gcc zlib-devel python3 cmake unzip zip gzip tar libSDL2-devel ninja
327 ++
328 ++RUN mkdir src
329 ++COPY CMakeLists.txt README COPYING.LIB ChangeLog src/
330 ++COPY CMakeScripts src/CMakeScripts
331 ++COPY bins src/bins
332 ++COPY docs src/docs
333 ++COPY test src/test
334 ++COPY SDL src/SDL
335 ++COPY zzipwrap src/zzipwrap
336 ++COPY zzip src/zzip
337 ++
338 ++RUN mkdir src/build
339 ++RUN cd src/build && cmake .. -GNinja
340 ++RUN cd src/build && ninja
341 ++RUN $no_check || (cd src/build && ninja check VERBOSE=1)
342 ++RUN $no_install || (cd src/build && ninja install)
343 ++
344
345 diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
346 index e127af63717..c47cd2c82f8 100644
347 --- a/dev-libs/zziplib/metadata.xml
348 +++ b/dev-libs/zziplib/metadata.xml
349 @@ -1,7 +1,14 @@
350 <?xml version="1.0" encoding="UTF-8"?>
351 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
352 <pkgmetadata>
353 - <!-- maintainer-needed -->
354 + <maintainer type="person">
355 + <email>gentoo@××××××××.net</email>
356 + <name>Volkmar W. Pogatzki</name>
357 + </maintainer>
358 + <maintainer type="project">
359 + <email>proxy-maint@g.o</email>
360 + <name>Proxy Maintainers</name>
361 + </maintainer>
362 <upstream>
363 <remote-id type="sourceforge">zziplib</remote-id>
364 </upstream>
365
366 diff --git a/dev-libs/zziplib/zziplib-0.13.71.ebuild b/dev-libs/zziplib/zziplib-0.13.71.ebuild
367 new file mode 100644
368 index 00000000000..c325793d994
369 --- /dev/null
370 +++ b/dev-libs/zziplib/zziplib-0.13.71.ebuild
371 @@ -0,0 +1,68 @@
372 +# Copyright 1999-2020 Gentoo Authors
373 +# Distributed under the terms of the GNU General Public License v2
374 +
375 +EAPI=7
376 +
377 +PYTHON_COMPAT=( python3_{7,8} )
378 +inherit cmake eutils flag-o-matic python-any-r1
379 +
380 +DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
381 +HOMEPAGE="http://zziplib.sourceforge.net/"
382 +SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
383 +
384 +LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
385 +SLOT="0"
386 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
387 +IUSE="doc sdl static-libs test"
388 +
389 +RESTRICT="!test? ( test )"
390 +
391 +BDEPEND="
392 + doc? (
393 + ${PYTHON_DEPS}
394 + )
395 + test? (
396 + ${PYTHON_DEPS}
397 + app-arch/zip
398 + )
399 +"
400 +DEPEND="
401 + sys-libs/zlib
402 + sdl? ( >=media-libs/libsdl-1.2.6 )
403 +"
404 +RDEPEND="${DEPEND}"
405 +
406 +PATCHES=(
407 + "${FILESDIR}"/zziplib-0.13.69-009-perror.patch
408 + "${FILESDIR}"/zziplib-0.13.71-join-paths-pc-zzipsdldir.patch
409 + "${FILESDIR}"/zziplib-0.13.71-find-bash.patch
410 + "${FILESDIR}"/zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch
411 + "${FILESDIR}"/zziplib-0.13.71-shell-DESTDIR.patch
412 +)
413 +
414 +pkg_setup() {
415 + use test && python-any-r1_pkg_setup
416 +}
417 +
418 +src_prepare() {
419 + cmake_src_prepare
420 +
421 + (use test || use doc) && python_fix_shebang .
422 +}
423 +
424 +src_configure() {
425 + append-flags -fno-strict-aliasing # bug reported upstream
426 +
427 + append-cppflags -D_ZZIP_LARGEFILE
428 + local mycmakeargs=(
429 + -DZZIPCOMPAT=OFF
430 + -DZZIPSDL="$(usex sdl ON OFF)"
431 + -DBUILD_STATIC_LIBS="$(usex static-libs ON OFF)"
432 + -DBUILD_TESTS="$(usex test ON OFF)"
433 + -DZZIPTEST="$(usex test ON OFF)"
434 + -DZZIPDOCS="$(usex doc ON OFF)"
435 + -DZZIPWRAP=OFF
436 + )
437 +
438 + cmake_src_configure
439 +}