gentoo resync : 25.08.2020

5 files changed, 2 insertions, 112 deletions

diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index 28e9d30afd80..23af7d5976d4 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1,8 +1,3 @@
-AUX lxqt-globalkeys-0.14.1-qt-5.14-build.patch 542 BLAKE2B 315dad9ddb192a58b1d29aff091605e434b2f755c4db6f28b956341b39ab6bcb3b17e98c64b6ca06ee290f67b8811fa78ed981422c96b894cd59bce68dd35d9a SHA512 109ec2d1ed733c55be8a00402405e800cca143e0ef1de8f639c0166f75f512326a17ec17a4a71a35a23d82c144c9daab778e8ea75a749d63e9e2975a5e0362aa
-DIST lxqt-globalkeys-0.14.1.tar.xz 63496 BLAKE2B 9186b04d290260503a133f4baf9e4156abc056647687f518eaf460c8bd0e4e48d7f4639d1f51ab87f9adc1e2139f0315940eb3da5d098b3b0824e98ae97eee90 SHA512 7683971a916adb0dff8efd5567dad11e0860e48960bb6ed650aa2cd8e1bc33f7b8cbff95e19f198e00b61eea4f7492b41e7a0acf19365143c1c0ce8ea0cbb2a3
-DIST lxqt-globalkeys-0.14.3.tar.xz 67928 BLAKE2B 0298d393b17801a6dc9923299ab8ec8dc27368da0ff2514910e4e04e9a7788e09e9a6a097f4d7cb46f6e120537d4e7ebf0e50ec766086cb086bd9e871c2115b4 SHA512 205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c
 DIST lxqt-globalkeys-0.15.0.tar.xz 68932 BLAKE2B eedf706b9bb65c4c9a05dd122f627349a35ce6d4daf514ac2697dff8466a74fc85636c4b113919fd115b419d1430f5c5549350aa36c2b9cac857e2fbe47b186b SHA512 95beba4ce6c2324582d93a6f3f56d57681ec7d992db80a8d9fae34a637ba1612260932944e3865c3c749982e6aa111b3495558bc5d36e8b4c8e21027775e346e
-EBUILD lxqt-globalkeys-0.14.1.ebuild 887 BLAKE2B e8a280550046095a9c57036c56a6a22d4a0a410143a9fce7d40e290600a3e9c2e71b27273c0c38e1cf0f4f9ca7d7dcfb6d12284f8de59581904790f2c3a7d51d SHA512 0ecc040bc9f61620b32b530801b18c8c619126dfd33bc25280a5ba67c48e74f05faf8d727f4ddfb5ed4b12644910d8919a6036ab64984ce75cd890039d12f408
-EBUILD lxqt-globalkeys-0.14.3.ebuild 895 BLAKE2B 262abf50d02965892328d669e2d795c09f199d679bce42510cf37f751d2bb06b7f04d16526f6a8293fd8b6fe833fd53cbcb6a64a0917890e4b66b87d91847496 SHA512 1f6f0f70c4e6c2487917c92d6318409618d3ed55c7beae462c0f04aee041980e6df6c02aff832b01a0328de65437cee7f3b3e15c0d28f9ad8577c84110347982
-EBUILD lxqt-globalkeys-0.15.0.ebuild 851 BLAKE2B 5452dc96540d6a6b6708e00f030e7f1c5f1ec2b5786a935d958f0805bb9221b150b022c034c83e8a506a5123d3ee1ffbd2d01c4b3e52fade07e5749baa04b80e SHA512 7ddb2a7c928d5a7c1e9a45e3c691f15eabb73ecf6e1373196b52cef8b77d2e7452a5ce76bb2dc64b48383e0109a9214a4e6eaea480868fbe4aeaa35e6bc27936
+EBUILD lxqt-globalkeys-0.15.0.ebuild 849 BLAKE2B 03dcd916d72123dc21c9f45448d95cf9395056885237338892dac347092876fb83c6bd547ab6574553a262eccc368cb43c81ee849a746f73f5a0c1a1bf391b0e SHA512 f5c96c25bed6627d5d817a80796a78c2ff718e484fe8ae44189e7558c20817242e6525fe03d3696c24892f94b9449191cfa3a036c957d2d18a2fdf81cb2199bf
 MISC metadata.xml 321 BLAKE2B e4171574ab9b2b3ce038ad57a140049f2835aaad88c8ff7d372e3f65f2b696d27719c1dc2c1b8e98ad6dc657eae88405fb2e9d0a5c88ba48db772f30b1511e5b SHA512 2ab81bdddeec9b554082577559910d8d7f6def6aece5bc1ede46d5d74e5f1e23f86b6256f4e7b6cd55e88523261dcccda4970f26016a817c922d0249fcc30589
diff --git a/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
deleted file mode 100644
index b545f5de61bf..000000000000
--- a/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001
-From: Chih-Hsuan Yen <yan12125@gmail.com>
-Date: Sun, 15 Dec 2019 09:33:12 +0800
-Subject: [PATCH] Fix building with Qt 5.14
-
----
- daemon/core.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/core.cpp b/daemon/core.cpp
-index 1be64ec..53bdf7b 100644
---- a/daemon/core.cpp
-+++ b/daemon/core.cpp
-@@ -33,6 +33,7 @@
- #include <QTimer>
- #include <QDBusConnectionInterface>
- #include <QDBusServiceWatcher>
-+#include <QFile>
- 
- #include <cstddef>
- #include <cstdlib>
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
deleted file mode 100644
index 0fb056d46ac8..000000000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" )
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	kde-frameworks/kwindowsystem:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
deleted file mode 100644
index 5451fd0c6a6d..000000000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}/${PN}-0.14.1-qt-5.14-build.patch" )
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	kde-frameworks/kwindowsystem:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
index 49455e5c9f04..83794fcd66fd 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1 LGPL-2.1+"