| 1 |
commit: 673c65194dd7efd05a45db958d0fb9c4d861b155 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Tue Sep 15 14:15:48 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 17 06:12:38 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673c6519 |
| 7 |
|
| 8 |
dev-libs/zziplib: enable tests |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/17564 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../zziplib-0.13.71-installing-man3-pages.patch | 25 +++++++++++++++++++--- |
| 16 |
dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild | 13 +++++++++++ |
| 17 |
2 files changed, 35 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch |
| 20 |
index 08130f958dd..55fb4be7a51 100644 |
| 21 |
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch |
| 22 |
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch |
| 23 |
@@ -1,9 +1,28 @@ |
| 24 |
-# https://github.com/gdraheim/zziplib/issues/93 |
| 25 |
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt |
| 26 |
-index b679f7b..e2887ee 100644 |
| 27 |
+index b679f7b..cafa6b4 100644 |
| 28 |
--- a/docs/CMakeLists.txt |
| 29 |
+++ b/docs/CMakeLists.txt |
| 30 |
-@@ -190,7 +190,7 @@ add_custom_target(install-manpages |
| 31 |
+@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar |
| 32 |
+ COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_" |
| 33 |
+ COMMAND ${BASH} -c "chmod 664 man3/*.3" |
| 34 |
+ COMMAND ${BASH} -c "tar cf manpages.tar man3" |
| 35 |
+- COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true" |
| 36 |
++ COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true" |
| 37 |
+ DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml |
| 38 |
+ VERBATIM) |
| 39 |
++if(ZZIP_HTMPAGES) |
| 40 |
+ add_custom_command(OUTPUT htmpages.tar |
| 41 |
+ COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html" |
| 42 |
+ COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml |
| 43 |
+@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar |
| 44 |
+ COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true" |
| 45 |
+ DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml |
| 46 |
+ VERBATIM) |
| 47 |
++endif() |
| 48 |
+ |
| 49 |
+ add_custom_target(manpages DEPENDS manpages.tar) |
| 50 |
+ add_custom_target(htmpages DEPENDS htmpages.tar) |
| 51 |
+@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES) |
| 52 |
endif() |
| 53 |
if(ZZIP_MANPAGES) |
| 54 |
install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")") |
| 55 |
|
| 56 |
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild |
| 57 |
index cc20d2152c5..a4e536480be 100644 |
| 58 |
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild |
| 59 |
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild |
| 60 |
@@ -40,6 +40,14 @@ pkg_setup() { |
| 61 |
python-any-r1_pkg_setup |
| 62 |
} |
| 63 |
|
| 64 |
+src_prepare() { |
| 65 |
+ sed -e "/^topsrcdir/s:..\/..::" \ |
| 66 |
+ -e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \ |
| 67 |
+ -e 's:\(..\/\)\+{exe}:{exe}:' \ |
| 68 |
+ -i test/zziptests.py || die |
| 69 |
+ cmake_src_prepare |
| 70 |
+} |
| 71 |
+ |
| 72 |
src_configure() { |
| 73 |
append-flags -fno-strict-aliasing # bug reported upstream |
| 74 |
|
| 75 |
@@ -54,3 +62,8 @@ src_configure() { |
| 76 |
|
| 77 |
cmake_src_configure |
| 78 |
} |
| 79 |
+ |
| 80 |
+src_test() { |
| 81 |
+ cd "$S"/test/ || die |
| 82 |
+ ${EPYTHON} "$S"/test/zziptests.py || die |
| 83 |
+} |
Archives