Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/
Date: Thu, 31 May 2018 19:27:35
Message-Id: 1527794826.5de3cb61e327f083cf89f7782d41a29bb508c4f9.asturm@gentoo
1 commit: 5de3cb61e327f083cf89f7782d41a29bb508c4f9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 31 16:30:19 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 19:27:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de3cb61
7
8 x11-misc/lightdm: Drop use of obsolete qt4_get_bindir
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 x11-misc/lightdm/lightdm-1.18.3-r1.ebuild | 1 -
13 x11-misc/lightdm/lightdm-1.24.0-r1.ebuild | 1 -
14 x11-misc/lightdm/lightdm-1.26.0-r1.ebuild | 1 -
15 x11-misc/lightdm/lightdm-1.26.0.ebuild | 1 -
16 4 files changed, 4 deletions(-)
17
18 diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
19 index 0592df3577e..2cd6c3cd5cd 100644
20 --- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
21 +++ b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
22 @@ -53,7 +53,6 @@ src_prepare() {
23 data/lightdm.conf || die "Failed to fix lightdm.conf"
24
25 # use correct version of qmake. bug #566950
26 - sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
27 sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
28
29 default
30
31 diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
32 index ae3715bded4..21d21a81111 100644
33 --- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
34 +++ b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
35 @@ -55,7 +55,6 @@ src_prepare() {
36 data/lightdm.conf || die "Failed to fix lightdm.conf"
37
38 # use correct version of qmake. bug #566950
39 - sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
40 sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
41
42 default
43
44 diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
45 index bf3d4719335..38662bf9afc 100644
46 --- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
47 +++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
48 @@ -58,7 +58,6 @@ src_prepare() {
49
50 # use correct version of qmake. bug #566950
51 sed \
52 - -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
53 -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
54 -i configure.ac || die
55
56
57 diff --git a/x11-misc/lightdm/lightdm-1.26.0.ebuild b/x11-misc/lightdm/lightdm-1.26.0.ebuild
58 index efef3f3494b..4d2efe7088f 100644
59 --- a/x11-misc/lightdm/lightdm-1.26.0.ebuild
60 +++ b/x11-misc/lightdm/lightdm-1.26.0.ebuild
61 @@ -55,7 +55,6 @@ src_prepare() {
62
63 # use correct version of qmake. bug #566950
64 sed \
65 - -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
66 -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
67 -i configure.ac || die