Version bump for stable and testing branches

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

4 files changed, 250 insertions, 16 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 9ded9d319520..3dd8ed9cee42 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2012/03/30 20:32:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.35 2012/04/11 13:45:50 hwoarang Exp $
+
+*lightdm-1.0.11 (11 Apr 2012)
+*lightdm-1.2.0 (11 Apr 2012)
+
+  11 Apr 2012; Markos Chandras <hwoarang@gentoo.org> +lightdm-1.0.11.ebuild,
+  +lightdm-1.2.0.ebuild:
+  Version bump for stable and testing branches
 
 *lightdm-1.0.10 (30 Mar 2012)
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index d96bb8cc7041..5fc6c842477d 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -8,36 +8,40 @@ AUX lightdm-autologin 369 RMD160 2adb17241b378ad4ca10e6241cb21b5a679c0973 SHA1 8
 AUX session-wrapper-lightdm.patch 419 RMD160 899fd1b62b77ff1d3dcd46c35092486391f8bc2b SHA1 a609ddf728296ed8c139e2750ad3557e2a8bfec0 SHA256 de5504221cd31c6d25ccbb21f4559780564ce908e2306238d92dd4ac481e687a
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST lightdm-1.0.10.tar.gz 651145 RMD160 8f9f2e86b0c19c0e7c6e2718fd394adcf481819e SHA1 46087a3c32bae42c81ca77f5367211387ffc512e SHA256 66a33c0c73cd16ae965f20218abcade305d4b8b10e4c849786f59c2db4b1efba
+DIST lightdm-1.0.11.tar.gz 651203 RMD160 7802d39f4db7bb310d3e03c93b90e91fa6d4c1a0 SHA1 b551e2508d74dca93b23ef988b5edfa1212f68ad SHA256 1955078eee813c11ce7e5b3e1c827f70b38c7406b7e1293c71ff221e4418fe1f
 DIST lightdm-1.0.6.tar.gz 648433 RMD160 798fc0a3277e07e50a7c22b961027972f03d695c SHA1 5e9ab2fd7353cf17f06e11b581fdd3f1c21586a7 SHA256 745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
 DIST lightdm-1.1.3.tar.gz 633963 RMD160 d4f7f40d44edb24fa9e237d457f4744f23763a2d SHA1 776e3adf2b8be5611caf39ae56754d07d9f1a6d2 SHA256 2fe4ae0d495129c465beffd35f11909bfd26a8e0e4704109803a1d1023f693ee
 DIST lightdm-1.1.4.tar.gz 635109 RMD160 fd85508e660608373356dae25a0dcb8c233d30c3 SHA1 085b7d2e9d70c53c8d9124af388c5a3e09321b45 SHA256 10dae544a4d87b15f3a895790d1ae2253e4f48b66a4b1c8df7555d0f97a24d28
 DIST lightdm-1.1.7.tar.gz 637201 RMD160 12549f3b755c1990e908db58dd73b36076c5c687 SHA1 173b8a52cfd21607875a35d716fd2a4c40e6a4f1 SHA256 fdb0609a9eb16383cb6c8dd2bdd57bb110b2b4a3e96ce3183d0ba20c223a4f7d
 DIST lightdm-1.1.8.tar.gz 637844 RMD160 6e45fb08a7d0dcd2614d887e3e5be4c6cc230426 SHA1 8d23c6da7e06710ca6f5655fcdd7060beed3fb98 SHA256 3e30957c57c16cad0d2d130e41acd40e8d1e9a05d75b3fac9eb4e657c9b066eb
 DIST lightdm-1.1.9.tar.gz 640207 RMD160 cb2445a0425550c0c9a63951a2d8e69064b44ff6 SHA1 4effd36fc3c48cbb2b56c8b7143381314a8c97e0 SHA256 ffea35e550bb7d03b142b726c47ad16873b762928b5585146bfdbcbba6027a3b
