gentoo resync : 25.08.2020

5 files changed, 2 insertions, 123 deletions

diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index a2df36707a25..4363eb53667f 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,8 +1,3 @@
-AUX liblxqt-0.14.1-qt-5.14-build.patch 599 BLAKE2B cd09cdd37c3c4ba497ef7264eccd12b8df4385c797fb658255f39c885b259776f70dd15759fda04808f42e58baca8d3471860c6976970f6f7c41457c1a9a66d0 SHA512 09929870c04aeab8d70bff04367da429d43f1258d35f1bb367795e8827d43d3b450ad90843d70199cb4e42d9bdfc67a66cf33fa67a21c6387ed181c1fee512f6
-DIST liblxqt-0.14.1.tar.xz 81704 BLAKE2B 9aa190fce337068d02962af90c1847acd51a63c44019c9ccdc729dea00d52cd65826e50850e913306f5e6f0a20d1e25b4f90cd09ebb9012c2c3337aaeaa3665f SHA512 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
-DIST liblxqt-0.15.0.tar.xz 80624 BLAKE2B 0f5b1fede9460dddd2a506e4945ad81c8e7121e74178833664b838c3acd88451a3c17e8e4db2e6a34e14ef0638760fee36273abb4c6d3f93014d402d069633c3 SHA512 6693be070fe641d590e3187abb2797ea470af5101efc4e9aed88a12cb28cc31aff60b6086cf717cd778353b50164d2365d88968a96a7fa00f6bc53e6855ddf7f
 DIST liblxqt-0.15.1.tar.xz 80040 BLAKE2B f729bf1b10a35b97d71f2e95a35999d3f246b4e59cdce25e32ab2a72ed5be50a443db0c841dcd0d41deb25e130c91cf75a5ba384ae4c1e6d92aa306e0b4eb75d SHA512 a0eb00ca5b228ef32d1a3952d3cb4702273dda16c9e70cc75046bfe1f51e5a7849d5306cca9d616ff82bd91715d97d703c458d406ba9e2425aa3fd26f155493c
-EBUILD liblxqt-0.14.1.ebuild 921 BLAKE2B e6422d743906d0b25c2c06b047f1115380297bd87c6318f2e4a7d710bd559c5c404ec219fbb709240974885cccab55a82935e727d1c5aabe3b7cf988ceccc2c7 SHA512 3b0ff68fe141e1597cc6016948a1a0805c86015549ebb48a099d4c9b06f9518420ffbdee976db3cd507a7faf024287020a3a04a7390439d399de15816aa88350
-EBUILD liblxqt-0.15.0.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
-EBUILD liblxqt-0.15.1.ebuild 1014 BLAKE2B 6d503f2d768c14e42884ae25af54b943d486d6e300646bc26adebd4833247aaf214ef00f434c6a7f3494b7ec89884441b303e56cff389e695f1d3513aacd171f SHA512 bb15dfab5f8b2f874b6db41d403e6a22f7ff9d3ff88811aba69c9c0034ee49770bf2e8fadfd5cec81760a127dfc668548601597c9cc3a676cd1888150690b629
+EBUILD liblxqt-0.15.1.ebuild 1012 BLAKE2B 710ae3e812f388b9399fafda307e8d18bac56cd26d747862960284afeb5e04f353929ded81b2f7b6e6f5f8850c91d4e6a1c8bab4ba23502a0566601cd9601595 SHA512 37f135c5af73d2572c52f0d736215a50c072c0a62aa5f1141f5f98ca9c164e968faf578ff8057048e9baf5c702f9fcfe8b213f1843927e571af4a1e521677352
 MISC metadata.xml 395 BLAKE2B 8f890c4837644e26eeed09ff318d3058271adf60b91b7f94246107ab748c36c8adac766a3020ab50ba900e3287cd891f4a6e708784a2835f3629736429ea60b4 SHA512 2dd16d3ce72b587d4ae4589202a7a06ad34d58067d706ce757d89b3c7da23ef2a2af4ea39f93dc22246557e3ebb62f65d6a0b50961614ce7e3218693b9d664cc
diff --git a/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch b/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch
deleted file mode 100644
index 54fd90676ea3..000000000000
--- a/lxqt-base/liblxqt/files/liblxqt-0.14.1-qt-5.14-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 534c6f6b5240daa81a2b6206a8ec028a69ee5c2d Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Mon, 23 Dec 2019 21:20:16 +0200
-Subject: [PATCH] Fix build with Qt 5.14.
-
----
- lxqtpowermanager.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lxqtpowermanager.cpp b/lxqtpowermanager.cpp
-index aef5ca2..b0926f9 100644
---- a/lxqtpowermanager.cpp
-+++ b/lxqtpowermanager.cpp
-@@ -32,6 +32,7 @@
- #include <QApplication>
- #include <QDesktopWidget>
- #include <QtDebug>
-+#include <QFile>
- #include "lxqttranslator.h"
- #include "lxqtglobals.h"
- #include "lxqtsettings.h"
--- 
-2.24.1
-
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
deleted file mode 100644
index bc9392311f73..000000000000
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Common base library for the LXQt desktop environment"
-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+ BSD"
-SLOT="0/$(ver_cut 1-2)"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14-build.patch" ) # Bug 703596
-
-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
-	kde-frameworks/kwindowsystem:5[X]
-	sys-auth/polkit-qt
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/liblxqt/liblxqt-0.15.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.15.0.ebuild
deleted file mode 100644
index 70e3a186da24..000000000000
--- a/lxqt-base/liblxqt/liblxqt-0.15.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Common base library for the LXQt desktop environment"
-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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+ BSD"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+backlight"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.5.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	backlight? ( sys-auth/polkit-qt )
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_BACKLIGHT_LINUX_BACKEND=$(usex backlight)
-	)
-	cmake_src_configure
-}
diff --git a/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
index 70e3a186da24..f540ebffc07f 100644
--- a/lxqt-base/liblxqt/liblxqt-0.15.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.15.1.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+ BSD"