diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2011-10-26 07:33:47 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2011-10-26 07:33:47 +0000 |
commit | c47c6c98bb3a3f6cff0913695e0848aa0254239f (patch) | |
tree | 10995bf016dac84bda431fdd3c0176cf4e7e8585 /x11-misc/lightdm | |
parent | Restrict Python 3 due to bugs in it. (diff) | |
download | gentoo-2-c47c6c98bb3a3f6cff0913695e0848aa0254239f.tar.gz gentoo-2-c47c6c98bb3a3f6cff0913695e0848aa0254239f.tar.bz2 gentoo-2-c47c6c98bb3a3f6cff0913695e0848aa0254239f.zip |
remove old
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/lightdm')
-rw-r--r-- | x11-misc/lightdm/ChangeLog | 7 | ||||
-rw-r--r-- | x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch | 27 | ||||
-rw-r--r-- | x11-misc/lightdm/files/lightdm-1.0.2-configure.patch | 29 | ||||
-rw-r--r-- | x11-misc/lightdm/lightdm-1.0.2-r1.ebuild | 107 | ||||
-rw-r--r-- | x11-misc/lightdm/lightdm-1.1.0.ebuild | 108 |
5 files changed, 6 insertions, 272 deletions
diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog index 5b2f126291c1..ee8adeb39268 100644 --- a/x11-misc/lightdm/ChangeLog +++ b/x11-misc/lightdm/ChangeLog @@ -1,6 +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.14 2011/10/23 17:11:05 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.15 2011/10/26 07:33:47 hwoarang Exp $ + + 26 Oct 2011; Markos Chandras <hwoarang@gentoo.org> -lightdm-1.0.2-r1.ebuild, + -lightdm-1.1.0.ebuild, -files/lightdm-0.9.7-gtk.patch, + -files/lightdm-1.0.2-configure.patch: + remove old *lightdm-1.1.0-r1 (23 Oct 2011) diff --git a/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch b/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch deleted file mode 100644 index c3ab47cc1b9f..000000000000 --- a/x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/files/lightdm-1.0.2-configure.patch b/x11-misc/lightdm/files/lightdm-1.0.2-configure.patch deleted file mode 100644 index ff205809c89b..000000000000 --- a/x11-misc/lightdm/files/lightdm-1.0.2-configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: lightdm-1.0.2/configure.ac -=================================================================== ---- lightdm-1.0.2.orig/configure.ac -+++ lightdm-1.0.2/configure.ac -@@ -13,8 +13,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R - - GOBJECT_INTROSPECTION_CHECK(0.9.5) - --GNOME_COMPILE_WARNINGS(maximum) -- - dnl ########################################################################### - dnl Dependencies - dnl ########################################################################### -@@ -124,12 +122,12 @@ AC_ARG_ENABLE(gtk-greeter, - compile_gtk_greeter=no - if test x"$enable_gtk_greeter" = "xauto"; then - PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [ -- gtk+-3.0 -+ gtk+-2.0 - gmodule-export-2.0 - ], compile_gtk_greeter=yes, compile_gtk_greeter=no) --elif test x"enable_gtk_greeter" = "xyes"; then -+elif test x"$enable_gtk_greeter" = "xyes"; then - PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [ -- gtk+-3.0 -+ gtk+-2.0 - gmodule-export-2.0 - ]) - compile_gtk_greeter=yes diff --git a/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild b/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild deleted file mode 100644 index 2aa89422f2d7..000000000000 --- a/x11-misc/lightdm/lightdm-1.0.2-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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.2-r1.ebuild,v 1.1 2011/10/08 00:58:35 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 ) || ( gtk qt4 )" -DOCS=( NEWS ) - -src_prepare() { - sed -i -e "/minimum-uid/s:500:1000:" "${S}"/data/users.conf || die - # Fix configure.ac since upstream since unable to apply patches without - # introducing regressions for trying to be smart. - epatch "${FILESDIR}"/${P}-configure.patch - 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 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 - # 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/lightdm-1.1.0.ebuild b/x11-misc/lightdm/lightdm-1.1.0.ebuild deleted file mode 100644 index 89d8934663b1..000000000000 --- a/x11-misc/lightdm/lightdm-1.1.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# 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.1.0.ebuild,v 1.1 2011/10/23 16:50:42 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 ) || ( 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 - # work around for broken compilation - sed -i "s/lightdm-session//" "${S}"/tests/src/Makefile.am || 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 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 - # 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 -} |