bump to 2.6.0-r1. Integrate patch from bug #214265, thanks to Jeremy Guitton and fix policykit automagic dependency.

(Portage version: 2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

7 files changed, 97 insertions, 59 deletions

diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog
index d399d3651480..ca8177113f31 100644
--- a/app-admin/system-tools-backends/ChangeLog
+++ b/app-admin/system-tools-backends/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/system-tools-backends
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.47 2008/03/23 13:03:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.48 2008/10/13 21:27:11 eva Exp $
+
+*system-tools-backends-2.6.0-r1 (13 Oct 2008)
+
+  13 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/system-tools-backends-2.6.0-automagic-polkit.patch,
+  +files/system-tools-backends-2.6.0-services.patch,
+  +files/system-tools-backends-2.6.0-users.patch,
+  -system-tools-backends-2.4.1-r1.ebuild,
+  -system-tools-backends-2.6.0.ebuild,
+  +system-tools-backends-2.6.0-r1.ebuild, metadata.xml:
+  bump to 2.6.0-r1. Integrate patch from bug #214265, thanks to Jeremy
+  Guitton and fix policykit automagic dependency.
 
 *system-tools-backends-2.6.0 (23 Mar 2008)
 
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch
new file mode 100644
index 000000000000..92a54f71a826
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch
@@ -0,0 +1,31 @@
+--- configure.in.old	2008-10-13 22:48:51.000000000 +0200
++++ configure.in	2008-10-13 22:53:59.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.52)
++AC_PREREQ(2.60)
+ dnl ==============================================================
+ dnl Process this file with autoconf to produce a configure script.
+ dnl ==============================================================
+@@ -122,10 +122,19 @@
+ AC_SUBST(DISPATCHER_CFLAGS)
+ 
+ dnl check for PolicyKit
+-PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes, have_polkit=no)
+ 
+-if test "$have_polkit" = "yes"; then
+-  AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
++have_polkit=no
++AC_ARG_ENABLE(polkit,
++	AS_HELP_STRING([--enable-polkit],[Enable policykit support]))
++
++if test "x$enable_polkit" = "xyes"; then
++	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes)
++
++	if test "$have_polkit" = "yes"; then
++		AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
++	else
++		AC_MSG_ERROR([policykit support requested but not found])
++	fi
+ fi
+ 
+ AC_SUBST(POLKIT_LIBS)
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch
new file mode 100644
index 000000000000..c1653f342dd1
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch
@@ -0,0 +1,13 @@
+diff --git Init/Services.pm Init/Services.pm
+index c1d2620..a76f5dc 100644
+--- Init/Services.pm
++++ Init/Services.pm
+@@ -659,7 +659,7 @@ sub get_gentoo_runlevels
+ sub get_gentoo_services_for_runlevel
+ {
+   my($runlevel) = @_;
+-  my($raw_output) = Utils::File::run_backtick("rc-status -nocolor $runlevel");
++  my($raw_output) = Utils::File::run_backtick("rc-status --nocolor $runlevel");
+   my(@raw_lines) = split(/\n/,$raw_output);
+   my($line, $service);
+   my(%services);
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch
new file mode 100644
index 000000000000..5d9bf83c4f55
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch
@@ -0,0 +1,14 @@
+diff --git Users/Users.pm Users/Users.pm
+index 6703d0f..bd0603a 100644
+--- Users/Users.pm
++++ Users/Users.pm
+@@ -591,7 +591,8 @@ sub add_user
+     if ($cmd_adduser &&
+         $Utils::Backend::tool{"platform"} !~ /^slackware/ &&
+         $Utils::Backend::tool{"platform"} !~ /^archlinux/ &&
+-        $Utils::Backend::tool{"platform"} !~ /^redhat/)
++        $Utils::Backend::tool{"platform"} !~ /^redhat/ &&
++        $Utils::Backend::tool{"platform"} !~ /^gentoo/)
+     {
+       # use adduser if available and valid (slackware one is b0rk)
+       # set empty gecos fields and password, they will be filled out later
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
index 013e6579a275..70398bc93cc3 100644
--- a/app-admin/system-tools-backends/metadata.xml
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name='policykit'>Use <pkg>sys-auth/policykit</pkg> to gain privileges to change
+	configuration files</flag>
+</use>
 <longdescription lang="en">
 The System Tools Backends are a set of cross-platform modules for Linux,
 FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.4.1-r1.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.4.1-r1.ebuild
deleted file mode 100644
index e56bad7abf4f..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.4.1-r1.ebuild,v 1.1 2008/01/24 22:41:26 eva Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
-HOMEPAGE="http://www.gnome.org/projects/gst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!<app-admin/gnome-system-tools-1.1.91
-		>=dev-libs/glib-2.4
-		>=dev-libs/dbus-glib-0.71
-		>=dev-perl/Net-DBus-0.33.4
-		dev-lang/perl
-		userland_GNU? ( sys-apps/shadow )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	enewgroup stb-admin || die "Failed to create stb-admin group"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix baselayout-2 problems with services-admin
-	epatch "${FILESDIR}"/${P}-baselayout2.patch
-}
-
-src_compile() {
-	# Autotools insanity, localstatedir gets set to /usr/local/var by default
-	gnome2_src_compile --localstatedir="${ROOT}"/var
-}
-
-src_install() {
-	gnome2_src_install
-	newinitd "${FILESDIR}"/stb.rc system-tools-backends
-}
-
-pkg_postinst() {
-	echo
-	elog "You need to add yourself to the group stb-admin and"
-	elog "add system-tools-backends to the default runlevel."
-	elog "You can do this as root like so:"
-	elog "  # rc-update add system-tools-backends default"
-	echo
-}
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.6.0.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild
index c931b7ed13d5..7b68d46a183d 100644
--- a/app-admin/system-tools-backends/system-tools-backends-2.6.0.ebuild
+++ b/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.6.0.ebuild,v 1.1 2008/03/23 13:03:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild,v 1.1 2008/10/13 21:27:11 eva Exp $
 
-inherit gnome2 eutils
+inherit autotools eutils gnome2
 
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/gst/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="policykit"
 
 # FIXME: policykit is optional but doesn't have a configure switch ?
 #
@@ -24,6 +24,7 @@ RDEPEND="!<app-admin/gnome-system-tools-1.1.91
 		>=dev-libs/glib-2.15.2
 		>=dev-perl/Net-DBus-0.33.4
 		dev-lang/perl
+		policykit? ( >=sys-auth/policykit-0.5 )
 		userland_GNU? ( sys-apps/shadow )"
 
 DEPEND="${RDEPEND}
@@ -33,9 +34,27 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable policykit polkit)"
+
 	enewgroup stb-admin || die "Failed to create stb-admin group"
 }
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix a typo in services
+	epatch "${FILESDIR}/${P}-services.patch"
+
+	# Fix a distro detection in users to use proper variant
+	# of useradd
+	epatch "${FILESDIR}/${P}-users.patch"
+
+	# Fix automagic policykit dependency
+	epatch "${FILESDIR}/${P}-automagic-polkit.patch"
+
+	eautoreconf
+}
+
 src_compile() {
 	# Autotools insanity, localstatedir gets set to /usr/local/var by default
 	gnome2_src_compile --localstatedir="${ROOT}"/var