[gentoo-commits] proj/qt:master commit in: x11-libs/qtermwidget/

[Davide Pesavento]

commit:     8f4d55875ba444da7470b6e02b4049ce84138935
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 18:04:09 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed May 11 18:04:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f4d5587

x11-libs/qtermwidget: sync

Package-Manager: portage-2.2.28

 x11-libs/qtermwidget/metadata.xml            |  9 ++++--
 x11-libs/qtermwidget/qtermwidget-9999.ebuild | 47 +++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/x11-libs/qtermwidget/metadata.xml 
b/x11-libs/qtermwidget/metadata.xml
index eaa5d4e..d1448f7 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -6,8 +6,11 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <longdescription lang="en">
-               QTermWidget is an opensource project based on KDE4 Konsole 
application.
-               The main goal of this project is to provide unicode-enabled, 
embeddable
-               Qt widget for using as a built-in console or terminal emulation 
widget.
+       QTermWidget is an opensource project based on KDE4 Konsole application.
+       The main goal of this project is to provide unicode-enabled, embeddable
+       Qt widget for using as a built-in console or terminal emulation widget.
        </longdescription>
+       <upstream>
+               <remote-id type="github">qterminal/qtermwidget</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild 
b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index bed3fbf..330186f 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit cmake-utils git-r3
+EAPI=6
+inherit cmake-utils multibuild git-r3
 
 DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/qterminal/qtermwidget";
-EGIT_REPO_URI="https://github.com/qterminal/qtermwidget.git";
+HOMEPAGE="https://github.com/lxde/qtermwidget";
+EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git";
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="qt4 qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 DEPEND="
        qt4? ( dev-qt/designer:4
@@ -24,10 +24,35 @@ DEPEND="
                dev-qt/qtwidgets:5 )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+       MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+       default
+}
+
+mb_variantx() {
+       if [[ ${MULTIBUILD_VARIANT} == "$1" ]]; then
+               echo "${2-ON}"
+       else
+               echo "${3-OFF}"
+       fi
+}
+
 src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_use qt5)
-               $(cmake-utils_use_build qt4 DESIGNER_PLUGIN)
-       )
-       cmake-utils_src_configure
+       myconfigure() {
+               local mycmakeargs=(
+                       -DBUILD_DESIGNER_PLUGIN="$(mb_variantx qt4)"
+                       -DUSE_QT5="$(mb_variantx qt5)"
+               )
+               cmake-utils_src_configure
+       }
+
+       multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+       multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+       multibuild_foreach_variant cmake-utils_src_install
 }