+DIST lightdm-1.2.0.tar.gz 644000 RMD160 6363295c97ee2e6a504e935364d37f786d129c18 SHA1 853736ec927eceedfcf2211744dda8bb0bb028a9 SHA256 15fcf72926f400ff7ee597a069c328043822e26885328115ac16cc362a75fe73
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.10.ebuild 3624 RMD160 7b9cd137b6613318a84349da5c1e96dcbbb99b33 SHA1 10cff8cf78fbd04d07026a95791f485edf1fc2f0 SHA256 d524f9950a54b0217410ef500e7a4b4d1660420afb4f65c25cb7a59999ff43cd
+EBUILD lightdm-1.0.11.ebuild 3624 RMD160 dcc9f8f814de232b8714d16283b0a058289b5b86 SHA1 68b02d9981f8a4cf7728826d6257d5b420d5123c SHA256 91218011cdd53934f466c12d1b0ffa94bbf699243c7eacb69d162e8a597a883a
 EBUILD lightdm-1.0.6-r4.ebuild 3600 RMD160 225f0462cbd11bb8e1e46b16404ff578788511dd SHA1 9e3e2e26e5658ea601d592b9a2c9817cee22fe80 SHA256 c5e622c6ed753c7c13f15cb0f8f36685cfe8db9f2a3ebed4e3fda87c139cccf6
 EBUILD lightdm-1.1.3.ebuild 2738 RMD160 5f0bc4d497a0d82ea0a487589fb1f0d57cf3db9d SHA1 8dd6a327340f354a82fcea1297770156cd98daa4 SHA256 fd84680f1229fa77f351073f73c2c98e4628cfb8290adee36befe85b5f41b27b
 EBUILD lightdm-1.1.4.ebuild 2738 RMD160 32afcc0df7044f66440e7690fee4ed393f297a0f SHA1 61f887837d10e5d7671e6bdb952604c62386778d SHA256 d47af780246edbdb2af062dbe4f7b27c0c5a45553a6a4612032c51b535840f18
 EBUILD lightdm-1.1.7.ebuild 2718 RMD160 24d373248d90267161eac4a4c06df0f6f9b59ee9 SHA1 fc08fcb61ba531667731fdb56ae8f38c39c2e909 SHA256 c0fcffda3755518f40072bf59a3c5d8880398bed34c619d82d6a48169d3792ca
 EBUILD lightdm-1.1.8.ebuild 2718 RMD160 cb12e2c337323264590258e4d23bf548479c743b SHA1 3b402ba351cc6cf9366f5534da9938b404fdd53f SHA256 0dd3ad532a5a143fffdc15fa83c8b25aa33cfd5cacee8b3d073c0d8f347dfb37
 EBUILD lightdm-1.1.9.ebuild 2738 RMD160 144fad5077e72aa63262c662db3094e38c1f89ef SHA1 58e9dc319f529a1e2b6c9e4182f4ea66fe7a7efe SHA256 b3d4730eee5b40f4756b01ff4561231ec35b1aac58938ed1e819ae525967d5d5
-MISC ChangeLog 5072 RMD160 64c9e84b0a70d99767b8e1e4333515145d038a09 SHA1 30e9b4479a2d494e9dfe2dbb26466a4e171c8240 SHA256 77521f04e30a9c3389638a47b103c06d40b8582d61375c780395783f52eb6d07
+EBUILD lightdm-1.2.0.ebuild 2737 RMD160 a90228d7c13698ae07c9bb813daefba36bbd7b69 SHA1 d53af9209cf6afb659ae3c01a78e5ea1c950b939 SHA256 3effdad37511850a0f2e706c128b3f3a681696199d2e76d1cdaef03c0363816d
+MISC ChangeLog 5282 RMD160 d795f5ecece9ba7ea08b249fce77165694128cc4 SHA1 0007178a7c43efa053e1a697e9c256381eb6977c SHA256 6754e7bbcb4b012b0fb031e609d0f0faea21d272b8f3aa92efc202abd1677ced
 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPdhhJAAoJEPqDWhW0r/LCCX4P/1YRvrnD11fAi6Auy1i9FXyf
