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 D48CB13888F for ; Wed, 7 Oct 2015 20:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 448E3E0801; Wed, 7 Oct 2015 20:10:43 +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 E0670E0801 for ; Wed, 7 Oct 2015 20:10:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AAE53407E6 for ; Wed, 7 Oct 2015 20:10:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A455B22 for ; Wed, 7 Oct 2015 20:10:38 +0000 (UTC) From: "Jason Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Donenfeld" Message-ID: <1444248582.c9af05c10f41da787179e10a999d452956af0323.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild X-VCS-Directories: net-wireless/wpa_supplicant/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason Donenfeld X-VCS-Revision: c9af05c10f41da787179e10a999d452956af0323 X-VCS-Branch: master Date: Wed, 7 Oct 2015 20:10:38 +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: 78aceec8-0fba-4a16-a1ce-8b89244cab2b X-Archives-Hash: 00beea65c35011c32eb1a825510817ef commit: c9af05c10f41da787179e10a999d452956af0323 Author: Jason A. Donenfeld gentoo org> AuthorDate: Wed Oct 7 20:09:42 2015 +0000 Commit: Jason Donenfeld gentoo org> CommitDate: Wed Oct 7 20:09:42 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9af05c1 net-wireless/wpa_supplicant: Support qt5 Package-Manager: portage-2.2.22 .../wpa_supplicant/wpa_supplicant-2.5.ebuild | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild index ae65c11..7e8122d 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.5.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils toolchain-funcs qt4-r2 systemd multilib +inherit eutils toolchain-funcs qt4-r2 qmake-utils systemd multilib DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" @@ -13,8 +13,8 @@ LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" -REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" +IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )" CDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( @@ -28,6 +28,12 @@ CDEPEND="dbus? ( sys-apps/dbus ) dev-qt/qtgui:4 dev-qt/qtsvg:4 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtsvg:5 + ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0 @@ -272,6 +278,11 @@ src_configure() { eqmake4 wpa_gui.pro popd > /dev/null fi + if use qt5 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null + eqmake5 wpa_gui.pro + popd > /dev/null + fi } src_compile() { @@ -283,7 +294,7 @@ src_compile() { emake -C ../src/eap_peer fi - if use qt4 ; then + if use qt4 || use qt5; then pushd "${S}"/wpa_gui-qt4 > /dev/null einfo "Building wpa_gui" emake @@ -318,7 +329,7 @@ src_install() { doman doc/docbook/*.{5,8} - if use qt4 ; then + if use qt4 || use qt5 ; then into /usr dobin wpa_gui-qt4/wpa_gui doicon wpa_gui-qt4/icons/wpa_gui.svg