From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EAD0C1389E2 for ; Thu, 25 Dec 2014 14:52:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 596C7E0933; Thu, 25 Dec 2014 14:52:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1894E0933 for ; Thu, 25 Dec 2014 14:52:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD95534062F for ; Thu, 25 Dec 2014 14:52:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A927D589 for ; Thu, 25 Dec 2014 14:52:00 +0000 (UTC) From: "Ben de Groot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben de Groot" Message-ID: <1419519098.b77194758b1713ecb67c8e9fa2d0864faaa8b580.yngwin@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/obconf-qt/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/obconf-qt/obconf-qt-9999.ebuild X-VCS-Directories: x11-misc/obconf-qt/ X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot X-VCS-Revision: b77194758b1713ecb67c8e9fa2d0864faaa8b580 X-VCS-Branch: master Date: Thu, 25 Dec 2014 14:52:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f40e349e-44b7-48f4-8bc2-7e46161343a2 X-Archives-Hash: 90c94318115679f7ca55d1fcc54ac2fb commit: b77194758b1713ecb67c8e9fa2d0864faaa8b580 Author: Ben de Groot gentoo org> AuthorDate: Thu Dec 25 14:51:38 2014 +0000 Commit: Ben de Groot gentoo org> CommitDate: Thu Dec 25 14:51:38 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b7719475 x11-misc/obconf-qt: add choice between qt4 and qt5 --- x11-misc/obconf-qt/obconf-qt-9999.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild index 7b16314..206dcaa 100644 --- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild @@ -18,15 +18,11 @@ fi LICENSE="GPL-2 LGPL-2.1+" SLOT="0" +IUSE="qt4 +qt5" +REQUIRED_USE="^^ ( qt4 qt5 )" RDEPEND="dev-libs/glib:2 dev-libs/libxml2 - dev-qt/linguist-tools:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 media-libs/fontconfig media-libs/freetype x11-wm/openbox:3 @@ -35,13 +31,20 @@ RDEPEND="dev-libs/glib:2 x11-libs/libX11 x11-libs/libXft x11-libs/pango -" + qt4? ( dev-qt/qtcore:4 + dev-qt/qtgui:4 ) + qt5? ( dev-qt/linguist-tools:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 )" DEPEND="${RDEPEND} virtual/pkgconfig" src_configure() { local mycmakeargs=( - -DUSE_QT5=ON + $( cmake-utils_use_use qt5 QT5 ) ) cmake-utils_src_configure }