From f5ee759220a08b3a8aa9dcf42b949a54f54e31af Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sat, 7 Jul 2018 10:45:51 +0200
Subject: [PATCH] quazip: drop qt4 version

---
 common/shlibs                         |  3 +--
 srcpkgs/quazip-qt5                    |  1 +
 srcpkgs/quazip-qt5-devel              |  2 +-
 srcpkgs/quazip-qt5/template           | 29 ------------------------
 srcpkgs/quazip/template               | 32 ++++++++++++++++++---------
 srcpkgs/{quazip-qt5 => quazip}/update |  0
 6 files changed, 25 insertions(+), 42 deletions(-)
 create mode 120000 srcpkgs/quazip-qt5
 delete mode 100644 srcpkgs/quazip-qt5/template
 rename srcpkgs/{quazip-qt5 => quazip}/update (100%)

diff --git a/common/shlibs b/common/shlibs
index 923ed123a09..eeae36f8b2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1958,7 +1958,6 @@ libasignify.so.1 asignify-1.0_1
 libvte2_90.so.9 vte290-0.36.3_1
 libd0_blind_id.so.0 xonotic-0.8.0_1
 libechonest.so.2.3 libechonest-2.3.1_1
-libquazip.so.1 quazip-0.7.1_1
 libqtkeychain.so.0 qtkeychain-0.4.0_1
 libjreen.so.1 jreen-1.2.1_1
 libtelepathy-qt4.so.2 telepathy-qt-0.9.5_1
@@ -2045,7 +2044,7 @@ libKF5Attica.so.5 attica-qt5-5.6.0_1
 libechonest5.so.2.3 libechonest-qt5-2.3.0_1
 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
 liblastfm5.so.1 liblastfm-qt5-1.0.9_1
-libquazip5.so.1 quazip-qt5-0.7.3_2
+libquazip5.so.1 quazip-0.7.3_2
 libjreen-qt5.so.1 jreen-qt5-1.2.0_1
 libtomahawk.so.0.8.99 tomahawk-qt5-0.8.4_13
 libtomahawk-playdarapi.so.0.8.99 tomahawk-qt5-0.8.4_13
diff --git a/srcpkgs/quazip-qt5 b/srcpkgs/quazip-qt5
new file mode 120000
index 00000000000..25332fc361d
--- /dev/null
+++ b/srcpkgs/quazip-qt5
@@ -0,0 +1 @@
+quazip
\ No newline at end of file
diff --git a/srcpkgs/quazip-qt5-devel b/srcpkgs/quazip-qt5-devel
index bcd26a20fdc..25332fc361d 120000
--- a/srcpkgs/quazip-qt5-devel
+++ b/srcpkgs/quazip-qt5-devel
@@ -1 +1 @@
-quazip-qt5
\ No newline at end of file
+quazip
\ No newline at end of file
diff --git a/srcpkgs/quazip-qt5/template b/srcpkgs/quazip-qt5/template
deleted file mode 100644
index 8c78ae69125..00000000000
--- a/srcpkgs/quazip-qt5/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'quazip-qt5'
-pkgname=quazip-qt5
-version=0.7.6
-revision=2
-build_style=cmake
-wrksrc="${pkgname%-*}-${version}"
-hostmakedepends="pkg-config"
-makedepends="qt5-devel zlib-devel"
-short_desc="Qt5/C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
-maintainer="Duncaen <duncaen@voidlinux.eu>"
-license="LGPL-2.1-only"
-homepage="https://github.com/stachenov/quazip"
-distfiles="https://github.com/stachenov/quazip/archive/${version}.tar.gz"
-checksum=4118a830a375a81211956611cc34b1b5b4ddc108c126287b91b40c2493046b70
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-quazip-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/share
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/quazip/template b/srcpkgs/quazip/template
index eead9cdc432..bd759e584a8 100644
--- a/srcpkgs/quazip/template
+++ b/srcpkgs/quazip/template
@@ -1,27 +1,39 @@
 # Template file for 'quazip'
 pkgname=quazip
 version=0.7.6
-revision=1
-build_style=qmake
-build_wrksrc="quazip"
-hostmakedepends="qt-qmake pkg-config"
-makedepends="qt-devel zlib-devel"
-short_desc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
-maintainer="Duncan Overbruck <mail@duncano.de>"
+revision=2
+build_style=cmake
+makedepends="qt5-devel zlib-devel"
+short_desc="Qt5/C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
+maintainer="Duncaen <duncaen@voidlinux.eu>"
 license="LGPL-2.1-only"
 homepage="https://github.com/stachenov/quazip"
 distfiles="https://github.com/stachenov/quazip/archive/${version}.tar.gz"
 checksum=4118a830a375a81211956611cc34b1b5b4ddc108c126287b91b40c2493046b70
 
 if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt-devel"
+	hostmakedepends+=" qt5-host-tools qt5-devel"
 fi
 
 quazip-devel_package() {
-	depends="quazip>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove usr/share
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
+
+quazip-qt5_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="quazip>=${version}_${revision}"
+}
+
+quazip-qt5-devel_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="quazip-devel>=${version}_${revision}"
+}
diff --git a/srcpkgs/quazip-qt5/update b/srcpkgs/quazip/update
similarity index 100%
rename from srcpkgs/quazip-qt5/update
rename to srcpkgs/quazip/update