Skip broken ~ dev-libs/glib-2.38 releases wrt #501330. Remove /var/run directory from the image by rm -rf.

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

3 files changed, 21 insertions, 12 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 0abfedf98979..37237844661a 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.167 2014/03/14 12:22:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.168 2014/03/15 12:06:26 ssuominen Exp $
+
+  15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.6.ebuild:
+  Skip broken ~ dev-libs/glib-2.38 releases wrt #501330. Remove /var/run
+  directory from the image by rm -rf.
 
   14 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
   -consolekit-0.4.5_p20120320-r1.ebuild, -consolekit-0.4.5_p20120320-r2.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index f5df84829013..d03e8cd39bdd 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,17 +9,17 @@ AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad
 AUX consolekit-udev-acl-install_to_usr.patch 750 SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd SHA512 d2d6fcedea5e72f5a1b387f411ac62a59fd3c9e90a318bd85c35d210b89b18f01511f6b05352c1a4a9508622f0b9242c1b9c15d5ae4f8adf2819b6c3a0ff5ac9 WHIRLPOOL a9b8f48c5dddabfa28c2a65ac99c10dd7cba41d8bdcdc1fac4a0932391a81d9ed87f34115d7a43611d2cd126d10a5378edb8e734c888d529eca4b0d20dd15ac1
 AUX pam-foreground-compat.ck 389 SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 SHA512 3cabd23ff7dc5de0a86284c3a3d3ff923228969cc954a1036290d4f7f6d58646ea6ea1445f472476b6f319df4dcd22f71e5e0f5cc8c845cd7e0b148af689ce5a WHIRLPOOL a8e36292dc094e107492e65efd147b35e217c652c8bcc52c768942b15660ff7d251e55ee038ce326905f5dc8f17857b62725768d60c3d5c93927550c8ff47db2
 DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-EBUILD consolekit-0.4.6.ebuild 3262 SHA256 2c9a3de3802553b48d353c0103308dd67a343f2e8dd3d2db5138d8642f58740a SHA512 20c1700c2ca2a9f9a3e8c1b8b2c34c29466ff066472142429bab87e96f4bd4377616aa2f432f6c2708e08f82c8f6c93fb6d2243770ecf0b90ff600594df86a97 WHIRLPOOL 8479894d7d9f363d4c39859549b9193c8c563213e535e1ffa5aa060483bb1957facc8bbe3d4ce848c7b895cf780e04b133ad826b74b6acec44c2d010ec1b602d
-MISC ChangeLog 25779 SHA256 faa0cae4649fa8b4ac7513fc47062f904f6c5448e578c23ffb763a03888c45fa SHA512 842f6f5e8cae6541db16c5d9ad23e294628cb5b2706e3f3c11c5be523b75a4d9278a65ab3a63e1c9fdcec9cf250b17bfd7cea74a7dc2954db6769a9c311c1479 WHIRLPOOL 3d557d44e4d2becc6baac902a1f6e00614803d9df034fb470f9e10aff6889673f36a20eb5b4940ec4f02b89f99a64c62d83314c7a04e73bfe85157eb4dff09f7
+EBUILD consolekit-0.4.6.ebuild 3508 SHA256 3dea9efd1e9c86e962a4477b0864bba3140de529fcf2c93071404df68cd7f178 SHA512 09e0b32da2569cec6890aba876d75cb11095d30fbf5ebd03b209311520a45b87dcd3f0feeb3ee24bc4bfb35377578b89c72402f9aa5f2cd24e3ad04d7a8980a1 WHIRLPOOL 24d0612b2407cb2a267e86b3156f17ee12f854eacd79dad840d8f09586c62b792f6eb029ea73cadaabd79a82262952c75628b50c207e04de53739357a7f75a51
+MISC ChangeLog 25970 SHA256 8985a57720a01e430f60ab5cc1c0d3eb5c82bba959bb1748ff9a8112420371eb SHA512 75347d37d8d130bc00f2b0fbd3f35d4284942d3bebfddeab8d6e8ed8aefda6978a9610e999c46190929b0caebc1d15bbc6c6592c2539e916a966e2d2c4bb1b89 WHIRLPOOL 8664da1cad05e93a949c5d37a2363bed3eff4403711a6c2b2e5655ef454f5a31c771ac4732d8f778826b2313f769e0fe42b74d684664f5e06d29c76e51f7ccea
 MISC metadata.xml 453 SHA256 f182dc5500ee9068f6ad0bfb82dbc1fdee940e554e48f7bbfc749664397d37eb SHA512 9e28b7ee7e9156d5b3f36890b48cadd692428acf271320d96c5c62af34f1792e4fba8c8334cac6d33524cfc5dad9a293862ff3711251de4359ddaedb7cfe8b87 WHIRLPOOL dd6e9d7fb59367161ccb27ee2f97adafddadf03f67dd4581ff29cd51deb0e9f4483af062e1c58677a5752f9b56bbc98ae773fdacde18764568b8d4d3033d00ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTIvO2AAoJEEdUh39IaPFNi28IAJQkxgrds/fYnTlUxLImSsaL
