gentoo resync : 19.03.2019

4 files changed, 56 insertions, 47 deletions

diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index ab73092c2882..086e0e8b3fb5 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,5 +1,6 @@
-AUX qterminal-9999-nofetch.patch 992 BLAKE2B 32f739a0254f96f6a40c6905cd77ebc8cdd3a4ab6239897cc40229805a4cff0174f3cc362317c1368a9ea982c312875382dc551362b1add4342dc6383ead9b7e SHA512 d46bfb3d3785088e81274645c56f908fcc7978415394c3cdc4d9c164d57f7d8b7743d99d97446c348d6c09424cf7e839041b0450fb8cf5d8f84a1b90cac1b56e
+DIST qterminal-0.14.1.tar.xz 167520 BLAKE2B e496e53b1855f94c49ef5fe699d7c88ca8ad4da40eb24f87701e72c50982bc98a16f060b075597a99d105d32dd38790e6599cd5b36d2901ffe1f72d0114f0fba SHA512 bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf
 DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e
+EBUILD qterminal-0.14.1.ebuild 774 BLAKE2B 8e725bee9edecc4ccfc963fb3c5e0a9f2ab00dd16af73818c195006fdadfb94259722fb8ac3f0b7ab700081a49a7d50240c29d231359f02dd9939a04ab004dc2 SHA512 8b0122458acef4851bcbbea8265030bd96d2a2e321eb29f5a8a62ca3f7c11276babe008c1a8613b5624027bad4f824d1e7ceec7fd7057fdb24a387e747ed397c
 EBUILD qterminal-0.9.0.ebuild 961 BLAKE2B 3d7b9fbf831626982355f2f846e084c94df3892367a9a2f5f66b806b0e38d3f4eec1f29ae32d2c8f02ea38c26039bc432d60e0227fad3ea2551423a48b591aa2 SHA512 99a5680f1361379eeb942109c3acbbf7ced70ab9bc3388d0b094a2a715be969a6d79694c0239b6a963137fa02a7efb0897c1a93e6eb2426b4769c0f8d8c54165
-EBUILD qterminal-9999.ebuild 666 BLAKE2B 8b5843fcfcaa6fea5b0ae3b2c1b992243952a7793f5630eb7114c0122e762b6f297c25d4a9347e4d8dbcc9c2bd7af857e19b59eb46aa3085268b8b950de418b7 SHA512 54127edc2c0e6d05c69767ad41925af43397d5fff094611e60b7545212e85da2677f726bbe42e6951a701a0fdc349cc9ee7fbf4d733e9eb0ef50c131e62be292
+EBUILD qterminal-9999.ebuild 744 BLAKE2B 58f7cd8c04f2bc7b30b479db553ea1aee87ee94c8bc258ffb3dc307e692345602759971b391f65a6d04ae289f6cf952a106e05804bbe414187a1a2410e53dc34 SHA512 02fc0394dc70b7dfb62c6509e688a8f8f4e69bbd4bf284c0d12d2d66906bb17724aa0a8fc7068fee79ab0b9113ce9b8f093598c80f0101bebacef790921196d3
 MISC metadata.xml 331 BLAKE2B 58ccd837daad6307e17695fe2ef3bc12680e0d146ed5a7d38bbc386a9f8f354549d337d7b5b6beb4b6f5e68d35d457a9beff1f2af58a3e358f56d3ad65f89f1e SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5
diff --git a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch b/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
deleted file mode 100644
index 72876c954a0e..000000000000
--- a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Do not fetch translations using git at build time.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@
- endif()
- find_package(QTermWidget5 REQUIRED)
- find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
- message(STATUS "Qt version: ${Qt5Core_VERSION}")
- 
-@@ -108,23 +107,6 @@
- qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
- qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
- qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
--lxqt_translate_ts(QTERM_QM
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${QTERM_SRC}
--        ${QTERM_UI_SRC}
--        ${QTERM_MOC_SRC}
--    TRANSLATION_DIR "src/translations"
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--)
- 
- include_directories(
-     "${PROJECT_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-0.14.1.ebuild b/x11-terms/qterminal/qterminal-0.14.1.ebuild
new file mode 100644
index 000000000000..a16a34b51c33
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.14.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://lxqt.org/"
+
+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="GPL-2"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
+DEPEND="
+	dev-qt/qtcore: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 f63d5d11ad3e..f7797f360159 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 xdg-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://github.com/lxde/qterminal"
-EGIT_REPO_URI="https://github.com/lxde/qterminal.git"
+HOMEPAGE="https://lxqt.org/"
 
-LICENSE="GPL-2+"
+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"
+fi
+
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-BDEPEND="dev-util/lxqt-build-tools"
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -25,8 +30,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }