dev-libs/libqtxdg : version bump

3 files changed, 18 insertions, 58 deletions

diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index d9344a28..ffdb1158 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,2 +1 @@
-DIST libqtxdg-3.1.0.tar.xz 66680 BLAKE2B fda51535766cd455f718902709c95635eb44d6bddc0806fcbfacaa7bf3143eb09dbd8bd500e642fd9936bc22abf817c4a41df4d778ac4a7cdc8095e10cb49d38 SHA512 58c02b804a5fac38e13cfd0ea5b9c5dc547d2f0a4324ac2f8d62d6050164f3f19edf48c5466a227fc3439f76436db4535ae1855dc21c4d92fe086c89267754fd
-DIST libqtxdg-3.2.0.tar.xz 67736 BLAKE2B addc2636a9bbaa0163c3d344337eca9f350ffb38f4d0e785ade9775fc7d3e38c6f7a3c6c8d8d05e7b491f0cf2c34f5ceb8d51d34eb05b56e4170e190a5b5ae4c SHA512 1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143
+DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
diff --git a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
deleted file mode 100644
index 438795b5..00000000
--- a/dev-libs/libqtxdg/libqtxdg-3.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils virtualx
-
-DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://lxqt.org/"
-
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-KEYWORDS="amd64"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
-}
diff --git a/dev-libs/libqtxdg/libqtxdg-3.1.0-r1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index 438795b5..6093c409 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.1.0-r1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit cmake-utils virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
-SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-KEYWORDS="amd64"
+SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
 SLOT="0"
 IUSE="test"
 
-CDEPEND="
+BDEPEND="
+	>=lxqt-base/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5=
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	x11-misc/xdg-utils
 "
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils
-"
 
 src_configure() {
 	local mycmakeargs=(
@@ -38,5 +40,6 @@ src_configure() {
 }
 
 src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
 }