gentoo auto-resync : 09:11:2022 - 15:26:14

5 files changed, 6 insertions, 64 deletions

diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 5b6f6d4febcc..da1c2116c6b1 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,9 +1,6 @@
-AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e0ad5130d3e8c7f5b4bbe111d8fd0cb4be4a5e29b434395acb1fdf03635681a33965e74df125da0eaecd0fb8b0b7fab5 SHA512 f67478af84a9fb14a7e95e030cf1695febb4b0e7e47949272dd4ebae0b7183f23abb37089017c2b69ced33d3295f9c37035576b913478e347aee01550ee2a80a
-DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57
-DIST qterminal-1.0.0.tar.xz 201644 BLAKE2B e294c575590964710aeb4b433db51844f75fe0f73b966ef5acde148b3f779aa89ae3c5f1d73d3a3877b14d932150702ff871267399cbcab3b4aefc445c942922 SHA512 d3fd04ef94d683aae641367e56185723cf32d2390ab505b956c6736fe674144f6f270ef0def43b1f2d3aec659a2a7735cfb3713da07f49697823f9384572b3a0
 DIST qterminal-1.1.0.tar.xz 209908 BLAKE2B 1ff732f9ae2c84ef063c97679fb4acd1c4b0eb9a981ab99aba689d1f48496fa8721b5b7bfbaae3d7e440e74385d47b4dddb834685f03d2b308a597329af463c1 SHA512 422ba05ebed00ac7f355cd9599f930f861141b9f69ff3e475ac9bb1e74aa02b4787d18fe52c03350dcb3b9b579d67b67d5d4e3b86aa204084d16c1097dc3b291
-EBUILD qterminal-0.17.0.ebuild 843 BLAKE2B e3ebbd0ddef4d7288cf24702325ae411c8e76e6247b4a94823e830b09c60b32e6fa14ec778f0084a9639349e200bd8af09f8c19b16e950605cecbf5b7b44fc43 SHA512 01fdff5baf310fd829ba096513ac42185b86d460a518db3e4be7c77c80c0795174221f21a696b824edda94b0496a507bb9f274e8eda4bd228d0cde79236fca9a
-EBUILD qterminal-1.0.0.ebuild 882 BLAKE2B 894b1102baef7fc58c16a91186f064ef486c3b7e1720a4d28103d1fa5de2ba17e36b990e866387276aaa6ce59edb9769df11a5eb9109199b1947cc53ba1bf58c SHA512 4777092761998de3d33efd39349c4678bc3fee31b4fc200dd2fd9ef79b1287a278110d763ed6549ca81e4d26ed502f9274cd25b511d8603a1e9cc5ac2edce0b6
+DIST qterminal-1.2.0.tar.xz 217432 BLAKE2B cd5b8e02fe36abcd88b3af1b7d3e9e9791af0d3db867554cc683fe0f821af7668c585a5ebf3cee1ebcb4e9cc06e41c2c1afaf9f5b9fecb9d02f71dbe9a8bc6c8 SHA512 4d0db104004bc4b4a0c6d030978c241c0c57d7642f1a9e215158da5810029a46f21510c9b2a92d32c7218df667015e96b47965e3c2951935af7ab6a1a33a0f9d
 EBUILD qterminal-1.1.0.ebuild 824 BLAKE2B 980a94b214ee51656bd0a44748b13bb7b72982732cf7acd8fd8affe43c90ad8fbb9dbc1cbcbfc649a0aa7b9eadda06faff7841e14734e98d01d0a89233715dd1 SHA512 5ebf25f61ec79173a2975d8a348251a2c6b05b458a020412a4827fdfffa7e9be38dc2f7e270d90cafacbaf95848afc18175d4c675d2641e99ccc3c0ecffee6a1
-EBUILD qterminal-9999.ebuild 827 BLAKE2B c44255577597cedd00bcc7f41c288cd657ae737e01d5443d2a9950a660ec183a9de854a13855111212a067f6e2e9e533ab63dcc70a2341902c3b0afe606a2262 SHA512 15b9ad7127da3d6bd4abe2efaca41df5a6e6b86753b352ae211f036bb1b16b2a8e919ff62224848d9b75df9d622f05b7fb676ecf236d7fa856734fbce35ca45c
+EBUILD qterminal-1.2.0.ebuild 827 BLAKE2B a08b8067a16b709cdd4ea0443f1bdedd59958cf6e8e4da9317ee547d941b380773ac116b28f7edf1c7cec7964f3f9c8a08e66870a7db662410cf125508835152 SHA512 809656da13592982bea4adae61d3ef36feba6b938fcf9b5cd022ba72ae71e0ba5be0f169074ac66dbb06d752bfe07dbfa344164ff17a0857e43f0a0a817920c1
+EBUILD qterminal-9999.ebuild 827 BLAKE2B a08b8067a16b709cdd4ea0443f1bdedd59958cf6e8e4da9317ee547d941b380773ac116b28f7edf1c7cec7964f3f9c8a08e66870a7db662410cf125508835152 SHA512 809656da13592982bea4adae61d3ef36feba6b938fcf9b5cd022ba72ae71e0ba5be0f169074ac66dbb06d752bfe07dbfa344164ff17a0857e43f0a0a817920c1
 MISC metadata.xml 332 BLAKE2B 624f66a3b8a745cfa2f4486cd22cf18f2f650d3be2b9b702527983f7a16bd81adeed917daa5520fa6de32191d30b6cf590eeb12e83e19032d7ee720eb07dcaf2 SHA512 c4e36da6992031391c905fb0908fcf1fcb2061ba2999814e8b33a194dde60bde987ef5689d46ef8a1bea67e8094dcb30fee7749d29f11bb560aec5a6a86742f6
diff --git a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
deleted file mode 100644
index fc3f370fa67a..000000000000
--- a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2020-11-14 10:11:34.000000000 +0100
-+++ b/CMakeLists.txt	2021-02-28 22:47:20.119110816 +0100
-@@ -215,7 +215,7 @@
- 
- install(FILES
-     qterminal.appdata.xml
--    DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
-+    DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
- )
- 
- if(NOT APPLEBUNDLE)
diff --git a/x11-terms/qterminal/qterminal-0.17.0.ebuild b/x11-terms/qterminal/qterminal-0.17.0.ebuild
deleted file mode 100644
index 5e8592563aaf..000000000000
--- a/x11-terms/qterminal/qterminal-0.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-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 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.9.0"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	~x11-libs/qtermwidget-${PV}
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" )
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/qterminal/qterminal-1.0.0.ebuild b/x11-terms/qterminal/qterminal-1.2.0.ebuild
index 52947cd89a2a..f38c21ae5800 100644
--- a/x11-terms/qterminal/qterminal-1.0.0.ebuild
+++ b/x11-terms/qterminal/qterminal-1.2.0.ebuild
@@ -13,13 +13,13 @@ 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 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
-BDEPEND=">=dev-util/lxqt-build-tools-0.10.0"
+BDEPEND=">=dev-util/lxqt-build-tools-0.12.0"
 DEPEND="
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtdbus-5.15:5
@@ -31,8 +31,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" )
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 894a3242fa81..f38c21ae5800 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
-BDEPEND=">=dev-util/lxqt-build-tools-0.11.0"
+BDEPEND=">=dev-util/lxqt-build-tools-0.12.0"
 DEPEND="
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtdbus-5.15:5