Missing introspection.m4 for eautoreconf with USE="-introspection" wrt #388813

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

3 files changed, 28 insertions, 23 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index f6be719c9ed0..2864bc4fe196 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.20 2011/11/05 14:09:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.21 2011/11/05 19:38:12 ssuominen Exp $
+
+  05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> lightdm-1.0.6-r1.ebuild:
+  Missing introspection.m4 for eautoreconf with USE="-introspection" wrt
+  #388813
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> lightdm-1.0.6-r1.ebuild:
   Bring back GNOME_COMPILE_WARNINGS and add gnome-common dependency instead.
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index bc09052c9df0..9eb7f94e3780 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208
 AUX session-wrapper-lightdm.patch 344 RMD160 1630a3f971b81eb2433feba9e0f70ab923da1cdc SHA1 670c4f2b84e5a56ac8cbbf6a61b0701e3c1f8123 SHA256 59e64e288315268714504c52f32561d23a675347f02e23dc28c3740caabb3a8b
+DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c SHA1 5e9ab2fd7353cf17f06e11b581fdd3f1c21586a7 SHA256 745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-1.0.6-r1.ebuild 3214 RMD160 6ba705a6d06e35df10efec26584462b808fb6eca SHA1 4e8dbd08b403fe59bdf65068baa312319810748d SHA256 90ac5722115b855dd457c5cf6f1a84609b4be74dd8aad77a34521d621ceda396
-MISC ChangeLog 2780 RMD160 cfca8b2f39b212afffd51747833e06905d8b38e0 SHA1 c39e31199dc12f3ce7ca85db42d8f2f9d7b9b843 SHA256 ca100ca853a02bc4c2cff0cc82cc4588f2611b0288a7adaaeb41b53b5e3bdb22
+EBUILD lightdm-1.0.6-r1.ebuild 3351 RMD160 990aaee240b82704f49ed8dfcc836d0dca5de33c SHA1 b6db844f529161a2c24646a8ffda5c3e0c36baa4 SHA256 9457294dd7a25bb2ceba165ac5a9cb99c3b3a017827dda3bf3a6bd5486bd8cdd
+MISC ChangeLog 2944 RMD160 cfaa4e8aea9d800e361eed32d6180e549d4e1206 SHA1 dad6d3443db455304f7d61a7eb94dd9a6aaf6588 SHA256 110633786882408584fc17994b98624d3d0f5e72bead82e866fec8d94f87c493
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtUM1AAoJEPqDWhW0r/LCnUsQAKcH/NaiD5XYGokhFevj7Mz6
-m/DOQ+gGhg0bjH0PrSeXx6wrbJx6XA4gCBYXKYlHl/Dor/qsrMpxKJz9ZzpBM9ef
-LOxm8uvnrWXJTwdxI3oaFAVP+EItQkObbERHJ2VwBQIOEdxpGHQNtgUgo5ab4TWw
-X1mYBM92o9tWQGAnpz82crqHEKwDuaw6S9uK7zFHORPoEClnGTbBQj4iDqKHfYRn
-gsqEnMnTC10g4UszqzmalGvNMtPcRZYKFuizqYtAxnRDPdwYs6qHTzadOR6w7kPt
-cjjwxeIDGUNaIbZCn6FWCMUBnDL1pOtGIu8RdZDe/MqC+lpTTP8nD/Z135WNwsor
-SubWwyi1RJWYiATNQxAtG3zL0r7ESKcRadR6DRDZvcW1YEQ6Yzc4WmJ+qsBTDfDc
-wZrPRZSA7osI4xO7R1LRO7JTrHsW1hfQYBwIwkfBVNv9L5DLAn1zSODD9S1ojBVh
-wGDT72rtbXzTy6dJTVzQlqcPZLcJEczHed38mN3c1jZopguBS8fcrW90EvRUJBhK
-m70Zb9Sjhfq9x9jEUl/5iSp36x79lmAFSK2X6uA+43v94uLJnIXUlB1v1knPgcM6
-DeediJusr+id8XPbeKImX/TO+rLE9PLF79Hw13/QF2dCz1tedKfGLFY/rKS6e1FA
-BFOJjH/B2VwfDCFIwU2w
-=LleG
+iQEcBAEBAgAGBQJOtZCHAAoJEEdUh39IaPFNleYH/AjrQ2X4ah/Aq3wIqTWlhS+Z
+zWEP++VSpMMNNpK1Ft8l/zKngpE+AmQPnYvMHtSrNlkT07EMId2OsxBwtxiCFTUS
+WVSFK92G1tZW0HJeZtBrb4hiDI7Vb8OZT6S5SDUseHtyMxVhJ885Ct3cGcXmfizS
+1NL0CnPJrNjVCB5v8N9qqBSKcFcSQEBvsVLDqTjiKLrgF6mHMK/XNVIuCVCvIAgu
+Fc71ks3SagQkQUe0TyByOykNUVpzTjcDPMZy2Eqc0Nx4olDWhjegHZO5MW8Eamq5
+wlVy0CWfNQamD+rUU3mYxCJRAgsJOVkeH2Y3LK9C3VIMVPIIuBg3CO1ULbGZb6A=
+=5e0E
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild
index 41d3d251eef3..dc4ade084285 100644
--- a/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.3 2011/11/05 14:09:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r1.ebuild,v 1.4 2011/11/05 19:38:12 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils pam
@@ -8,6 +8,7 @@ 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"
@@ -23,6 +24,7 @@ RDEPEND="dev-libs/glib:2
 	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"
@@ -31,17 +33,21 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	gnome-base/gnome-common
-	sys-devel/gettext
-	introspection? ( dev-libs/gobject-introspection )"
+	sys-devel/gettext"
 
 REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
 DOCS=( NEWS )
 
 src_prepare() {
-	sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf	|| die
-	sed -i -e "s:gtk+-3.0:gtk+-2.0:" "${S}"/configure.ac || die
+	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
-	eautoreconf
+
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
 }
 
 src_configure() {