From 1ebbd704ff7ab0176d172d0a4e969f8e000b521c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 14 Sep 2023 11:56:08 -0400
Subject: [PATCH] zim-tools: update to 3.2.0, add dummy subpackages

libzim-tools: change to dummy subpackage, no longer replaced by libzim
zimwriterfs: change to dummy subpackage, source merged into zim-tools
---
 srcpkgs/libzim-tools          |  1 +
 srcpkgs/libzim-tools/template | 10 ----------
 srcpkgs/zim-tools/template    | 23 +++++++++++++++++++----
 srcpkgs/zimwriterfs           |  1 +
 srcpkgs/zimwriterfs/template  | 14 --------------
 5 files changed, 21 insertions(+), 28 deletions(-)
 create mode 120000 srcpkgs/libzim-tools
 delete mode 100644 srcpkgs/libzim-tools/template
 create mode 120000 srcpkgs/zimwriterfs
 delete mode 100644 srcpkgs/zimwriterfs/template

diff --git a/srcpkgs/libzim-tools b/srcpkgs/libzim-tools
new file mode 120000
index 00000000000..3b15a55d051
--- /dev/null
+++ b/srcpkgs/libzim-tools
@@ -0,0 +1 @@
+zim-tools
\ No newline at end of file
diff --git a/srcpkgs/libzim-tools/template b/srcpkgs/libzim-tools/template
deleted file mode 100644
index 74530543c43..00000000000
--- a/srcpkgs/libzim-tools/template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libzim-tools'
-pkgname=libzim-tools
-version=4.0.0
-revision=1
-build_style=meta
-depends="zim-tools"
-short_desc="Libzim-tool (transitional dummy package)"
-maintainer="John Zimmermann <me@johnnynator.dev>"
-license="GPL-3.0-or-later"
-homepage="http://www.openzim.org"
diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index aeed97a5a7c..36b1972d0ee 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,14 +1,29 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
-version=2.1.0
+version=3.2.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel
-gumbo-parser-devel docopt.cpp-devel file-devel"
+ gumbo-parser-devel docopt.cpp-devel file-devel Mustache zlib-devel"
+checkdepends="gtest-devel"
 short_desc="Various ZIM command line tools"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="http://www.openzim.org"
-distfiles="https://github.com/openzim/zim-tools/archive/${version}.tar.gz"
-checksum=f579c8ccca555a8b25bac799efc361f18a2a9a5152af5fc84eb3dc90c5ed70a2
+changelog="https://raw.githubusercontent.com/openzim/zim-tools/main/ChangeLog"
+distfiles="https://github.com/openzim/zim-tools/archive/refs/tags/${version}.tar.gz"
+checksum=ba67da31da199ff8c759ca156501d216a5175fcea72b7e7e6b7b358e5de4af54
+make_check=no # Tests are broken upstream, see https://github.com/openzim/zim-tools/issues/345
+
+libzim-tools_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+zimwriterfs_package() {
+	build_style=meta
+	short_desc+=" - transitional dummy package"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
diff --git a/srcpkgs/zimwriterfs b/srcpkgs/zimwriterfs
new file mode 120000
index 00000000000..3b15a55d051
--- /dev/null
+++ b/srcpkgs/zimwriterfs
@@ -0,0 +1 @@
+zim-tools
\ No newline at end of file
diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
deleted file mode 100644
index bf13bf7e65b..00000000000
--- a/srcpkgs/zimwriterfs/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'zimwriterfs'
-pkgname=zimwriterfs
-version=1.3.7
-revision=3
-build_style=meson
-hostmakedepends="pkg-config"
-makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel
- xapian-core-devel"
-short_desc="Tool for creating ZIM files based on contents on local filesystem"
-maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/openzim/zimwriterfs"
-distfiles="https://github.com/openzim/zimwriterfs/archive/${version}.tar.gz"
-checksum=d55e13194e29100bf88bb201c5661ab7d2600a9e45c6caeb2a21647cdbf6cb4e