[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd-ui/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     4f1e673e655c10da83ae1f0306ddfe533c2a78d1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 12:14:11 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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() {