summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-23 08:45:01 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-23 08:45:01 +0000
commit59c05d432e4afffe103611647f30aa7436f9eb8f (patch)
tree8390b2090a43899d1b85ea8542f8923a6e9a4c12 /xfce-base
parentremove vulnerable versions (diff)
downloadhistorical-59c05d432e4afffe103611647f30aa7436f9eb8f.tar.gz
historical-59c05d432e4afffe103611647f30aa7436f9eb8f.tar.bz2
historical-59c05d432e4afffe103611647f30aa7436f9eb8f.zip
Change consolekit depend to || ( ) for systemd.
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'xfce-base')
-rw-r--r--xfce-base/xfce4-session/ChangeLog6
-rw-r--r--xfce-base/xfce4-session/Manifest16
-rw-r--r--xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild4
3 files changed, 17 insertions, 9 deletions
diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index dfdeb5366e60..f91b5db10726 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for xfce-base/xfce4-session
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.146 2011/11/26 18:00:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.147 2011/12/23 08:45:01 ssuominen Exp $
+
+ 23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-session-4.8.2.ebuild:
+ Change consolekit depend to || ( ) for systemd.
26 Nov 2011; Raúl Porcel <armin76@gentoo.org> xfce4-session-4.8.2.ebuild:
alpha/ia64/sparc stable wrt #386963
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 8f0e28588172..c2285064bbc5 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,13 +4,17 @@ Hash: SHA1
DIST xfce4-session-4.8.1.tar.bz2 1469105 RMD160 77085eecc7c0e7ad44bd790a2e0ae0f1a6dfc976 SHA1 a33534e53fa36a38a1f9bd164469a9fb62c765a7 SHA256 1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829
DIST xfce4-session-4.8.2.tar.bz2 1607774 RMD160 43bbbe64a99efbd655ce5949b0402b0b4c57f5d6 SHA1 636c2983552861a959225e554898675152a4d812 SHA256 31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0
EBUILD xfce4-session-4.8.1.ebuild 1604 RMD160 a06e9efeb54adcfed5e7e37f0c1618d748ca9583 SHA1 b664f5ea56ae961b137b7dbe0019aa1c6b5c9d00 SHA256 6023cc850548694b99823dae7a32fa26a3ddbcd331222ef2f1c89f1eba38c137
-EBUILD xfce4-session-4.8.2.ebuild 1605 RMD160 2e904d4e0f4a068855d96e3dea0bd917e3a8f3c1 SHA1 33d7ab4da5ccf15794b2c01cff73a443bee7b0b3 SHA256 c17791c82eb5fed5a0beffbb1937a4e2ba0d071a1e633c8c39166270be6a872c
-MISC ChangeLog 18978 RMD160 fd13da7308d356df81a3d9132279651875bd12bd SHA1 212b3c08583d0bc7fbd7014d60840a0a755652fb SHA256 77e82dc0a73fc1c875be175a417330d0d0cacd1d2a03497210a43c5b913846f7
+EBUILD xfce4-session-4.8.2.ebuild 1631 RMD160 94817899c61a99efa4c46678dd757b198dff6c6d SHA1 cf2e6d2b8930bfe43209b6ebbcfa7faf83774d7e SHA256 c1b5cce957a364f3b505651d3d619415c0f95122af2760e2846de331290c8555
+MISC ChangeLog 19115 RMD160 95d0a0ec280f619628b35b847b1ce1785ac49310 SHA1 0398718de583e2fab05950e68f32dda3c8ea9e4f SHA256 60f666c7a8e5524bcbf73fdf9dc6e938889f910a13637f0a1c1c35fdbb70fb52
MISC metadata.xml 390 RMD160 60014a1bb67add6ba335edff1c52cd9a1e39ec3f SHA1 a929c70f63bb91baa9dccb456ec26f5586fa1a4c SHA256 1d122a4418cea15fd68cb18d3c1b6db5120ac2109f228fbf6805967d9cb1431c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7RKTIACgkQuQc30/atMkDTQACgwhvk0FrKRRNz0Qerw6JUJvJO
-+XkAoJiaxng9g+liB3lt4ooPRzjoTIfH
-=2rtE
+iQEcBAEBAgAGBQJO9D9YAAoJEEdUh39IaPFNK9AH/jGJHWbgO8urzoVqeiTZMjXP
+2uHMYVVKdEgDnkm2UJXHJLoH1lZ/086iBrnvP+Wr7sR6sT4wOBQXmYJW3VotbPEr
+G9KGWqPsOtOS01nEOy+BTAsfUC5tR+3PK5/ed3D5YbkrzM6OUvqajRi7HtbeceUl
+uMdNXcCeedC+f/+tNaP2zWf8QC2zFXBlSutKPlKOKe2KLcN8iLVgqR/bCNJSB7PR
+T7ANlSPLrcajTfmWzNlWZpT7WXtzQY//teJrDGsAkcA4Lw9XfoiazE7x0OffTtKK
+D9eyJgY9rSprpc0WtxjgV9Cep9XNCaKZpSH8c0B14bhd1y17LGrXns30twMYXC4=
+=uv/Y
-----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
index 3ea972216518..bf763bdc6f70 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.8.2.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/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild,v 1.5 2011/11/26 18:00:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.8.2.ebuild,v 1.6 2011/12/23 08:45:01 ssuominen Exp $
EAPI=4
inherit xfconf
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.92
gnome-keyring? ( gnome-base/libgnome-keyring )
xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 )"
RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
+ consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
policykit? ( sys-auth/polkit )
udev? ( sys-power/upower )"
DEPEND="${COMMON_DEPEND}