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 C2C6C59CA5 for ; Wed, 23 Mar 2016 12:14:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEEB221C006; Wed, 23 Mar 2016 12:14:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72DB521C006 for ; Wed, 23 Mar 2016 12:14:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30E82340B10 for ; Wed, 23 Mar 2016 12:14:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF41F851 for ; Wed, 23 Mar 2016 12:14:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1458735271.4f1e673e655c10da83ae1f0306ddfe533c2a78d1.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild X-VCS-Directories: net-misc/dhcpcd-ui/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4f1e673e655c10da83ae1f0306ddfe533c2a78d1 X-VCS-Branch: master Date: Wed, 23 Mar 2016 12:14:34 +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: 34d8bfe7-ba19-4195-8696-3508bf3781ea X-Archives-Hash: 43905afd84d4b0f17fff7887db45f04b commit: 4f1e673e655c10da83ae1f0306ddfe533c2a78d1 Author: Lars Wendler gentoo org> AuthorDate: Wed Mar 23 12:14:11 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Mar 23 12:14:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1e673e net-misc/dhcpcd-ui: Explicitly set QTDIR for qt4. This covers the very rare case a user still has qt3 installed which sets QTDIR to "/usr/qt/3" via environment. This breaks the build when "qt4" USE flag is enabled. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild index 39f3430..5f4c71e 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit eutils systemd +inherit eutils qmake-utils systemd DESCRIPTION="Desktop notification and configuration for dhcpcd" HOMEPAGE="http://roy.marples.name/projects/dhcpcd-ui/" @@ -33,8 +33,11 @@ DEPEND="${DEPEND} RDEPEND=">=net-misc/dhcpcd-6.4.4" -src_prepare() { - epatch_user +pkg_setup() { + if use qt4 ; then + # This is required in case a user still has qt3 installed + export QTDIR="$(qt4_get_bindir)" + fi } src_configure() {