-pzWyHyu/8MEi9et53csHJI2M3i77se4wnh/NNSGxrIOkRksDcKVtKhrNiBaT+8rp
-I6UDndz3sXJJPkDvkw3MeMVB8W8Nxt07KeK3AF9EoVAzsW1nYtHmG7ZT/19phh1Z
-F8f5q5B2YzQFSvV4d259itCl0uHcuRTESEpT8U5C7xieDOZ7ET/I9sfSYfL9I1/R
-jt7U3hfflKTqwrKXRdv9bpe+O9NtAoSkytcUfkqvTsNfnTaNgfZTZaf0dOARqIHo
-aKM+4aNzP0ynx1ULuttrd/BLO6LT82dYwEkcNC/BnV+Oyp5ja9fe4eqj8hcFxQY=
-=OhLq
+iQEcBAEBCAAGBQJTJEFWAAoJEEdUh39IaPFNkgEIAJdL32YcVa/PRh6CZ2DDxFWb
+WCZzpWKIIJ46fE6gIt4YU5f0P9D+ljUGXfqSuq6ECG+zPCDvCZlokTpIS5+BP8gx
+iJh1oYZpuscOfC6pect99mWqbarz+4mSBs9MTA2TNJQb8xGSFxdG9zkUkji2y700
+idoM92os0jB2pxW7slNmLY9foDFqoz5oaW9vQ5gExKscER7ERPjBZlP6Hea7zmbz
+UnK9bxA6MbRQrhxvoMFrbuKuaVMF/uDqudOXeJvYkgHoUgXG+ha1VWjl5XtxvtMb
+muyVQyOsDMokzOLXSFgXHjspAXFAYU+9GAGAx0i24FW9g2Bdt3RgfyKPqMLkHNk=
+=LEGO
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index 283936920049..5fbe151747bf 100644
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6.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/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.12 2013/09/06 18:33:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.13 2014/03/15 12:06:26 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam systemd
@@ -17,7 +17,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="acl debug doc kernel_linux pam policykit selinux systemd-units test"
 
+# TODO: Cleanup the || () hack later, like end of the year:
+# Skip certain broken glib 2.38 releases wrt #501330
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+	|| (  >=dev-libs/glib-2.38.2-r1:2 <dev-libs/glib-2.38:2 )
 	>=dev-libs/glib-2.22:2=
 	sys-libs/zlib:=
 	x11-libs/libX11:=
@@ -116,4 +119,6 @@ src_install() {
 	prune_libtool_files --all # --all for pam_ck_connector.la
 
 	use systemd-units || rm -rf "${ED}"/tmp
+
+	rm -rf "${ED}"/var/run # let the init script create the directory
 }