From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 31 May 2018 16:30:19 +0000 (+0200)
Subject: x11-misc/lightdm: Drop use of obsolete qt4_get_bindir
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5de3cb61e327f083cf89f7782d41a29bb508c4f9;p=gentoo.git

x11-misc/lightdm: Drop use of obsolete qt4_get_bindir

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---

diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
index 0592df3577ea..2cd6c3cd5cd7 100644
--- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
 		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
diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
index ae3715bded41..21d21a811118 100644
--- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
@@ -55,7 +55,6 @@ src_prepare() {
 		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
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index bf3d47193355..38662bf9afc7 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -58,7 +58,6 @@ src_prepare() {
 
 	# use correct version of qmake. bug #566950
 	sed \
-		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
 		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
 		-i configure.ac || die
 
diff --git a/x11-misc/lightdm/lightdm-1.26.0.ebuild b/x11-misc/lightdm/lightdm-1.26.0.ebuild
index efef3f3494bc..4d2efe7088f5 100644
--- a/x11-misc/lightdm/lightdm-1.26.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0.ebuild
@@ -55,7 +55,6 @@ src_prepare() {
 
 	# use correct version of qmake. bug #566950
 	sed \
-		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
 		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
 		-i configure.ac || die