1 |
ssuominen 11/12/23 05:03:05 |
2 |
|
3 |
Modified: ChangeLog xscreensaver-5.15.ebuild |
4 |
Log: |
5 |
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" |
6 |
|
7 |
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.297 x11-misc/xscreensaver/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.297&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.297&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.296&r2=1.297 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v |
19 |
retrieving revision 1.296 |
20 |
retrieving revision 1.297 |
21 |
diff -u -r1.296 -r1.297 |
22 |
--- ChangeLog 21 Oct 2011 15:17:00 -0000 1.296 |
23 |
+++ ChangeLog 23 Dec 2011 05:03:05 -0000 1.297 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-misc/xscreensaver |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.296 2011/10/21 15:17:00 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.297 2011/12/23 05:03:05 ssuominen Exp $ |
29 |
+ |
30 |
+ 23 Dec 2011; Samuli Suominen <ssuominen@g.o> xscreensaver-5.15.ebuild: |
31 |
+ Use x11-misc/lightdm for USE="new-login" by default if it's installed since |
32 |
+ it's the most generic one out of lightdm, gdm and kdm wrt #392967 by |
33 |
+ "Small_Penguin" |
34 |
|
35 |
*xscreensaver-5.15 (21 Oct 2011) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 x11-misc/xscreensaver/xscreensaver-5.15.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: xscreensaver-5.15.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- xscreensaver-5.15.ebuild 21 Oct 2011 15:17:00 -0000 1.1 |
53 |
+++ xscreensaver-5.15.ebuild 23 Dec 2011 05:03:05 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild,v 1.1 2011/10/21 15:17:00 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild,v 1.2 2011/12/23 05:03:05 ssuominen Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
inherit autotools eutils flag-o-matic multilib pam |
62 |
@@ -32,7 +32,7 @@ |
63 |
jpeg? ( virtual/jpeg ) |
64 |
opengl? ( virtual/opengl ) |
65 |
xinerama? ( x11-libs/libXinerama ) |
66 |
- new-login? ( || ( gnome-base/gdm kde-base/kdm ) )" |
67 |
+ new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) )" |
68 |
DEPEND="${RDEPEND} |
69 |
x11-proto/xf86vidmodeproto |
70 |
x11-proto/xextproto |
71 |
@@ -48,6 +48,12 @@ |
72 |
MAKEOPTS="${MAKEOPTS} -j1" |
73 |
|
74 |
src_prepare() { |
75 |
+ if use new-login && has_version x11-misc/lightdm; then #392967 |
76 |
+ sed -i \ |
77 |
+ -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ |
78 |
+ configure{,.in} || die |
79 |
+ fi |
80 |
+ |
81 |
epatch \ |
82 |
"${FILESDIR}"/${PN}-5.15-gentoo.patch \ |
83 |
"${FILESDIR}"/${PN}-5.05-interix.patch |
84 |
@@ -57,14 +63,13 @@ |
85 |
|
86 |
src_configure() { |
87 |
if use ppc || use ppc64; then |
88 |
- filter-flags -mabi=altivec |
89 |
- filter-flags -maltivec |
90 |
+ filter-flags -maltivec -mabi=altivec |
91 |
append-flags -U__VEC__ |
92 |
fi |
93 |
|
94 |
unset LINGUAS #113681 |
95 |
unset BC_ENV_ARGS #24568 |
96 |
- export RPM_PACKAGE_VERSION="no" #368025 |
97 |
+ export RPM_PACKAGE_VERSION=no #368025 |
98 |
|
99 |
econf \ |
100 |
--x-includes="${EPREFIX}"/usr/include \ |