gentoo resync : 03.03.2021

4 files changed, 21 insertions, 5 deletions

diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index c133825a38a1..1eb2dbdca707 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,8 +1,9 @@
+AUX qterminal-0.16.1-appdata.patch 309 BLAKE2B 3aef2327582b603056ea7061fc1f5103e0ad5130d3e8c7f5b4bbe111d8fd0cb4be4a5e29b434395acb1fdf03635681a33965e74df125da0eaecd0fb8b0b7fab5 SHA512 f67478af84a9fb14a7e95e030cf1695febb4b0e7e47949272dd4ebae0b7183f23abb37089017c2b69ced33d3295f9c37035576b913478e347aee01550ee2a80a
 DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
 DIST qterminal-0.15.0.tar.xz 179608 BLAKE2B 7569f408c7edf16090907bf6386d4b87fbe5c9f27b738db38eda528ec3390470bc24cadd3bce8e60439b928b611d0208ba8b53172b8fc0b2af11307780041904 SHA512 03c690fd090fc87e0475f5a34e19ff1d5aeaea146fe5c62aa09540b6abfa0363506c44c3e82c5d3957e351b883ac9fdd014da66ce7d44e7d3e5fecc8fcd7bcac
 DIST qterminal-0.16.1.tar.xz 185144 BLAKE2B f775aae132e88c5074e009436da15989a2ff047359ad7d79b9ec2b9b0927d72323eb5d04885012bf68280218c16900d03af1d295a49f6434229274130fe39e27 SHA512 0d9736cb6e220a019e6a8df9507604c144a9be6cb8702719e489c6868858a4e0ab362f713f697ba7a6f9e8cd9c9a94aa8e6daba1adcd698a52729ca6e8096def
 EBUILD qterminal-0.14.1-r1.ebuild 789 BLAKE2B 5999a2e6ffe50974ec96b28e8b962908f51b2deebd52841c9dda80f45e0d2a0e8b520fdb359d3693c000ebe10b63f149731ae888b42a9935c5d1004cd3ed3684 SHA512 f68aa12aaf45fadedf850e36f851993a096e7276cfe800720587e156aef034bad84d04c965725acb8a65c1982d1425ff75c80cbe9b112a844c7801721041465c
 EBUILD qterminal-0.15.0.ebuild 801 BLAKE2B 2ab2a2b3b4f7e3e739f9e3ee7f329c4388d52c5f2cd358fe4fcaab897b9f2b29d46ff48e75d6fe745bbaa06b350d6554b6c10bc75f3d41c5a7bc51ba53887ecb SHA512 f1583794f87c4dcd0f79aaabdb26ca18a19d5095e977cd732ee899472a47ed910134a86a84d9134cc6f3c30bd2bf41ce09c8ad416a2b9613c045bc490eabeb43
-EBUILD qterminal-0.16.1.ebuild 803 BLAKE2B 63d35057c2eb10f0f33a3063892d7546e93a600eb088a9bd67f9eb5ee6bcab69c0a04ff1f40f395eed31ca277cbf6b14f8fdd6fa1624744c654c4bdde71b00a1 SHA512 0711e5a7c940bffbef0c8b38fe7071e7fcede6b1de5fc96da6c20d0ad5b4bc245d0729fc7cd2f2e37bd4b8ff1f12bf1ff3a3e068de2036dfc177ffd7c01e537c
-EBUILD qterminal-9999.ebuild 803 BLAKE2B 63d35057c2eb10f0f33a3063892d7546e93a600eb088a9bd67f9eb5ee6bcab69c0a04ff1f40f395eed31ca277cbf6b14f8fdd6fa1624744c654c4bdde71b00a1 SHA512 0711e5a7c940bffbef0c8b38fe7071e7fcede6b1de5fc96da6c20d0ad5b4bc245d0729fc7cd2f2e37bd4b8ff1f12bf1ff3a3e068de2036dfc177ffd7c01e537c
+EBUILD qterminal-0.16.1-r1.ebuild 847 BLAKE2B 9faed689aaacd5b3b2ddbbedb78bc77e909b9ba64c6769cd9e733b05c69c16fd054652bc15e70638fb7cac4336bf6813041af53457a7317b567765531016d8db SHA512 7a6f1da4a57685fef6d659f8921898a832fd943b5a5794c7439a8ccbf84f06024cc1a32283031bc5dfdbbc8eab408b0738dcab2798c8cd7810cd5e4f9af22d2c
+EBUILD qterminal-9999.ebuild 857 BLAKE2B 719fa3d46cb02ea2d2c1d6f38420bd02dac814a175839f26779a2ea4d9eacd56a0e264e7720c5302135ccc6e461b43eadc6f520b2094553612e24d3435e3d9df SHA512 f6de9d01246b29e3c710d08a16b3f1c87c63fd83b48434c2417315b027629e5cee44bd607a575a1e2a3348e2c93a4e1ef6ca82e602be07eb34074440ff95f6fc
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
new file mode 100644
index 000000000000..fc3f370fa67a
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch
@@ -0,0 +1,11 @@
+--- 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.16.1.ebuild b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
index 1b3cfd717846..edd6781423e4 100644
--- a/x11-terms/qterminal/qterminal-0.16.1.ebuild
+++ b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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="GPL-2 GPL-2+"
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 	!lxqt-base/lxqt-l10n
 "
 
+PATCHES=( "${FILESDIR}/${P}-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 1b3cfd717846..07f53ab940a7 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
 	!lxqt-base/lxqt-l10n
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.16.1-appdata.patch" )
+
 pkg_postinst() {
 	xdg_icon_cache_update
 }