gentoo resync : 30.05.2020

4 files changed, 56 insertions, 10 deletions

diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index cfdb0c4e5f44..2b9780d72c66 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,4 +1,6 @@
 DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
-EBUILD qterminal-0.14.1-r1.ebuild 783 BLAKE2B f3c798d648aa88c8132635452260b1bd55f47a7e167ea94001ac897c95105dcbfeaba8b5f68fc2a1f682a0265f4023f605d717f19a6ed4dfe31f74280bccd431 SHA512 4d755543c8d749ad2a60e4f264070fe8095d2c021e8537bd8e600ac52838571d91db27da181888371f60c977a72e8150a8496a6174b0d47095fc0e3bf5cea88d
-EBUILD qterminal-9999.ebuild 755 BLAKE2B 20886bd26bd5e7de712b314edf1fea592f18a815802f244ed7b4c1116b42c89e9b2792d855166d4de6f4a648cde873a5a27d0f4287e06e0647805d4407e9e7be SHA512 233e2035ce38e2365434e72b9dba6f3749e2d6b11722d433c35a11aacf2ddb1cf490937b94ebb3c5b6e1bec17c2b8526463e85a127fbb3cdebd68170533ca14c
+DIST qterminal-0.15.0.tar.xz 179608 BLAKE2B 7569f408c7edf16090907bf6386d4b87fbe5c9f27b738db38eda528ec3390470bc24cadd3bce8e60439b928b611d0208ba8b53172b8fc0b2af11307780041904 SHA512 03c690fd090fc87e0475f5a34e19ff1d5aeaea146fe5c62aa09540b6abfa0363506c44c3e82c5d3957e351b883ac9fdd014da66ce7d44e7d3e5fecc8fcd7bcac
+EBUILD qterminal-0.14.1-r1.ebuild 789 BLAKE2B 5999a2e6ffe50974ec96b28e8b962908f51b2deebd52841c9dda80f45e0d2a0e8b520fdb359d3693c000ebe10b63f149731ae888b42a9935c5d1004cd3ed3684 SHA512 f68aa12aaf45fadedf850e36f851993a096e7276cfe800720587e156aef034bad84d04c965725acb8a65c1982d1425ff75c80cbe9b112a844c7801721041465c
+EBUILD qterminal-0.15.0.ebuild 803 BLAKE2B b5d2da27a0ab14087ecea0c95d3c58e6f66367ebadb234bdd1f93f0cc29b050b290a759c01ca7622ea7df6635a09956fa78dcf61333d11f26b3f4d95f5fdc274 SHA512 f3db28c920ab36c47b464db7a0935c31a7bdc2883472e62d165b9e2ff7a66fa5765eb864a2d9ca471000238201d555b85680365f7e630cd45c4aa36fccea0dc4
+EBUILD qterminal-9999.ebuild 803 BLAKE2B b5d2da27a0ab14087ecea0c95d3c58e6f66367ebadb234bdd1f93f0cc29b050b290a759c01ca7622ea7df6635a09956fa78dcf61333d11f26b3f4d95f5fdc274 SHA512 f3db28c920ab36c47b464db7a0935c31a7bdc2883472e62d165b9e2ff7a66fa5765eb864a2d9ca471000238201d555b85680365f7e630cd45c4aa36fccea0dc4
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild b/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
index ac64f790b8ba..5dcb92cdca64 100644
--- a/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
+++ b/x11-terms/qterminal/qterminal-0.14.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/x11-terms/qterminal/qterminal-0.15.0.ebuild b/x11-terms/qterminal/qterminal-0.15.0.ebuild
new file mode 100644
index 000000000000..2c670eef48ff
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.15.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 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 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-0.7.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}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 90a2ee44c5eb..2c670eef48ff 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,20 +6,20 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt.org/"
+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 ~x86"
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 
-BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
+BDEPEND=">=dev-util/lxqt-build-tools-0.7.0"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -29,7 +29,9 @@ DEPEND="
 	x11-libs/libX11
 	~x11-libs/qtermwidget-${PV}
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
 
 pkg_postinst() {
 	xdg_icon_cache_update