x11-terms/qterminal: version bump

Gentoo-bug: 596232

Package-Manager: portage-2.3.1

4 files changed, 113 insertions, 23 deletions

diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 3b3a2bb2e69f..2b1075882daf 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1 +1,2 @@
 DIST qterminal-0.6.0.tar.xz 100660 SHA256 61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512 e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34 WHIRLPOOL 4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d
+DIST qterminal-0.7.0.tar.xz 98636 SHA256 a9cc63bb6c6bf6e42c9d1061efce641d9c0b57bd455446b6889d1a417a28968d SHA512 ad89bf2639c1c3d15396de1d91121920cbbb52d097d53d2751bf42e1d96b9d00cef8c54456a00b8fa40808a85535f1b88ea7bb3342dc9681fa8e769c2663061e WHIRLPOOL 8bdfb1b44e67e67d4261e78f305097ca202710e3f6020b76ff729f17b661f30bce1be4bbc77840bc24e197766ecdcba69392e325402f71b4dc885b5287934684
diff --git a/x11-terms/qterminal/files/qterminal-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch
new file mode 100644
index 000000000000..f2a9795fb48d
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch
@@ -0,0 +1,52 @@
+Translations are fetched from upstream git repo at build time, so disable them.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,15 +29,15 @@
+ # we need qpa/qplatformnativeinterface.h for global shortcut
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5LinguistTools REQUIRED)
++#find_package(Qt5LinguistTools REQUIRED)
+ if(APPLE)
+ elseif(UNIX)
+     find_package(Qt5X11Extras REQUIRED)
+ endif()
+ find_package(QTermWidget5 REQUIRED)
+ #Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop
+-find_package(lxqt REQUIRED)
+-include(LXQtTranslateTs)
++#find_package(lxqt REQUIRED)
++#include(LXQtTranslateTs)
+ message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
+ 
+ include(${QTERMWIDGET_USE_FILE})
+@@ -110,17 +110,17 @@
+ 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
+-    TRANSLATION_DIR "src/translations"
+-    PULL_TRANSLATIONS
+-        ${PULL_TRANSLATIONS}
+-    CLEAN_TRANSLATIONS
+-        ${CLEAN_TRANSLATIONS}
+-    TRANSLATIONS_REPO
+-        ${TRANSLATIONS_REPO}
+-    TRANSLATIONS_REFSPEC
+-        ${TRANSLATIONS_REFSPEC}
+-)
++#lxqt_translate_ts(QTERM_QM
++#    TRANSLATION_DIR "src/translations"
++#    PULL_TRANSLATIONS
++#        ${PULL_TRANSLATIONS}
++#    CLEAN_TRANSLATIONS
++#        ${CLEAN_TRANSLATIONS}
++#    TRANSLATIONS_REPO
++#        ${TRANSLATIONS_REPO}
++#    TRANSLATIONS_REFSPEC
++#        ${TRANSLATIONS_REFSPEC}
++#)
+ 
+ include_directories(
+     "${CMAKE_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-0.7.0.ebuild b/x11-terms/qterminal/qterminal-0.7.0.ebuild
new file mode 100644
index 000000000000..f3a882e69488
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://github.com/lxde/qterminal"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 2d552417db5d..8d6dc6aaf068 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 gnome2-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
 HOMEPAGE="https://github.com/lxde/qterminal"
@@ -12,30 +12,28 @@ EGIT_REPO_URI="https://github.com/lxde/qterminal.git"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt5"
+IUSE=""
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		x11-libs/libqxt
-		~x11-libs/qtermwidget-${PV}[qt4]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		~x11-libs/qtermwidget-${PV}[qt5]
-	)
-"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
 "
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT5=$(usex qt5)
-		-DUSE_SYSTEM_QXT=$(usex !qt5)
-	)
-	cmake-utils_src_configure
+pkg_postrm() {
+	gnome2_icon_cache_update
 }