summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-02-01 09:12:31 +0000
committerPacho Ramos <pacho@gentoo.org>2014-02-01 09:12:31 +0000
commit1c485c003cd28d9727227a2f1ee15bb8ccb5deab (patch)
tree967718fefdac734f67d02b7fc7ee035da61a2bdc /gnome-base/gdm
parentFix dependency on samba client for samba-4 (#499788 by Torsten Kurbad) (diff)
downloadgentoo-2-1c485c003cd28d9727227a2f1ee15bb8ccb5deab.tar.gz
gentoo-2-1c485c003cd28d9727227a2f1ee15bb8ccb5deab.tar.bz2
gentoo-2-1c485c003cd28d9727227a2f1ee15bb8ccb5deab.zip
Fix consolekit paths (#499434 by Ian Abbott)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gdm')
-rw-r--r--gnome-base/gdm/ChangeLog6
-rw-r--r--gnome-base/gdm/gdm-3.10.0.1.ebuild7
-rw-r--r--gnome-base/gdm/gdm-3.8.4-r3.ebuild7
3 files changed, 13 insertions, 7 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 619c6eda1c50..20ccc5c6c69e 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gdm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.390 2014/01/03 20:13:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.391 2014/02/01 09:12:31 pacho Exp $
+
+ 01 Feb 2014; Pacho Ramos <pacho@gentoo.org> gdm-3.10.0.1.ebuild,
+ gdm-3.8.4-r3.ebuild:
+ Fix consolekit paths (#499434 by Ian Abbott)
03 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
gdm-2.20.11-r1.ebuild, +files/gdm-2.20.11-underlinking.patch:
diff --git a/gnome-base/gdm/gdm-3.10.0.1.ebuild b/gnome-base/gdm/gdm-3.10.0.1.ebuild
index 2a5a62afe892..7777048b5a24 100644
--- a/gnome-base/gdm/gdm-3.10.0.1.ebuild
+++ b/gnome-base/gdm/gdm-3.10.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1.ebuild,v 1.1 2013/12/24 16:21:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1.ebuild,v 1.2 2014/02/01 09:12:31 pacho Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@@ -54,7 +54,7 @@ COMMON_DEPEND="
systemd? ( >=sys-apps/systemd-186[pam] )
!systemd? (
>=x11-base/xorg-server-1.14.3-r1
- sys-auth/consolekit
+ >=sys-auth/consolekit-0.4.5_p20120320-r2
!<sys-apps/openrc-0.12
)
sys-auth/pambase[systemd?]
@@ -159,6 +159,7 @@ src_configure() {
--enable-authentication-scheme=pam \
--with-default-pam-config=exherbo \
--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
+ --with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit \
--with-initial-vt=7 \
--without-xevie \
$(use_with audit libaudit) \
diff --git a/gnome-base/gdm/gdm-3.8.4-r3.ebuild b/gnome-base/gdm/gdm-3.8.4-r3.ebuild
index 632198c365d9..99666e34341f 100644
--- a/gnome-base/gdm/gdm-3.8.4-r3.ebuild
+++ b/gnome-base/gdm/gdm-3.8.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r3.ebuild,v 1.4 2013/12/08 18:25:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r3.ebuild,v 1.5 2014/02/01 09:12:31 pacho Exp $
EAPI="5"
GNOME2_LA_PUNT="yes"
@@ -58,7 +58,7 @@ COMMON_DEPEND="
systemd? ( >=sys-apps/systemd-186[pam] )
!systemd? (
>=x11-base/xorg-server-1.14.3-r1
- sys-auth/consolekit
+ >=sys-auth/consolekit-0.4.5_p20120320-r2
!<sys-apps/openrc-0.12
)
sys-auth/pambase[systemd?]
@@ -174,6 +174,7 @@ src_configure() {
--enable-authentication-scheme=pam \
--with-default-pam-config=exherbo \
--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
+ --with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit \
--with-initial-vt=7 \
--without-xevie \
$(use_with audit libaudit) \