diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-19 14:27:21 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-09-19 14:27:21 +0000 |
| commit | 7ca2183ec9f314ff79887226fcd6f884253f6eb3 (patch) | |
| tree | 1f51dd0ac8cf2470de003a1a9e9124b02869d1bf | |
| parent | cull noise (diff) | |
| download | gentoo-2-7ca2183ec9f314ff79887226fcd6f884253f6eb3.tar.gz gentoo-2-7ca2183ec9f314ff79887226fcd6f884253f6eb3.tar.bz2 gentoo-2-7ca2183ec9f314ff79887226fcd6f884253f6eb3.zip | |
Adjust the hal/consolekit mess to be more sane.
(Portage version: 2.2_rc38/cvs/Linux i686)
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/metadata.xml | 7 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.8-r7.ebuild | 27 |
3 files changed, 29 insertions, 11 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 50f493168d41..e31aee5578af 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.136 2009/09/17 16:30:22 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.137 2009/09/19 14:27:21 scarabeus Exp $ + + 19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> + xinit-1.0.8-r7.ebuild, metadata.xml: + Adjust the hal/consolekit mess to be more sane. *xinit-1.0.8-r7 (17 Sep 2009) diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml index 01c4c004e735..90d196d68b9c 100644 --- a/x11-apps/xinit/metadata.xml +++ b/x11-apps/xinit/metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>x11</herd> + <herd>x11</herd> + <use> + <flag name='consolekit'> + Enable consolekit integration for the privileges detection. + </flag> + </use> </pkgmetadata> diff --git a/x11-apps/xinit/xinit-1.0.8-r7.ebuild b/x11-apps/xinit/xinit-1.0.8-r7.ebuild index bd8ce378ccca..b88743b77f63 100644 --- a/x11-apps/xinit/xinit-1.0.8-r7.ebuild +++ b/x11-apps/xinit/xinit-1.0.8-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r7.ebuild,v 1.1 2009/09/17 16:30:22 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r7.ebuild,v 1.2 2009/09/19 14:27:21 scarabeus Exp $ EAPI="2" @@ -14,17 +14,26 @@ DESCRIPTION="X Window System initializer" LICENSE="${LICENSE} GPL-2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="hal minimal pam" +IUSE="consolekit hal minimal pam" -RDEPEND="x11-apps/xauth +RDEPEND=" + x11-apps/xauth x11-libs/libX11 - hal? ( sys-auth/consolekit sys-apps/dbus[X] )" + hal? ( sys-apps/hal sys-apps/dbus[X] ) + consolekit? ( + sys-auth/consolekit + hal? ( sys-apps/hal[consolekit] ) + ) +" DEPEND="${RDEPEND}" -PDEPEND="!minimal? ( x11-wm/twm - x11-apps/xclock - x11-apps/xrdb - x11-apps/xsm - x11-terms/xterm )" +PDEPEND="!minimal? ( + x11-apps/xclock + x11-apps/xrdb + x11-apps/xsm + x11-terms/xterm + x11-wm/twm + ) +" PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch "${FILESDIR}"/gentoo-startx-customization-1.0.8.patch |