gentoo resync : 25.08.2020

4 files changed, 2 insertions, 78 deletions

diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index 77650203df7c..e7a03abe83ed 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,9 +1,5 @@
 AUX lxqt-qtplugin-0.15.1-adjust-highlight-colour.patch 1176 BLAKE2B 852339a8c528003a9b1936280c0395bdc98d436a9d56b8724af38e9f0da5b592b4f14fe3b8dbd772ebbc93767b92081d51b1a836fd88bb5a9259e34d8684729c SHA512 5464945e89664dc549219c79c0543f2cd3808c3343b9a2414e96cf22a8d991536a89f788850c2d42d0b154b240babc920cb9639c6caab3d3d2668bfd3f6167e9
 AUX lxqt-qtplugin-0.15.1-no-widget-reset.patch 1425 BLAKE2B bfadcf1d815544c25c6854a193e82c5421f49782351298b93558f8925147396a750df006c82b3e681b30769cc7cf892166b9f8427412bc07d7bdc9ab75b405d2 SHA512 0058e56b9731c49732d59863b5923b5d52830111e8f690f2433a5fe48efbc840ab014e7882ffe96110c5ec439bec3b82b95057dc2825ce9061dd18b707c23880
-DIST lxqt-qtplugin-0.14.0.tar.xz 22336 BLAKE2B 8155722880cff279aa26676ed425a011b2259ba94bf92122c59643a0ac6dd89b2841bcbeeac26ac24ef1e351dcdbcabf339c4a2bcee2dac30f2f9298434f7294 SHA512 33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c
-DIST lxqt-qtplugin-0.15.0.tar.xz 22776 BLAKE2B 642270939ddaf9884da611d800c6ccae518a2c259e2da37c3e0025e24a6a11bae1d21cc9d4141821dfcf2e6e4c9b383e800dc68ff9d5f9b39f2e27e121d158c7 SHA512 9a73b9d38e1c2e2e030b551f92d53afef69fedee8f0ff4c7147680c0037a3eacb98f5514e09f16762c03cdaded7e5f760a89d66461bab4d7e8877ebaba28160e
 DIST lxqt-qtplugin-0.15.1.tar.xz 23100 BLAKE2B 91f6a90f435a33fd19863f9989b0603590c51f5921ad0837c025437b6fbd50105c70a47028137562af1deb6892fadea05ca3924eee8e2ba8b91a41069ad2ca47 SHA512 6fc19cf5f763d7879e5a052c5638b5b396f659f4e199493c8b87cdb661c910921ecda865de2900a047c96dd63c3ef6dbfa486d1dbe0257c26984a25a139dce2f
-EBUILD lxqt-qtplugin-0.14.0.ebuild 759 BLAKE2B ab40da027a91ca08d3463b7ccd0327d35b54f7f4c31c94e1715af8be860d51ad4ec6cf78f8eb28c83bbf92ed7f7d8fff52de3a1938f89be57c2d9a1e6e2ca0a1 SHA512 1c6d44ddc628ea86b95f138177f714c8b070d85d7f4b5fbe102a4703ffb5406dd510e743e69ea07125c91b2a185a89ec350540e90a9e9c3824964790172fb617
-EBUILD lxqt-qtplugin-0.15.0-r1.ebuild 766 BLAKE2B b660e7693e7208ff939d901d27a4cd2862ed04d5a0fa1f338b7f866c7d616fccc0f3dfa99baf3622dc3fabb1040ecab8df813486338a9285c667d0f322e40844 SHA512 f76ad68199feb6054b01e50e747797e0f326ad0d55a653b3d383f6e672e1e73e942f26d1ab0c0997b6eb0e004b8fbb21f7905143835f43758eecc8d0c6c50df4
-EBUILD lxqt-qtplugin-0.15.1.ebuild 937 BLAKE2B 8bb925be7a11fa376bc6ac740ec3da5af5e1a2eeca372f5e50654742015e6743fb5b355a4654f7ce726a08b608b9cc2b078a8054d32b233646c542c86e3dbbc6 SHA512 1e0a88a9cd8d2c4fa4a19b2d74726a3d3f53abc1f2f2f3034ed9d60f042a93c24f702fde9d1d95373406d9a7ad35151d4994f1b604a63cb9fc5f7d2b939781c0
+EBUILD lxqt-qtplugin-0.15.1.ebuild 935 BLAKE2B ddcf271d937b659084d6d425093ef97d2950ffc78306c63a1b76eb99c236b9ec82f98b73e9d8f7c3d24f9b55e03a84489a6b6169c9311823b8d600dac1a90d56 SHA512 7e10ae79ed09c59e941fa7928697260cb2bdd0d1462c28f8a2433f4334707778c3ac44b7ecfcf09180c5ea31bbb52f41ef22e55c47e60d7e333f1c93a778089c
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
deleted file mode 100644
index 31a4270558c9..000000000000
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt system integration plugin for Qt"
-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"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	dev-libs/libdbusmenu-qt:=[qt5(+)]
-	>=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
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.0-r1.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.0-r1.ebuild
deleted file mode 100644
index 00aeff17f9a7..000000000000
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt system integration plugin for Qt"
-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+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.7.0
-"
-DEPEND="
-	dev-libs/libdbusmenu-qt:=[qt5(+)]
-	>=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
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-"
-RDEPEND="${DEPEND}"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
index 8e1b6244cc75..1c04c29f50f3 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.15.1.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-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+"