Version bump, all patches merged upstream

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

3 files changed, 14 insertions, 41 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index 14b4f307d668..a755ac598350 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.30 2010/12/19 13:55:13 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.31 2011/01/05 23:12:30 ssuominen Exp $
+
+*xfce4-power-manager-1.0.3 (05 Jan 2011)
+
+  05 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-power-manager-1.0.3.ebuild:
+  Version bump.
 
 *xfce4-power-manager-1.0.2 (19 Dec 2010)
 
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
deleted file mode 100644
index f76f97dbfaa0..000000000000
--- a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-0.9.98-fix_polkit_switch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-1.0.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild
index 62f979ed5e46..9e8c94dbaa9a 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.2.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-1.0.2.ebuild,v 1.1 2010/12/19 13:55:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild,v 1.1 2011/01/05 23:12:30 ssuominen Exp $
 
 EAPI=3
-EAUTORECONF=yes
 inherit xfconf
 
-DESCRIPTION="Power manager for Xfce4"
+DESCRIPTION="Power manager for the Xfce desktop environment"
 HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
 SRC_URI="mirror://xfce/src/apps/${PN}/1.0/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug networkmanager policykit xfce_plugins_brightness"
+IUSE="debug kernel_linux networkmanager policykit +xfce_plugins_brightness"
 
 COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
 	>=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.70
+	>=dev-libs/dbus-glib-0.88
 	>=xfce-base/xfconf-4.6
 	>=xfce-base/libxfce4ui-4.7
 	>=xfce-base/libxfce4util-4.6
@@ -25,8 +24,8 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.18:2
 	>=x11-libs/libXrandr-1.2
 	x11-libs/libX11
 	x11-libs/libXext
-	sys-fs/udisks
 	sys-power/upower
+	kernel_linux? ( sys-fs/udisks )
 	xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.6 )
 	policykit? ( >=sys-auth/polkit-0.91 )"
 RDEPEND="${COMMON_DEPEND}
@@ -38,12 +37,9 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto"
 
 pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${PN}-0.9.98-fix_polkit_switch.patch )
-
 	XFCONF=(
 		--disable-dependency-tracking
 		$(use_enable policykit polkit)
-		--disable-hal
 		--enable-dpms
 		$(use_enable networkmanager network-manager)
 		$(use_enable xfce_plugins_brightness panel-plugins)