summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-03-15 12:06:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-03-15 12:06:26 +0000
commitde68c14ad34cf71f5da0d72db099b5ff6dceab20 (patch)
tree3f6c222c22a7e6e024143e408476c690a0664995 /sys-auth
parentVersion bump. (diff)
downloadgentoo-2-de68c14ad34cf71f5da0d72db099b5ff6dceab20.tar.gz
gentoo-2-de68c14ad34cf71f5da0d72db099b5ff6dceab20.tar.bz2
gentoo-2-de68c14ad34cf71f5da0d72db099b5ff6dceab20.zip
Skip broken ~ dev-libs/glib-2.38 releases wrt #501330. Remove /var/run directory from the image by rm -rf.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/consolekit/ChangeLog6
-rw-r--r--sys-auth/consolekit/consolekit-0.4.6.ebuild9
2 files changed, 12 insertions, 3 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/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
}