gentoo resync : 19.03.2019

4 files changed, 57 insertions, 59 deletions

diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 120311a370ee..a0eac10f25e3 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,5 +1,6 @@
-AUX qtermwidget-9999-nofetch.patch 1236 BLAKE2B 2c797ea767681357a587c6e86796c9869f9a1e5d455b7c0bd76a14eb04c56b74aba637df337aa29af5fc5f0f4b40c4ea2ca9637eab6e7cf9b4808609afdaea6f SHA512 b7fe3cc1effb00fc8f6a62cc6284de756e6a6b671ae8c803dfdb89f7af74055570711b7d8d8985695c7ca40fb419768721ec8a748f7658590304c90a07053c84
+DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
+EBUILD qtermwidget-0.14.1.ebuild 653 BLAKE2B 52ea1ad162390b40dbc8ee65fc5809b567d51be644f199ac92ae9f4eaf1ab4acab4a6d776507a96c34ef8286a19b99a6f1ef6cca884c3d5bf28155bd9190a1b3 SHA512 a907e1aba9e50429ada5c6287580682eb7beec949f37de9d3cf7beab874630fbc6f811411d2a123b8c8a507f1a629063a8781462ed54b1edfa2f97009684f714
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
-EBUILD qtermwidget-9999.ebuild 516 BLAKE2B fcfcd0622a1718d9b60f0f26c72cb353066955dd83bba528398258ffe706984f066b01709784436da9cc26594b32d4d10aa2892de762727c05b6f8a9d18ac09a SHA512 6cec4d241eee31c9106bc7e8cd94d22bef7e7cc5b47fab30904f7ed480aa69c434320731f9be9bddeb2099a6db29838cf1f3fa866193f81c2c9c236267d94470
+EBUILD qtermwidget-9999.ebuild 623 BLAKE2B f387d0f3a47afac376cd5661718a61155b0943aa57776d286e279f629151748cd268ed87a75ddfca4c063d33c614c3293a2660b11b1bc812881d2fad7606bd87 SHA512 d335773a0d9aed1322a68bcf7bb0373013e6a49021d406212595c60aaec39244945e31727354c5997a448dfa734cf7470b878aacad22eb21bf074bfe4fb71856
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
deleted file mode 100644
index a4827d6dbb8b..000000000000
--- a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Do not fetch translations using git at build time.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,9 +29,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED)
--find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED)
- find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
- include(LXQtCreatePkgConfigFile)
- 
-@@ -117,26 +115,6 @@
- qt5_wrap_ui(UI_SRCS ${UI})
- set(PKG_CONFIG_REQ "Qt5Widgets")
- 
--lxqt_translate_ts(QTERMWIDGET_QM
--    TRANSLATION_DIR "lib/translations"
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${SRCS} ${HDRS} ${UI}
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--    INSTALL_DIR
--        ${TRANSLATIONS_DIR}
--    COMPONENT
--        Runtime
--)
--
- add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM})
- target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
- set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
new file mode 100644
index 000000000000..5f2257ff950b
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+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="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index cda15baf682a..9c367cc15cbc 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils git-r3
+EAPI=7
+
+inherit cmake-utils
 
 DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
+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 ~x86"
+fi
 
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${DEPEND}
-	dev-util/lxqt-build-tools
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
+RDEPEND="${DEPEND}"