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

[Michael Palimaka]

commit:     04bcc457f39612f17db04aea869ae66fcdcfc01a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 16:41:04 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 17:09:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bcc457

x11-libs/qtermwidget: version bump

Gentoo-bug: 596232

Package-Manager: portage-2.3.1

 x11-libs/qtermwidget/Manifest                 |  1 +
 x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild | 22 ++++++++++++
 x11-libs/qtermwidget/qtermwidget-9999.ebuild  | 48 ++++-----------------------
 3 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 9209773..f8d741b 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1 +1,2 @@
 DIST qtermwidget-0.6.0.tar.xz 158312 SHA256 1ea148e67c3e28a53ca24a3c91532507ddd6c5d28611467e7a67334d945cd010 SHA512 2e6c5c4bee50244757aecf461c2f63f3d7306647693176df3587271129a3f12d188ea425d8db3704ec1c52df56d429b06472a7c628b5b916c0852752ebfdb79a WHIRLPOOL 55d3e9544f654dce4139f81e3d933a0d11e3e06e965671e4b17e590219e2e5e991b3bdb61db59203197789d943780f3f40d28f8b5d874479a44cc486ae9a6aad
+DIST qtermwidget-0.7.0.tar.xz 158556 SHA256 413d20a6b8feaf14b8e1106d3b01156e85cb3c4ea0f43ff5c1d79b95cd989748 SHA512 5470ef9179c5ac9e82474134fe87e0a09a853211d41d584c16bcac2028e7e9c83aad805d5c3be5fe405535f41151d51c989877f8c2866c1c26e47cc3cac44b27 WHIRLPOOL e192c13e0ca618f5c0b08e80450ae0eed7ea26320c24ae9f1bc48b7a829fdc7ba90cbd0b756b4e1b26273c347ff64de0dd3a86270be15c911f305bc3466a259a

diff --git a/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
new file mode 100644
index 00000000..c802a6a
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/lxde/qtermwidget"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"

diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index 330186f..6c7ec53 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit cmake-utils multibuild git-r3
+inherit cmake-utils git-r3
 
 DESCRIPTION="Qt terminal emulator widget"
 HOMEPAGE="https://github.com/lxde/qtermwidget"
@@ -12,47 +12,11 @@ EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt4 qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE=""
 
 DEPEND="
-	qt4? ( dev-qt/designer:4
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )"
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	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() {
-	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
-}