From 5143936f09865f2f6978de759aa6cdb63a2e9532 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 17 Sep 2011 13:47:00 +0000 Subject: [PATCH] Re-introduce lightdm package. Bug #365311. Thanks to Christoph Junghans Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- x11-misc/lightdm/ChangeLog | 11 ++ x11-misc/lightdm/Manifest | 26 ++++ .../lightdm/files/lightdm-0.9.7-gtk.patch | 27 ++++ x11-misc/lightdm/lightdm-0.9.7.ebuild | 119 ++++++++++++++++++ x11-misc/lightdm/metadata.xml | 16 +++ 5 files changed, 199 insertions(+) create mode 100644 x11-misc/lightdm/ChangeLog create mode 100644 x11-misc/lightdm/Manifest create mode 100644 x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch create mode 100644 x11-misc/lightdm/lightdm-0.9.7.ebuild create mode 100644 x11-misc/lightdm/metadata.xml diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog new file mode 100644 index 000000000000..fa7124d395fd --- /dev/null +++ b/x11-misc/lightdm/ChangeLog @@ -0,0 +1,11 @@ +# 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.8 2011/09/17 13:47:00 hwoarang Exp $ + +*lightdm-0.9.7 (17 Sep 2011) + + 17 Sep 2011; Markos Chandras +lightdm-0.9.7.ebuild, + +files/lightdm-0.9.7-gtk.patch, +metadata.xml: + Re-introduce lightdm package. Bug #365311. Thanks to Christoph Junghans + + diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest new file mode 100644 index 000000000000..47700082153f --- /dev/null +++ b/x11-misc/lightdm/Manifest @@ -0,0 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93 +DIST lightdm-0.9.7.tar.gz 623465 RMD160 2044605ebd78950c8bba232dc17521491223a002 SHA1 878e3ca0d9af50accd95b631b4b867871eeab899 SHA256 72749f1e5a73567bccf0858d3a39934c72dfd997deacfd44b0bf49389c73ae10 +DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba +EBUILD lightdm-0.9.7.ebuild 3545 RMD160 61c0e28bf9c9f35b23c0518ee6becf6285988fa1 SHA1 1c7a3ced2f7743ff27fd4edc31f6ab712f4a4aa7 SHA256 2a032a53a5056dcfecd059dcfd2a0a64202d24aac879fb5dc00acb8ff83e045f +MISC ChangeLog 459 RMD160 1b6f33ce625cdf0dfd6117715662ed92a855f01d SHA1 10712b9fbde271067e9a12bdf24a45ef229ca5c0 SHA256 8d9526ef698ff749a52e80e860126d5b8f2b9256bb921e83cd9c7cd40fed3829 +MISC metadata.xml 497 RMD160 9f8f6dade79a2a2c325b3168101d768012a93cae SHA1 9db32e834848c6b7ab062a2b8257676f77464790 SHA256 b2bf41a1c5c128b389d57f0f8e3adda24d765d268904d089bf375c1130b629f9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCgAGBQJOdKTHAAoJEPqDWhW0r/LCa68QAJ+adL/NUBaC4xvYCc1k/ZDO +ClDki2Dl2XHrI+T43UooD896JshiYK1LfXvEVG7x7Wpdo9y8CHZkE9T0OhBVl+6N ++axGdJqFGaRiRrZIMRjD5fqckzGlotCSPqtj2L2uOTsC2sYbv2KW45BVN1DH+pZO +XOsTVDYaRMint7B0GYAS4Xa7tLXFRckGrY0reEOCX9CTWYFg5l3dDqNtd9/1FXno +cJjDn4TvZjbKDlJpJ+rBt40D2PfYSOvOPmTaTXdvfC6LxLd8NWNXhOZ4rqNIO7P1 +lrhaIaUzlvcxkV+xwhd1jaJUcS4oBtCTYOX8KXPw223z96AYi4bT6nlUCO1nppQ3 +usckkkrnZFlP9WcVRJFUOfWJt5TMqwoUBaBBRiHL2rj9yhJ0apqQoSQIxpb81w/3 +saXUxQ99mmPeJYIzjgirvP0AvXJEEWpkvdr8m8mTJpu5VX/jdxofI79hJV0hgrFC +2mxKBiS9ips16aS0GbhKinfi+YYS4LO1E246AYH98UQE0BfT0HJsvTMgRNANQff9 +QU5kSK3wU+/7hjl6PifiirR8fhv4Z2mcyQQSxFUAId9yWoGUpWJSFlSCOXULwM+m +cdzJcTZQbT7F39g49020aUy2iDsUi3YrumRfz9hCIsvTIvSe+ToOShnWjoUK7mAz +0JabPPWxY0Hwi79aYXVJ +=Exb2 +-----END PGP SIGNATURE----- diff --git a/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch b/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch new file mode 100644 index 000000000000..c3ab47cc1b9f --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch @@ -0,0 +1,27 @@ +diff -Naur lightdm-0.9.2.orig/configure.ac lightdm-0.9.2/configure.ac +--- lightdm-0.9.2.orig/configure.ac 2011-07-27 19:56:54.000000000 +0200 ++++ lightdm-0.9.2/configure.ac 2011-07-27 20:12:48.000000000 +0200 +@@ -108,10 +108,19 @@ + fi + AM_CONDITIONAL(HAVE_QT_GREETER, test $have_qt = yes) + +-PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [ +- gtk+-3.0 +- gmodule-export-2.0 +-], have_gtk=yes, have_gtk=no) ++ ++AC_ARG_ENABLE(liblightdm-gtk, ++ AS_HELP_STRING([--disable-liblightdm-gtk],[Enable LightDM client gtk libraries [[default=yes]]]), ++ [enable_liblightdm_gtk=$enableval], ++ [enable_liblightdm_gtk="yes"]) ++ ++have_gtk=no ++if test x"$enable_liblightdm_gtk" = "xyes"; then ++ PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [ ++ gtk+-3.0 >= 3.0 ++ gmodule-export-2.0 ++ ], have_gtk=yes, have_gtk=no) ++fi + AM_CONDITIONAL(HAVE_GTK_GREETER, test $have_gtk = yes) + + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) diff --git a/x11-misc/lightdm/lightdm-0.9.7.ebuild b/x11-misc/lightdm/lightdm-0.9.7.ebuild new file mode 100644 index 000000000000..f9bf6d18c35f --- /dev/null +++ b/x11-misc/lightdm/lightdm-0.9.7.ebuild @@ -0,0 +1,119 @@ +# 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-0.9.7.ebuild,v 1.1 2011/09/17 13:47:00 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 + 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 ) + 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 + sys-devel/gettext + introspection? ( dev-libs/gobject-introspection )" + +REQUIRED_USE="branding? ( gtk )" +DOCS=( NEWS ) + +pkg_setup() { + if ! use gtk && ! use qt4; then + eerror + eerror "You have neither 'gtk' nor 'qt4' useflags enabled." + eerror "Please enable at least one of the two available greeter" + eerror "options" + die "Neither gtk nor qt4 useflag is enabled" + fi +} + +src_prepare() { + # Make gtk greeter optional + epatch "${FILESDIR}/${P}-gtk.patch" + # remove GNOME_COMPILE_WARNING reference which requires + # gnome-base/gnome-common dependency. + sed -i -e "/GNOME_COMPILE_WARNING/d" "${S}"/configure.ac || die + # Hide users with uid < 1000 + sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf || die + eautoreconf +} + +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 gtk liblightdm-gtk) \ + --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 + # 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 + pamd_mimic system-local-login lightdm auth account session +} + +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/metadata.xml b/x11-misc/lightdm/metadata.xml new file mode 100644 index 000000000000..a378f0381f15 --- /dev/null +++ b/x11-misc/lightdm/metadata.xml @@ -0,0 +1,16 @@ + + + +no-herd + +hwoarang@gentoo.org +Markos Chandras + + + Replace original gnome background with one from Gentoo ten project + Use dev-libs/gobject-introspection for introspection + + + + + -- 2.26.2