-5NQ/sQEdwzpg4VYji4TUOkkoer8RWne6fX+AHeh+qUO4UqQRkatDrGGu3MuSFs2V
-N0cMGVQK26+MMCak0Qw3lr4hme5lcrdbbxFMhpEQPat+qkd4ZrA7HyH5N7nqcc4Z
-70OazpA0AvjuUqFuCDgY9IHV9PcNZlpMXYyriUoeM4B7iLw7zNCngXoE3ysVvBab
-nfIzbsykflDfUiXGIFiBc0Cde8yb4DfXdSDA1HIFnXGU+5AO/Ly5dubBYBoAIC4r
-XvPFbeR/VFaoVbsc1KOg33nv1t4VtHyiBp3luM1juJQyUu8kBIvopYbpGNl6OewI
-0ZD6Uaou/ZtFYwGmYYnuKaNqvHkWLsxFnbMX8eFOT/eNb19wQh/UJECXhRb1dueb
-hOEP2Eu/yJBAwhrQdhbaLbmEw8sFMrTa1p3vQFFhXX5IFfrOKYkIWNm1wLAHQDtE
-KrdwAuc8KkLiYpc6sibxRwrb1SHI+cC6BXtGZvttQsNQ9GaUzxcmMI7Q6kYPW4aw
-PAJIrQCzp6O2bn9Domju/e78DvFn3AYdhiEo6mstN4XuL6Wsjf7GkvqmNFyGE5SB
-zTOMJLH+fnyxK772axTzqvc3mDIGGwLaQuJ2QpJlWbjTnO3xPFUsdAT2o1tA4Mjq
-42gIbGGpmTgdHN0N9YVa
-=XjBF
+iQIbBAEBCgAGBQJPhYsUAAoJEPqDWhW0r/LC7akP92ZkzqU+pPojX9rBSAeu1aZV
+OzFnH8rXhGcJDJOaLCQj4RiyZzRnF9zjVXdCVKciHNLA0vpeMwWG1ZveY5UPn8U2
+NpzonE/8P3SndUhT5DagZrXlI2lgjW0H8DT9IY+XhRY2riJM2gffDyAIwC6XlGu8
+KBbHc3KkGt0aIj9piki91LyLYvFmdkLuEvxK3XFQNU0S0BaWe1ieEUSLwkG5KFdd
+D3qmnOmxoidTLJinsVlWfihHrs7c0RnL3BToprBW2g2JKNVqhdG4Pmv7L+KODW8H
+BDiK90PhHA9RjPQxWs6O25bLQmI1GZFKcmEFyILISRTJNJjNPT8jnFO5JCB/I/5k
+k7EU+jLmPHHud0+bRm1wspNdNF6pdNDLUZwB6GWAIG8Zcg+8VaK91MbqnEqyTPzU
+7Kfisuh9SZHdC3//Y/mpVROZmGPMttURj5K0ETKfoyTLKUFxBZpi86zLo4eAlf8t
+QZm+kLTA5CBofkOxCiEVWLm0ehHAKhUQFxzrldurOarkGHIkvzIzPrwtyCdaL3Kz
+rB259Ca8ANLMzK5lSj6uxBz4xuyMVxqlNHksmbE6zWspgZ1U+27gEHH8RaCUiJ2F
+hPoNj+/RHmyCm4kocw/csyPYRS+f++r+BGDuxgQs82Z6KX27tC7MHHuzeDAOI/sx
+hjJHds76GEI9nBB3raU=
+=G82W
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.0.11.ebuild b/x11-misc/lightdm/lightdm-1.0.11.ebuild
new file mode 100644
index 000000000000..d9bd75a9cb37
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.0.11.ebuild
@@ -0,0 +1,126 @@
+# 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.11.ebuild,v 1.1 2012/04/11 13:45:50 hwoarang Exp $
+
+EAPI=4
+inherit autotools eutils pam virtualx
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="http://launchpad.net/${PN}/1.0/${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 )
+
+RESTRICT="test"
+
+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
+
+	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) \
+		$(use_enable gtk liblightdm-gobject) \
+		--with-user-session=${default} \
+		--with-greeter-session=${greeter} \
+		--with-greeter-user=${user} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+# Tests restricted until I find a way to fix them
+#src_test() {
+#	unset DBUS_SESSION_BUS_ADDRESS LIGHTDM_TEST_STATUS_SOCKET
+#	Xemake check
+#}
+
+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
+}
diff --git a/x11-misc/lightdm/lightdm-1.2.0.ebuild b/x11-misc/lightdm/lightdm-1.2.0.ebuild
new file mode 100644
index 000000000000..241caf9bf95d
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.2.0.ebuild
@@ -0,0 +1,97 @@
+# 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.2.0.ebuild,v 1.1 2012/04/11 13:45:50 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}/1.2/${PV}/+download/${P}.tar.gz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="dev-libs/glib:2
+	virtual/pam
+	x11-libs/libxklavier
+	x11-libs/libX11
+	dev-libs/libxml2
+	introspection? ( dev-libs/gobject-introspection )
+	sys-apps/accountsservice"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	gnome-base/gnome-common
+	sys-devel/gettext
+	dev-util/gtk-doc-am"
+PDEPEND="x11-misc/lightdm-gtk-greeter"
+
+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
+	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 user=root greeter
+
+	# There is no qt greeter, so use gtk anyway
+	# use gtk && greeter=lightdm-gtk-greeter
+	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) \
+		--disable-liblightdm-qt \
+		--with-user-session=${user} \
+		--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/{${PN},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
+
+	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
+}