1 |
ssuominen 14/06/02 16:39:34 |
2 |
|
3 |
Modified: xfce4-session-4.11.0-r1.ebuild ChangeLog |
4 |
Added: xfce4-session-4.10.1-r2.ebuild |
5 |
Log: |
6 |
Use Fedora patch to introduce power management support using systemd to 4.10 series. Fix missing sys-power/pm-utils dependency in 4.11 (pre-4.12) series. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: xfce4-session-4.11.0-r1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- xfce4-session-4.11.0-r1.ebuild 2 Jun 2014 07:07:44 -0000 1.2 |
24 |
+++ xfce4-session-4.11.0-r1.ebuild 2 Jun 2014 16:39:34 -0000 1.3 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v 1.2 2014/06/02 07:07:44 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r1.ebuild,v 1.3 2014/06/02 16:39:34 ssuominen Exp $ |
30 |
|
31 |
EAPI=5 |
32 |
EAUTORECONF=1 |
33 |
@@ -29,6 +29,7 @@ |
34 |
RDEPEND="${COMMON_DEPEND} |
35 |
x11-apps/xrdb |
36 |
nls? ( x11-misc/xdg-user-dirs ) |
37 |
+ !systemd? ( udev? ( sys-power/pm-utils ) ) |
38 |
xscreensaver? ( || ( |
39 |
>=x11-misc/xscreensaver-5.26 |
40 |
gnome-extra/gnome-screensaver |
41 |
|
42 |
|
43 |
|
44 |
1.209 xfce-base/xfce4-session/ChangeLog |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.209&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?rev=1.209&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/ChangeLog?r1=1.208&r2=1.209 |
49 |
|
50 |
Index: ChangeLog |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v |
53 |
retrieving revision 1.208 |
54 |
retrieving revision 1.209 |
55 |
diff -u -r1.208 -r1.209 |
56 |
--- ChangeLog 2 Jun 2014 07:07:44 -0000 1.208 |
57 |
+++ ChangeLog 2 Jun 2014 16:39:34 -0000 1.209 |
58 |
@@ -1,6 +1,14 @@ |
59 |
# ChangeLog for xfce-base/xfce4-session |
60 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.208 2014/06/02 07:07:44 ssuominen Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.209 2014/06/02 16:39:34 ssuominen Exp $ |
63 |
+ |
64 |
+*xfce4-session-4.10.1-r2 (02 Jun 2014) |
65 |
+ |
66 |
+ 02 Jun 2014; Samuli Suominen <ssuominen@g.o> |
67 |
+ +files/xfce4-session-4.10.1-systemd.patch, +xfce4-session-4.10.1-r2.ebuild, |
68 |
+ xfce4-session-4.11.0-r1.ebuild: |
69 |
+ Use Fedora patch to introduce power management support using systemd to 4.10 |
70 |
+ series. Fix missing sys-power/pm-utils dependency in 4.11 (pre-4.12) series. |
71 |
|
72 |
02 Jun 2014; Samuli Suominen <ssuominen@g.o> |
73 |
xfce4-session-4.11.0-r1.ebuild: |
74 |
|
75 |
|
76 |
|
77 |
1.1 xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild?rev=1.1&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild?rev=1.1&content-type=text/plain |
81 |
|
82 |
Index: xfce4-session-4.10.1-r2.ebuild |
83 |
=================================================================== |
84 |
# Copyright 1999-2014 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.1 2014/06/02 16:39:34 ssuominen Exp $ |
87 |
|
88 |
EAPI=5 |
89 |
EAUTORECONF=1 |
90 |
inherit xfconf |
91 |
|
92 |
DESCRIPTION="A session manager for the Xfce desktop environment" |
93 |
HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start" |
94 |
SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" |
95 |
|
96 |
LICENSE="GPL-2" |
97 |
SLOT="0" |
98 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" |
99 |
IUSE="debug nls systemd udev +xscreensaver" |
100 |
|
101 |
COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 |
102 |
x11-apps/iceauth |
103 |
x11-libs/libSM |
104 |
>=x11-libs/libwnck-2.30:1 |
105 |
x11-libs/libX11 |
106 |
>=xfce-base/libxfce4util-4.10.1 |
107 |
>=xfce-base/libxfce4ui-4.10 |
108 |
>=xfce-base/xfconf-4.10 |
109 |
!xfce-base/xfce-utils |
110 |
systemd? ( >=sys-auth/polkit-0.100 )" |
111 |
RDEPEND="${COMMON_DEPEND} |
112 |
x11-apps/xrdb |
113 |
nls? ( x11-misc/xdg-user-dirs ) |
114 |
udev? ( |
115 |
systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) |
116 |
!systemd? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) |
117 |
) |
118 |
xscreensaver? ( || ( |
119 |
>=x11-misc/xscreensaver-5.26 |
120 |
gnome-extra/gnome-screensaver |
121 |
>=x11-misc/xlockmore-5.43 |
122 |
x11-misc/slock |
123 |
x11-misc/alock[pam] |
124 |
) )" |
125 |
DEPEND="${COMMON_DEPEND} |
126 |
dev-util/intltool |
127 |
sys-devel/gettext |
128 |
virtual/pkgconfig" |
129 |
|
130 |
pkg_setup() { |
131 |
PATCHES=( |
132 |
"${FILESDIR}"/${P}-alock_support_to_xflock4.patch |
133 |
"${FILESDIR}"/${P}-systemd.patch |
134 |
) |
135 |
|
136 |
XFCONF=( |
137 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} |
138 |
$(use_enable systemd) |
139 |
--with-xsession-prefix="${EPREFIX}"/usr |
140 |
$(xfconf_use_debug) |
141 |
) |
142 |
|
143 |
DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) |
144 |
} |
145 |
|
146 |
src_install() { |
147 |
xfconf_src_install |
148 |
|
149 |
local sessiondir=/etc/X11/Sessions |
150 |
echo startxfce4 > "${T}"/Xfce4 |
151 |
exeinto ${sessiondir} |
152 |
doexe "${T}"/Xfce4 |
153 |
dosym Xfce4 ${sessiondir}/Xfce |
154 |
} |