Drop bundled moc files. This should allow building with multiple Qt versions. Thanks to Ben de Groot <yngwin@gmail.com>. Bug #401259

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 144 insertions, 15 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 0864142d8a81..04d10aae6be8 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.24 2012/01/13 23:23:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.25 2012/01/29 10:08:31 hwoarang Exp $
+
+*lightdm-1.0.6-r4 (29 Jan 2012)
+
+  29 Jan 2012; Markos Chandras <hwoarang@gentoo.org> +lightdm-1.0.6-r4.ebuild:
+  Drop bundled moc files. This should allow building with multiple Qt versions.
+  Thanks to Ben de Groot <yngwin@gmail.com>. Bug #401259
 
   13 Jan 2012; Markos Chandras <hwoarang@gentoo.org>
   +files/lightdm-1.0.6-pkglibexec.patch, lightdm-1.0.6-r3.ebuild:
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 262bee46a4da..ac8813b6edb0 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -11,22 +11,23 @@ DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.6-r2.ebuild 3380 RMD160 7feaa3efc2a47e4126a51fa1bf58b45c8d988b77 SHA1 e2faca1aac49e90401a218b6e92ad5f2e54f6062 SHA256 e868ac6e176732a4afbcf8713b6c92e4e31832dfeeea7922ea9c0ce0ffc09167
 EBUILD lightdm-1.0.6-r3.ebuild 3461 RMD160 c95b4f837217de7fb68ed702dcba87e3b1f7f0ef SHA1 95184adc3266ee079d5505ef6c33f926ffc638ca SHA256 10cc3129d35b0a281cf0128ba056eaccae36da47657ebf7192270f951240812f
