jreen: switch to qt5 and drop jreen-qt5 package

common/shlibs

@@ -1997,7 +1997,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
-libjreen.so.1 jreen-1.2.1_1
 libuecc.so.0 libuecc-5_1
 libKF5WindowSystem.so.5 kwindowsystem-5.6.0_1
 libKF5GuiAddons.so.5 kguiaddons-5.6.0_1
@@ -2078,7 +2077,7 @@ 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-0.7.3_2
-libjreen-qt5.so.1 jreen-qt5-1.2.0_1
+libjreen-qt5.so.1 jreen-1.3.0_1
 libzen.so.0 libzen-0.4.31_1
 libmediainfo.so.0 libmediainfo-0.7.75_1
 libnghttp2.so.14 nghttp2-1.0.2_1

srcpkgs/jreen-qt5

@@ -0,0 +1 @@
+jreen

srcpkgs/jreen-qt5-devel

@@ -1 +1 @@
-jreen-qt5
+jreen

srcpkgs/jreen-qt5/template

@@ -1,28 +0,0 @@
-# Template file for 'jreen'
-pkgname=jreen-qt5
-version=1.3.0
-revision=1
-wrksrc="${pkgname%-*}-${version}"
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="LGPL-3"
-homepage="https://github.com/euroelessar/jreen"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
-
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
-jreen-qt5-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/*.so
-		vmove usr/lib/pkgconfig
-	}
-}

srcpkgs/jreen/template

@@ -1,20 +1,23 @@
 # Template file for 'jreen'
 pkgname=jreen
-version=1.2.1
+version=1.3.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DJREEN_FORCE_QT4=yes"
 hostmakedepends="pkg-config"
-makedepends="gsasl-devel speex-devel qt-devel zlib-devel"
+makedepends="gsasl-devel speex-devel qt5-devel zlib-devel"
-short_desc="Extensible XMPP library written in C++ using Qt"
+short_desc="Qt5 Jabber/XMPP extensible library"
-maintainer="Duncan Overbruck <mail@duncano.de>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-2"
+license="LGPL-3.0-or-later"
-homepage="http://qutim.org/jreen"
+homepage="https://github.com/euroelessar/jreen"
-distfiles="http://github.com/euroelessar/${pkgname}/archive/v${version}.tar.gz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=be5de04b6f54e47bdec92707600441a39e46add958181ad2b5b2d1bf92693fbd
+checksum=f93c3d338c011c0945dacb14eb9da3be9541028c9eaa6f2024e688eb8a49b07e
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-host-tools qt5-devel"
+fi
 
 jreen-devel_package() {
-	depends="jreen>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -22,3 +25,15 @@ jreen-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
+
+jreen-qt5_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+jreen-qt5-devel_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="jreen-devel>=${version}_${revision}"
+}