From: Michael Palimaka <kensington@gentoo.org>
Date: Wed, 28 Sep 2016 17:19:11 +0000 (+1000)
Subject: x11-misc/lightdm: ensure the correct version of qmake is used
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb03d7cc4088b1690afba0e78180a59442594746;p=gentoo.git

x11-misc/lightdm: ensure the correct version of qmake is used

Gentoo-bug: 566950

Package-Manager: portage-2.3.1
---

diff --git a/x11-misc/lightdm/lightdm-1.18.2.ebuild b/x11-misc/lightdm/lightdm-1.18.2.ebuild
index 511958a6be84..198bbfc8466c 100644
--- a/x11-misc/lightdm/lightdm-1.18.2.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit autotools eutils pam readme.gentoo-r1 systemd versionator xdg-utils
+inherit autotools eutils pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
 
 TRUNK_VERSION="$(get_version_component_range 1-2)"
 DESCRIPTION="A lightweight display manager"
@@ -60,6 +60,10 @@ src_prepare() {
 		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
 		data/lightdm.conf || die "Failed to fix lightdm.conf"
 
+	# use correct version of qmake. bug #566950
+	sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
+	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
+
 	default
 
 	# Remove bogus Makefile statement. This needs to go upstream
diff --git a/x11-misc/lightdm/lightdm-1.19.4.ebuild b/x11-misc/lightdm/lightdm-1.19.4.ebuild
index 511958a6be84..198bbfc8466c 100644
--- a/x11-misc/lightdm/lightdm-1.19.4.ebuild
+++ b/x11-misc/lightdm/lightdm-1.19.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit autotools eutils pam readme.gentoo-r1 systemd versionator xdg-utils
+inherit autotools eutils pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
 
 TRUNK_VERSION="$(get_version_component_range 1-2)"
 DESCRIPTION="A lightweight display manager"
@@ -60,6 +60,10 @@ src_prepare() {
 		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
 		data/lightdm.conf || die "Failed to fix lightdm.conf"
 
+	# use correct version of qmake. bug #566950
+	sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
+	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
+
 	default
 
 	# Remove bogus Makefile statement. This needs to go upstream