From 979d376aa22993e08bbf9521cba8a629e5fb8c9a Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 26 Oct 2011 07:33:47 +0000 Subject: [PATCH] remove old Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- x11-misc/lightdm/ChangeLog | 7 +- x11-misc/lightdm/Manifest | 29 ++--- .../lightdm/files/lightdm-0.9.7-gtk.patch | 27 ----- .../files/lightdm-1.0.2-configure.patch | 29 ----- x11-misc/lightdm/lightdm-1.0.2-r1.ebuild | 107 ----------------- x11-misc/lightdm/lightdm-1.1.0.ebuild | 108 ------------------ 6 files changed, 21 insertions(+), 286 deletions(-) delete mode 100644 x11-misc/lightdm/files/lightdm-0.9.7-gtk.patch delete mode 100644 x11-misc/lightdm/files/lightdm-1.0.2-configure.patch delete mode 100644 x11-misc/lightdm/lightdm-1.0.2-r1.ebuild delete mode 100644 x11-misc/lightdm/lightdm-1.1.0.ebuild 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 -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/Manifest b/x11-misc/lightdm/Manifest index 6012e933a888..d7370f753845 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,25 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX lightdm 209 RMD160 376933fdcdbc9a3196a1eb741f152cac7447c7b3 SHA1 4903519bee34d24c89e42de9e6a4199ff8e8396e SHA256 ccbc64732dce394e0d238e4c095bdbcab23b4adfdbcf213a763e26d96476d208 -AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93 -AUX lightdm-1.0.2-configure.patch 1015 RMD160 5ea3d31f95f5318d351413f1d09e983cf4af8429 SHA1 a24924da266e8ccff5f9d5532e9f3a19428dd94a SHA256 5395266e2e41c31518a07381b45e01e7c1fe80aad4d06de7980c43a489dfe9e2 -DIST lightdm-1.0.2.tar.gz 633166 RMD160 e5ce68d4a89cfa558d79cd9201c8e6a81d698816 SHA1 fc859453768235da064d0f567c19d8e1abc44e28 SHA256 47ca033de6cd083e12d5dc5065bcbbfc1cbd2624bebad397be9eedd426515180 DIST lightdm-1.1.0.tar.gz 639331 RMD160 7bd38b00a76a977b35408483badd2cdbd66d38c0 SHA1 ba914e667e6383bc39831c62a72ccf84a961b587 SHA256 e8c26ae74760069e26ad61643d7b685f941c30024a2c2dc034945e28ee04bca8 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba -EBUILD lightdm-1.0.2-r1.ebuild 3245 RMD160 5cb6f29596689661b8524a025fc831daa8650a72 SHA1 95d5f6264f0278833bb082e0150581da3cde3cde SHA256 3c1ea8a7c32eaca67a61a17386f46dda9e92bad5a6ab3f38de6e1dd102e0f561 EBUILD lightdm-1.1.0-r1.ebuild 3214 RMD160 7f71c1cb0eddd48c731743202c2182f80e8e4e7a SHA1 1f4d58e355fa6b67e4d9ef0e464e67fd9c4ebc42 SHA256 89c359d6916f5bbaaee49fd4dbe5a4ab424a8f5e1815f4dd3cc085f13adfe2ac -EBUILD lightdm-1.1.0.ebuild 3241 RMD160 6a64dd4dc2da824a0c3e1885231637fd235eb870 SHA1 48148739be578e56bca06093a62450186ff9d569 SHA256 83a02ef9b58cc7dccbb54f6db7764f0ff535f4a18dcc4e602e2cff99bea085e1 -MISC ChangeLog 1613 RMD160 c788e70455c043d168154f73dacdb8d724f57174 SHA1 6988ac9460f58c84181ac4072b4d8d6010837cb8 SHA256 ca95c517b10d07821d7deb238281d7ad8700d0a34228227722d36c2f30208a20 +MISC ChangeLog 1802 RMD160 e42b4a3dcacb8048d40484d124d42b6d57478c9a SHA1 80de146d76a86c492f21a1b224a07b2cef1ba6c0 SHA256 ffd99c8d85532b4796cd2908f5ee2e2a5386b2c9e4fd9c262e2f9ab70e242410 MISC metadata.xml 476 RMD160 ffe13acf80a13cf4793170da46aac1087ab9e753 SHA1 6de246984b16415d8e1fe8cab2478ce5b1da4c31 SHA256 a3a8bd4e87cb4735bcc99606498b27552517c024d0ac85b05a7aec35c6c2983d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOpEp/AAoJEEdUh39IaPFNlygH/j0zaQE5AEW/XRVnQrmXwS4T -OSKa8MdAU5omsWET5HN0oz0cXGL4ZTNMII4y9bp/0sddktTwD9VuGdN+9kHmKix8 -GmFEjW5+5njMgqEdQG9BeIoDSbUArTqUvS0iPynBuve5XnVjz5MS/TNlOMX6uMF0 -L5vYUvGer9cvxLVGL6IvIvD2bDeGu3H73rZCCR6oHhTqXPVPxKi1klrr9Pkk5SYd -w1NY3SGxEPXEPv4+lUQMuDf5Kb0OrLW86x5Qa/N70oXXcmPzqHufJjz3aKbgd1xT -E684PfN1R2JqyH+u3dBlFNRlck7w2b8IC3hxHI4rnTqM+Jz1Z0vug85DIZ2kgZI= -=7l+k +iQIcBAEBCgAGBQJOp7fgAAoJEPqDWhW0r/LCpFYQAK64I5ITlGPnIFFNFLg650ge +pwoPZRncrHUXOfDTD8i9WgXRgY6Q7i5tmszx3EHjQ9cD3bTbvDnu0S4IyobviI3A +Xm4Vjln9tkB347nXc3SFZzKU2nHwXPHuSM+Fki3kgNWRUEJQhg30WlqsqGkP+4Db +M4jbmyIQeCheJ2NghuBMKJQ4GXtmZqlUzYWOlqwBFG8/CkzzgZEcollPbIzPFGcJ +zMB5dcA5cIUVUmCzyZVEnhtWQDCKiAr9M2o78eaSgncfzfKvPeayfYymiRVW1mSF +jc0P8LCazM7BTrLnrJ+EIgbcm52rY8GYC9aHwrKczwRZFOtl2He8m4N7XXkYZBBc +DLqoxd6zMXcu5RbKADbXlziGRF00KBV2XHs1cb9BQTS6gFVyJoJQBz1S6pPjRSYZ +eNpW7qwA9NXWRD1+OZZePUJVSjfr0PARhTs6Zl5hJ8Fdks7PrYdxzHHgkprSFO0l +vSRp6TCAIjZjJk8tUZXl+DCEKzMDJb93Y4YxLYjTV6+TfWG8eIE/5QLAcMSMdLWZ +e1y/p+htnzCr4LJMg+m/eq06ocPEcF3IiFlwvKLFrHKB675HXxB5ZQ5G90+RuoHw +2jl92JEhrzBmAP9VwLXdcKj/Bgx8iTGNnNpMrOmNYlIBnej3uQnyIsa41ffPOB1L +rbECflRP00r61ncvdH1/ +=AbeC -----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 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 -} -- 2.26.2