-MISC ChangeLog 3613 RMD160 a63a14c9aa09e2e32070dc5ccb5c55131f675df4 SHA1 9807feae0de30cdb53494b41ef8b76184d233d02 SHA256 4937336fa485eec071ed2ee6225b1ca86bb2a44876ba1a8ae115a1cfca5686af
+EBUILD lightdm-1.0.6-r4.ebuild 3600 RMD160 225f0462cbd11bb8e1e46b16404ff578788511dd SHA1 9e3e2e26e5658ea601d592b9a2c9817cee22fe80 SHA256 c5e622c6ed753c7c13f15cb0f8f36685cfe8db9f2a3ebed4e3fda87c139cccf6
+MISC ChangeLog 3863 RMD160 794bc07f257ad616816fa353574087c72971ceb4 SHA1 f4432fa23c38ebf6bd719e5c4b9cb9baf25452d4 SHA256 28e197f32819ab21f5c7cf4804dce5016e0a5a22ff1910a66da45d8807768368
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPEL0HAAoJEPqDWhW0r/LC1VMP/Al+HYj8tMUkO8sqtie/126n
-VNZlDOkGMTvYUpdsnATha2pW9I5LLzibkx0uYPKbE+aKNFd7L9C8w0aLSFAShJ9l
-oMrGvBeK3+Ke06IhOjUyc/JPfrlGU7ekFKQ544PFkg20VAJ9uzPeVAB5i+2bb537
-UgHgWVYsKD1s877rlSXQo2LEaji3OyOJklcTW1YUZQebib6T0npWs548FrLHaIvH
-5ibKatJNltjK1DHV58JeANzSaiH0RqV7ATd05/LU4UsHMrAb+fQuo1dRZ6kHUPK4
-FJyb4ckDpYaveFZtFp0ULNC8LCvbBm81JxJwwNc+Dbj3/ZBzWbmtJnjQKb37JFzV
-VEkGzoQKLpQJyJRvv7jT/AxaW1MeM+eiM52Q/9AsVWXTCfJWyR3T3qtRcWJNxven
-UiYGReNE5YohOH9wqKk+dLtddLH9EpKZx4YCi0TwTTW6ByLSH2cD3/cQaSKTxLGD
-swQdzm332SUAhgSSLW7VV0dnKQJTO1x3UuzMAmykRXgLIbSWYOMS9MBvggjsu73y
-kDhbfxVJmYhgraCGxgjmm2yRfHRrJx5FzKP2HIwE5q6lz6NaXwkxVbfAwuVgnJeM
-6Ni5ysPu9cfSvA49wC3HhXbVLsNscT7DtDHjvO+UQXsqionzjazpzh22tue+gwlQ
-Z1hWhR7Xslsx/IE8cc04
-=AvmC
+iQIcBAEBCgAGBQJPJRqhAAoJEPqDWhW0r/LC+aYP/38y8XzlS3HtuHoo0K5iGU22
+bwhUsNJp6aRZ9eCg+P/h0aZcufKosuyuZFv/XXSNUL3YPpjwCTCpuSa9HNfJk15N
+9h/EjdKXt1ycUhEeqV8bnKWazVJ2vfC98zE/RYDxie13ZYCI7Au2J2KnMfRwrJse
+4PPOp3hmPZbiU3iTa04hj00dP/WldcDYR46MDZDqgA91Ai+4J8JxQoqwfVTzEAQH
+vD8X1qI8sgZpfaO+P0Yuix6N9ElceaTG9APHmX3ACTgCE0zVhWpauFHpbYYSo1lw
+4r6tjGnGPU4bEs2r5UnZi0dpD5p5Wfxj3OUKWg4r5Rf7ffhU887uTu1hDyk6INQB
+L09sCLsStGJIUsSCtA/7XgjMjc4hAlRyZ6fUNUUg2YdjKt26YEBPxCiU6CwUfS5I
+wRVEapDbnGHTUN5+qpG1qwL4qg7QrdpCinbpfgMI46vG7yMbkeJdP8me3+hlEZzK
+h76FbIAYluf2BoIxG5aCAzZBQHUYxtiZ1lYoPjHiDTlZss+oEo1WIpSE/QGx30Zk
+maDZq//UwXZMbvb+AbYfCfnAbJi0ozuxPcqpZkAnZZlvqBp/Uv53e5DcBtEC/j54
+FqyAhnXZCGhMLQqbRPiwKTmuQqAFhTzMsNNge55wLV7EjGOW1IsaUSMp307poT8F
+auryHLUIEydesnZO5LZN
+=VYJ4
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.0.6-r4.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r4.ebuild
new file mode 100644
index 000000000000..f4479c9a18b1
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.0.6-r4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r4.ebuild,v 1.1 2012/01/29 10:08:32 hwoarang Exp $
+
+EAPI=4
+inherit autotools eutils pam
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2
+	gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/${PN}-gentoo-patch.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding +gtk +introspection qt4"
+
+RDEPEND="dev-libs/glib:2
+	virtual/pam
+	x11-libs/libxklavier
+	x11-libs/libX11
+	dev-libs/libxml2
+	gtk? ( x11-libs/gtk+:3
+		x11-themes/gnome-themes-standard
+		x11-themes/gnome-icon-theme )
+	introspection? ( dev-libs/gobject-introspection )
+	qt4? ( x11-libs/qt-core:4
+		x11-libs/qt-dbus:4 )
+	sys-apps/accountsservice"
+DEPEND="${RDEPEND}
+	dev-lang/vala:0.12
+	dev-util/intltool
+	dev-util/pkgconfig
+	gnome-base/gnome-common
+	sys-devel/gettext"
+
+REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
+DOCS=( NEWS )
+
+src_prepare() {
+	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
+	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
+	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
+	epatch "${FILESDIR}"/${P}-pkglibexec.patch
+
+	# remove bundled moc files, bug #401259
+	einfo "Removing bundled mocs"
+	rm "${S}"/{liblightdm-qt,greeters/qt,tests/src}/*moc.cpp || die
+
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	# Maybe in the future, we can support some automatic session and user
+	# recognition. Until then, use default values
+	local default=gnome greeter= user=root
+
+	# gtk has higher priority because Qt4 interface sucks :)
+	use qt4 && greeter=lightdm-qt-greeter
+	use gtk && greeter=lightdm-gtk-greeter
+
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${greeter}"
+	einfo "Default session: ${default}"
+	einfo "Greeter user: ${user}"
+
+	# do the actual configuration
+	econf --localstatedir=/var \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable qt4 liblightdm-qt) \
+		$(use_enable qt4 qt-greeter) \
+		$(use_enable gtk gtk-greeter) \
+		--with-user-session=${default} \
+		--with-greeter-session=${greeter} \
+		--with-greeter-user=${user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# Install missing files
+	insinto /etc/${PN}/
+	doins "${S}"/data/{users,keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# remove .la files
+	find "${ED}" -name "*.la" -exec rm -rf {} +
+	rm -Rf "${ED}"/etc/init || die
+
+	if use gtk; then
+		insinto /etc/${PN}/
+		doins "${WORKDIR}"/${PN}-gtk-greeter.conf
+		if use branding; then
+			insinto /usr/share/${PN}/backgrounds/
+			doins "${WORKDIR}"/gentoo1024x768.png
+			sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \
+				"${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die
+		fi
+	fi
+
+	dopamd "${FILESDIR}"/${PN}
+	dopamd "${FILESDIR}"/${PN}-autologin
+}
+
+pkg_postinst() {
+	elog
+	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
+	elog "most users, make sure you configure it to suit your needs"
+	elog "before using ${PN} for the first time."
+	elog "You can test the configuration file using the following"
+	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
+	elog "requires xorg-server to be built with the 'kdrive' useflag."
+	elog
+}