[gentoo-commits] proj/qt:master commit in: x11-terms/qterminal/

[Davide Pesavento]

commit:     2dd9ac40ddec5337567b390027388a18125f42ed
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 18:29:16 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed May 11 18:29:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dd9ac40

x11-terms/qterminal: sync

Package-Manager: portage-2.2.28

 x11-terms/qterminal/metadata.xml          |  3 +++
 x11-terms/qterminal/qterminal-9999.ebuild | 25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
index 1723768..948bf4e 100644
--- a/x11-terms/qterminal/metadata.xml
+++ b/x11-terms/qterminal/metadata.xml
@@ -5,4 +5,7 @@
                <email>q...@gentoo.org</email>
                <name>Gentoo Qt Project</name>
        </maintainer>
+       <upstream>
+               <remote-id type="github">qterminal/qterminal</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/x11-terms/qterminal/qterminal-9999.ebuild 
b/x11-terms/qterminal/qterminal-9999.ebuild
index 5fcef24..2d55241 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -2,41 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
+EAPI=6
 inherit cmake-utils git-r3
 
 DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://github.com/qterminal/qterminal";
-EGIT_REPO_URI="https://github.com/qterminal/qterminal.git";
+HOMEPAGE="https://github.com/lxde/qterminal";
+EGIT_REPO_URI="https://github.com/lxde/qterminal.git";
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="qt5"
 
 RDEPEND="
-       qt4? (
+       !qt5? (
                dev-qt/qtcore:4
                dev-qt/qtgui:4
                x11-libs/libqxt
-               ~x11-libs/qtermwidget-${PV}[qt4(+)]
+               ~x11-libs/qtermwidget-${PV}[qt4]
        )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
-               ~x11-libs/qtermwidget-${PV}[qt5(-)]
-       )"
+               dev-qt/qtwidgets:5
+               ~x11-libs/qtermwidget-${PV}[qt5]
+       )
+"
 DEPEND="${RDEPEND}
        qt5? ( dev-qt/linguist-tools:5 )
 "
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_use qt5)
-               $(cmake-utils_use_use qt4 SYSTEM_QXT)
+               -DUSE_QT5=$(usex qt5)
+               -DUSE_SYSTEM_QXT=$(usex !qt5)
        )
        cmake-utils_src_configure
 }