Fix --disable-polkit configure switch wrt #329157 by "Livid". Remove postinst message because xfce-base/xfce-utils >= 4.6.2-r1 will start xfce4-session with ck-launch-session.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 43 insertions, 17 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 7a06abe08c27..2dd376542140 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.22 2010/06/30 16:12:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.23 2010/08/06 20:41:57 ssuominen Exp $
+
+  06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-power-manager-0.9.98.ebuild,
+  +files/xfce4-power-manager-0.9.98-fix_polkit_switch.patch:
+  Fix --disable-polkit configure switch wrt #329157 by "Livid". Remove postinst message because
+  xfce-base/xfce-utils >= 4.6.2-r1 will start xfce4-session with ck-launch-session.
 
   30 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   xfce4-power-manager-0.8.5.ebuild:
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-0.9.98-fix_polkit_switch.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-0.9.98-fix_polkit_switch.patch
new file mode 100644
index 000000000000..f76f97dbfaa0
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-0.9.98-fix_polkit_switch.patch
@@ -0,0 +1,29 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6568
+http://bugs.gentoo.org/show_bug.cgi?id=329157
+
+--- configure.ac
++++ configure.ac
+@@ -85,10 +85,10 @@
+ AC_ARG_ENABLE([polkit],
+         [AC_HELP_STRING([--disable-polkit],
+                 [Do not enable PolicyKit support (default=enabled)])],
+-        [],
++        [ac_cv_enable_polkit=$enableval],
+         [ac_cv_enable_polkit=polkit])
+     AC_MSG_CHECKING([whether to build with polkit support])
+-if test "x$ac_cv_enable_polkit" = !"xyes"; then
++if test "x$ac_cv_enable_polkit" = "xno"; then
+     AC_MSG_RESULT([no])
+     polkit="no"
+ else
+--- src/xfpm-polkit.c
++++ src/xfpm-polkit.c
+@@ -560,6 +560,8 @@
+ 
+ gboolean xfpm_polkit_check_auth	(XfpmPolkit *polkit, const gchar *action_id)
+ {
++#ifdef ENABLE_POLKIT
+     xfpm_polkit_init_data (polkit);
++#endif
+     return xfpm_polkit_check_auth_intern (polkit, action_id);
+ }
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild
index 8ee759e48241..153fb78cb7eb 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild,v 1.1 2010/05/22 13:52:36 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-0.9.98.ebuild,v 1.2 2010/08/06 20:41:57 ssuominen Exp $
 
 EAPI=2
+EAUTORECONF=yes
 inherit xfconf
 
 DESCRIPTION="Power manager for Xfce4"
@@ -14,10 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc networkmanager +plugins +policykit"
 
-# Untested. Really test and feel free to fix.
-# || ( sys-fs/udisks sys-apps/devicekit-disks )
-# || ( sys-power/upower sys-apps/devicekit-power )
-
 COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.16:2
 	>=dev-libs/dbus-glib-0.70
@@ -31,7 +28,8 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
 	sys-fs/udisks
 	sys-power/upower
 	plugins? ( >=xfce-base/xfce4-panel-4.6 )
-	policykit? ( >=sys-auth/polkit-0.91 )"
+	policykit? ( >=sys-auth/polkit-0.91 )
+	!<xfce-base/xfce-utils-4.6.2-r1"
 RDEPEND="${COMMON_DEPEND}
 	networkmanager? ( net-misc/networkmanager )"
 DEPEND="${COMMON_DEPEND}
@@ -42,6 +40,8 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-fix_polkit_switch.patch )
+
 	XFCONF="--disable-dependency-tracking
 		$(use_enable policykit polkit)
 		--disable-hal
@@ -49,16 +49,7 @@ pkg_setup() {
 		$(use_enable networkmanager network-manager)
 		$(use_enable plugins panel-plugins)
 		$(use_enable doc xsltproc)
-		$(use_enable debug)"
+		$(xfconf_use_debug)"
 
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
-
-pkg_postinst() {
-	xfconf_pkg_postinst
-	echo
-	echo "Hint:"
-	elog "Try launching with: exec ck-launch-session xfce4-session"
-	elog "from .xinitrc and startx in case of privilege issues."
-	echo
-}