Improve systemd handling wrt #416317 by Christoph Brill

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 22 insertions, 48 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index e72b83b0e1e2..3f707a14f073 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.75 2012/05/14 11:43:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.76 2012/05/20 13:15:43 ssuominen Exp $
+
+  20 May 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.105.ebuild:
+  Improve systemd handling wrt #416317 by Christoph Brill
 
 *polkit-0.105 (14 May 2012)
 
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index d0c9a68614ec..7541d3866524 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
 DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
 EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
-EBUILD polkit-0.105.ebuild 3581 RMD160 7ca28e3fcaa3a78232d8c5f865c77f5fe5b2e532 SHA1 9c842fc879d6acedcf8e889d5b47211fd21fa4f2 SHA256 00de976542ae7ec3101b9b12622b4c22309c342abad4fdde0c5971e690ca566d
-MISC ChangeLog 9924 RMD160 5510809fec6a8784a9565b4c88c4269b69fbe218 SHA1 08494893f8fa94688c32e2118f1e40afcd4b247a SHA256 61ff582d5863b725fb8394f5baa6562ba51c42e7d725d2abf18ad14f6cca3767
+EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
+MISC ChangeLog 10058 RMD160 44eff38f0082b87e3ae19e6741988b50e0380c32 SHA1 c5e4bbc37dc0588ac4b2c2a33e105b7726fcc106 SHA256 32d1e7b9bbcaf9b8495651d7ec1c8a244cf95f91c0d43d2c4f3e3389fd23e67b
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsO8lAAoJEEdUh39IaPFNQ2sH/iMUetD00Cfz9AGNl4xxIq3O
-6+4fjP2YKImO9fC9gGt+M/mg54TWLTlYOfeDE0J28QdRTlPnBt9p8TADIDCq8bjY
-lBGWKMimvqLUUrttdfPQTxfz3wyL4fpLnBwaYq94cwJ0zqw0ACVuYsdef8WIEyW+
-/HuqGDRiG8Up4vK+GFEvxNSwhCahfPYQcBlUDWPwPBYSlB4nQIbcdpDDsd4nQqJe
-KTL/RsVTfirkMFNAQnGKr35MyTsculKB6i/Krf4jbPLqyH+/IbaFqHX2jKWmw662
-ypKbzZGWko+x2TrYVYLY0TyRxHCvcaohjTeAmGeMsIH+seb5BPHLtiJf37JK2Zc=
-=zSdM
+iQEcBAEBAgAGBQJPuO3QAAoJEEdUh39IaPFNZVAH/1LgvN77lirpoNf3YvEjrVtR
+xUjPmaAYLsQfcnq4h5r0AfwPe1EZ18s4c4NI8hDQ+lgC6s3vVPOWos9ZwwjL2v8l
+WITrTww60ZmOaUnLOlqTcmQR+N5At7xBLi3l2IA58sg7NKgCkg5tnBNcAQk3YYPO
+KhBx3nsTmbLAV2TgOKPK6GmGhGo9MmWNzTXJ75DN5k+Juwd/rsvZTJmnv7/wjDMj
+vzaWEodVu1cixwHD6EpisWybTZQp3tvS1X8BR2vUj08UqBPejvHQww87VsjAtsvV
+PafmAJZj7PJMgISoaTeh8XPetmEaY2qb8ZG60b0SjWhDQw+BH/CG3XCSH5x9LUs=
+=fxDl
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.105.ebuild b/sys-auth/polkit/polkit-0.105.ebuild
index ea8ad805510b..63b45320ac16 100644
--- a/sys-auth/polkit/polkit-0.105.ebuild
+++ b/sys-auth/polkit/polkit-0.105.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.105.ebuild,v 1.1 2012/05/14 11:43:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.105.ebuild,v 1.2 2012/05/20 13:15:43 ssuominen Exp $
 
 EAPI=4
 inherit pam
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE="debug doc examples gtk +introspection kde nls pam systemd"
 
 RDEPEND=">=dev-libs/glib-2.30
-	dev-libs/expat
+	>=dev-libs/expat-2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	pam? ( virtual/pam )
 	systemd? ( sys-apps/systemd )"
@@ -23,13 +23,15 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	dev-util/intltool
+	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.13 )"
-PDEPEND="!systemd? ( >=sys-auth/consolekit-0.4.5[policykit] )
-	pam? ( sys-auth/pambase[consolekit] )
-	gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
-	kde? ( sys-auth/polkit-kde-agent )"
+PDEPEND="gtk? ( || ( >=gnome-extra/polkit-gnome-${PV} lxde-base/lxpolkit ) )
+	kde? ( sys-auth/polkit-kde-agent )
+	!systemd? (
+		>=sys-auth/consolekit-0.4.5_p20120320[policykit]
+		pam? ( >=sys-auth/pambase-20101024-r2[consolekit] )
+		)"
 
 DOCS=( docs/TODO HACKING NEWS README )
 
@@ -68,42 +70,11 @@ src_install() {
 
 	find "${ED}" -name '*.la' -exec rm -f {} +
 
-	# We disable example compilation above, and handle it here
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins src/examples/{*.c,*.policy*}
 	fi
 
-	# Need to keep a few directories around...
 	diropts -m0700 -o root -g root
 	keepdir /var/lib/polkit-1
-	#keepdir /var/run/polkit-1 #387903
-}
-
-pkg_postinst() {
-	# Make sure that the user has consolekit sessions working so that the
-	# 'allow_active' directive in polkit action policies works
-	if has_version 'gnome-base/gdm' && ! has_version 'gnome-base/gdm[consolekit]'; then
-		# If user has GDM installed, but USE=-consolekit, warn them
-		ewarn "You have GDM installed, but it does not have USE=consolekit"
-		ewarn "If you login using GDM, polkit authorizations will not work"
-		ewarn "unless you enable USE=consolekit"
-		einfo
-	fi
-	if has_version 'kde-base/kdm' && ! has_version 'kde-base/kdm[consolekit]'; then
-		# If user has KDM installed, but USE=-consolekit, warn them
-		ewarn "You have KDM installed, but it does not have USE=consolekit"
-		ewarn "If you login using KDM, polkit authorizations will not work"
-		ewarn "unless you enable USE=consolekit"
-		einfo
-	fi
-	if ! has_version 'gnome-base/gdm[consolekit]' && \
-		! has_version 'kde-base/kdm[consolekit]'; then
-		# Inform user about the alternative method
-		ewarn "If you don't use GDM or KDM for logging in,"
-		ewarn "you must start your desktop environment (DE) as follows:"
-		ewarn "	ck-launch-session \$STARTGUI"
-		ewarn "Where \$STARTGUI is a DE-starting command such as 'gnome-session'."
-		ewarn "You should add this to your ~/.xinitrc if you use startx."
-	fi
 }