Use x11-misc/lightdm for USE="new-login" by default if it's installed since it's...

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

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 9c81d1d304cec21b5b3783cb0b3e74f4c081c715..5639201567f848b8d6f6c5221161cea55b7f9288 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.296 2011/10/21 15:17:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.297 2011/12/23 05:03:05 ssuominen Exp $
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.15.ebuild:
+  Use x11-misc/lightdm for USE="new-login" by default if it's installed since
+  it's the most generic one out of lightdm, gdm and kdm wrt #392967 by
+  "Small_Penguin"
 
 *xscreensaver-5.15 (21 Oct 2011)
 

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 42520688aa622025d3812091decd6d7d58ac6b87..189493c138dfca09c8ee8e782924579832abb231 100644 (file)
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -7,17 +7,17 @@ AUX xscreensaver-5.15-gentoo.patch 3002 RMD160 83d0aa8101828a0884a01553db9c4ef5c
 DIST xscreensaver-5.14.tar.gz 5925175 RMD160 f3f832cf34781c68a4716298e0e5f3ad4f095106 SHA1 bfa37a9e7b2e93f54922191bb93dbc70c2f73772 SHA256 3eea040f452e17572177840566eb880b259ee5a970444f3a4ae178db18ebf023
 DIST xscreensaver-5.15.tar.gz 5977594 RMD160 58c7d4fae709b6500001df53e8ce27c48ae8a5b9 SHA1 b5ce7caa19f4d57c3bac83377a36dddbe7095052 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d
 EBUILD xscreensaver-5.14.ebuild 2762 RMD160 29bbe8f90ff624e248e4846b1337dba880fb2d15 SHA1 34cf83353d4e8f85effaa245bb8defd65720dea6 SHA256 7b840430be1fb8f585b19681d5808f2a9cddffad22153348e557b566c974e34e
-EBUILD xscreensaver-5.15.ebuild 2782 RMD160 ca44f9ee3700411c37009c9be34234285c6ddc3a SHA1 81a25c707defa6afe54723ab831f6f709af19257 SHA256 41c769124796f802afe8aac006b83781a41f225ea8225dc5e48b1d7e1804b4c4
-MISC ChangeLog 47911 RMD160 02c4494a5f76fe2c3a87e6d02d569a7f00c1c109 SHA1 bc4781ac7b1c9a7031d98eed3b952f40dce482e1 SHA256 5a70a820eb7f91dc74ce3f6977424a9aa330d9ea41020cbd561b2388670a6497
+EBUILD xscreensaver-5.15.ebuild 2967 RMD160 babf048cab7e516b1a0ba049b2a4d61818ef2476 SHA1 3f0dd7c87a38bb62cdc007d7f07ee4e8c525c326 SHA256 95e33101f3b51c957dd51ca721264f0abe6621cabfcc8af9e890205b651720d3
+MISC ChangeLog 48159 RMD160 1941f9280de83c91f4f48675dc7336f2b59d2a8b SHA1 1d460eaeeaba4fc90fa838c4281b7d21d7bc9423 SHA256 8eea994e56bd205c05c41a816f86947fd1a669e94d621449c53f32f4a1aa361c
 MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOoYzJAAoJEEdUh39IaPFNsQkH/3l86GAc58lHMiQepRB7McJS
-r1CTziU3USMOR/+xJLIHC4eEPdYan4mEwgvoeyEnM2qDJ+rJnL1VtGwxKK3nkf5y
-QR+6wtNdEV4R6FraIuK8Lha4GK4e5LB83qgcz/drKeMRGVqthToff+6hupLgVycw
-p/muoqcCMVJ8OG6f3NdE+oPxxYf7qw5+EBOIjCipMB7on2LtkmXCtuWVtcVENXkE
-KxqnCBEHK1thNi3Yej0Vow/siJIa2g2B4KvpwLBT2aP34clB+YXRgB/FcywX1q2U
-JRnC+ZBBqFHxSZn4nNOLVDSaGyLX4TRlVBwEaAC36e45r/wa5r+biC0DxEMfNKk=
-=NQsO
+iQEcBAEBAgAGBQJO9AtUAAoJEEdUh39IaPFNF9QH/AnYzmG5Lis+y+XpUq+y+i7r
+8rZGM8KQL/BCsGanLZWw3j6eWmtupgZK9YitB5pfIelbLjkGN8BDudvsCoG9cuk+
+vijpknmbBQLSpttECloQw1YpjxA10OvXXhaH5+COuR75TZSzSP5P+AqxkdNKtWH5
+zLF2Jqt1B33Hg9WtPnF0WbzDbDai4N1LaLlVryrdlRBYWmkmi/1Pn7jXX5zZL45p
++9DN/+Erju3+6mkh+qOQX5QU1mEdvSEcggdTRfbFed6x8U6bG9vT/o1eR0dvSoOX
+wKPaVJLITErS/iNm+dhBPUbqUOLfcqfUcSuIV6cWS08H2aLdlfKC1QY1cwE5Bzs=
+=J9F1
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xscreensaver/xscreensaver-5.15.ebuild b/x11-misc/xscreensaver/xscreensaver-5.15.ebuild
index 72bdde5d1ba34cec4ebd39920604507e15b24169..7f7e14fe6f9b599b36e9e90a3fc7385195f3a60c 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.15.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.15.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/xscreensaver/xscreensaver-5.15.ebuild,v 1.1 2011/10/21 15:17:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild,v 1.2 2011/12/23 05:03:05 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib pam
@@ -32,7 +32,7 @@ RDEPEND="x11-libs/libXmu
        jpeg? ( virtual/jpeg )
        opengl? ( virtual/opengl )
        xinerama? ( x11-libs/libXinerama )
-       new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
+       new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) )"
 DEPEND="${RDEPEND}
        x11-proto/xf86vidmodeproto
        x11-proto/xextproto
@@ -48,6 +48,12 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
+       if use new-login && has_version x11-misc/lightdm; then #392967
+               sed -i \
+                       -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+                       configure{,.in} || die
+       fi
+
        epatch \
                "${FILESDIR}"/${PN}-5.15-gentoo.patch \
                "${FILESDIR}"/${PN}-5.05-interix.patch
@@ -57,14 +63,13 @@ src_prepare() {
 
 src_configure() {
        if use ppc || use ppc64; then
-               filter-flags -mabi=altivec
-               filter-flags -maltivec
+               filter-flags -maltivec -mabi=altivec
                append-flags -U__VEC__
        fi
 
        unset LINGUAS #113681
        unset BC_ENV_ARGS #24568
-       export RPM_PACKAGE_VERSION="no" #368025
+       export RPM_PACKAGE_VERSION=no #368025
 
        econf \
                --x-includes="${EPREFIX}"/usr/include \