Fix consolekit paths (#499434 by Ian Abbott)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 19 insertions, 17 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/Manifest b/gnome-base/gdm/Manifest
index 5d50cea8fef0..e18851f7eaee 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -39,18 +39,14 @@ DIST gdm-3.8.4.tar.xz 1677040 SHA256 db40fb66bf476721b6d333abe0bfed7feacdca7d492
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
 EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
-EBUILD gdm-3.10.0.1.ebuild 6527 SHA256 06f227800735f9a87bc62e58c651036638169c1b13ed69bb353fe25096b6be29 SHA512 187684fa6bc28306b9e0d2e6dd29068e735ba86958114dd01142843725d85cfce5ee7e1febece399c774dd25ee7c3afed14bda3a9e6aec3555f415aa35c5953f WHIRLPOOL d545aa8f0be88e1c61c32a584b09f54581fca45dcfd3d1231628fcd8b6298ad1f75c1b53477ab24a006ba017f98e093ca9e1a62f8e364f2250205d659b8b96d3
-EBUILD gdm-3.8.4-r3.ebuild 7089 SHA256 c450865f0d09eaae7513e50b091b414e2b3eb6537b4cffe4bdff31860fc34811 SHA512 237b7bfd3b56db0df24dc1962cc0493a6b4bc460074684a96ba5416f2a8ca204b5c1b7bf483c2391608a1762808f3d210596990e91fa2326f4060a1736d6488a WHIRLPOOL a4e4c11c2a129b97436100a71693dd1f871d71ff643c3c50dea574aee79bd20138d585562bfdcf4296dbe99f13dc3b3c0fb5fe23b50de86d9c68013c73110ca3
-MISC ChangeLog 59633 SHA256 b9ad9b872dd2232f3ad623e6c402b8c480880a331c2dd5cd0b3302d20995fe01 SHA512 9ee9c61b99f1b027b209886d39ce62ae82b2d1ec7f8139563ed94af2d95cab0de9aac5ccc5505f15a6b7693233002f80636fc7756529046d10e2b3178648f553 WHIRLPOOL 1b10aa14b2da325cdf6e97ba242a323bd60f31c1654d21448e465a4aee535e79033e2eeff76d1eafb46c6bd30d1a3b994542789ee1fb25876a7a0ce1f4abb8aa
+EBUILD gdm-3.10.0.1.ebuild 6610 SHA256 689db38b3183a5f3259bef186e7d3c133faac0729d71bbef157e32434638bb27 SHA512 e3f36f9301229ee43f5ee001c254e2ace144b0460937750a058f480d4ec1a8161f6176ec859a81c892e1fe64fc76fca4cd537f0ee0ba8c79ff787f28db99eaca WHIRLPOOL 7ad51b67e5f9c9ab8cb517e1e8065a279bb072f3cc7800e8e8b1fba7c3071e4041d7bd0376cc31b8c093118f003b81f0e46581b9d70367aee3e8036c21854c66
+EBUILD gdm-3.8.4-r3.ebuild 7172 SHA256 1efba3a67cefdbc2dc8c1fd1b0a4a7e1815bed4fce880e390f1e54fa46d35e48 SHA512 5fbb6e794ca95f61d0ebb0588ab05a985f433afc92d35b7442c64801f850c29a2e491477e35e811d796bea31561c703273537c233c819b817180063bd9562926 WHIRLPOOL 14f8fddd69aba5af70f43a3fb8c40f910e4567306589b0c50a818f1473d39175d5c2bb4e8ea8b0a1af9ad1396667001387a3275a17e1f37ceac618f247f1f613
+MISC ChangeLog 59767 SHA256 8ffffbc476af316f24d5be0d8c34b232e84c165759268150d5775c4a72148f5d SHA512 36f491796be51232f58f28aa3f3a2530cb66af013cf8a1563ab0cdb1183df73adf0f992439b4f81e2194cf15c98e5de4b1f0c2eeafa31ecfe197a7e881f8abe0 WHIRLPOOL 0abcfe58b23396df57454bef85ade219e6c689d8ba0661fc566d8e2c9feef8b6fdad539cf387d2bea77b4020cf2438f3a953e3cca77b942d18c99b8e137357aa
 MISC metadata.xml 944 SHA256 08ee2dd40862efd5316443b8d84df4a1dafca76236e0f107240d8ccb6a0d0087 SHA512 f1ca94a651af983dd0e8b8b346be9c682011ec1c9a3293bb54fdd4a6effae14cd4a8efe2dfff7d143faad39cdcd9dab92bf7bad0244b1cca3e5e24c557963544 WHIRLPOOL dc83e5716dd4545c4daa1ee2b8aa7c6f993d0781c0518c2102c30772e683c46b56d1fe5494b6814232db434b96230c7bbd60790d158cd0f9fc24d69b91368219
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSxxneAAoJEJ0WA1zPCt1hcCMH/AhVQYJRsZJ9poxNNtxsXSr7
-Br05kdKb7JzKAiY/G/m5E604nZKnpUxMZnalZqs3LWD3jwmQ5Ag49iETtnNSgl0X
-o+Te/h4NOpPgkHwFke6lh5vdSPKTb6PXZs6C6uhyRnBhl0BXzclSTYnmIYxO/plK
-VI8ILDtgZ17/cspFR1rENdpRHkSc43Iy+A+moRqZeUu9AkHEeeUQekR8TmMEB8em
-SgNcyQRl7QTy0nEjysDXdlQiI9p7GEhNvQPzw+sbjCzB02KK3066MUZBPIkdm1l0
-zD7/oazpORVnphgwUAXZUvac48EM827mM/73lWud9hV5lARwrS644QIuvg0ssSA=
-=Af2u
+iEYEAREIAAYFAlLsuoAACgkQCaWpQKGI+9QSewCfaY7tND+MdXY9tlBrZMi5mvmp
+OtMAn03ernh4akMDI/NlX0FLNok1UjEo
+=tXmQ
 -----END PGP SIGNATURE-----
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) \