Bump to 2.22.2.

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

4 files changed, 128 insertions, 2 deletions

diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog
index 5d1be612c6c3..ce368711ec16 100644
--- a/app-admin/gnome-system-tools/ChangeLog
+++ b/app-admin/gnome-system-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/gnome-system-tools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.82 2008/10/13 21:26:52 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.83 2009/04/09 22:16:26 eva Exp $
+
+*gnome-system-tools-2.22.2 (09 Apr 2009)
+
+  09 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-system-tools-2.22.2-automagic-polkit.patch,
+  +gnome-system-tools-2.22.2.ebuild:
+  Bump to 2.22.2.
 
 *gnome-system-tools-2.22.1-r1 (13 Oct 2008)
 
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-automagic-polkit.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-automagic-polkit.patch
new file mode 100644
index 000000000000..06da4daf1f16
--- /dev/null
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-automagic-polkit.patch
@@ -0,0 +1,40 @@
+---
+ Allow to configure policykit support
+
+ Upstream: https://bugzilla.gnome.org/578550
+
+ configure.in |   18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+--- a/configure.in	2008-10-13 23:08:18.000000000 +0200
++++ b/configure.in	2008-10-13 23:10:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.52)
++AC_PREREQ(2.60)
+ AC_INIT(gnome-system-tools, 2.22.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-system-tools)
+ AC_CONFIG_SRCDIR(src/common/gst-tool.c)
+ AC_CONFIG_MACRO_DIR([m4])
+@@ -88,10 +88,20 @@
+ AC_SUBST(DBUS_LIBS)
+ AC_SUBST(DBUS_CFLAGS)
+ 
+-PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes, have_polkit=no)
++dnl Policykit support
+ 
+-if test "$have_polkit" = "yes"; then
+-  AC_DEFINE(HAVE_POLKIT, [1], [whether PolKit 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 PolKit was found])
++	else
++		AC_MSG_ERROR([Policykit support requested but not found])
++	fi
+ fi
+ 
+ AC_SUBST(POLKIT_LIBS)
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-more-services.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-more-services.patch
new file mode 100644
index 000000000000..a341bb5196e3
--- /dev/null
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.2-more-services.patch
@@ -0,0 +1,18 @@
+---
+ Add more service.
+
+ Gentoo: https://bugs.gentoo.org/214265
+
+--- a/src/common/gst-service-role.c	(revision 4287)
++++ b/src/common/gst-service-role.c	(working copy)
+@@ -174,8 +174,10 @@
+ 	{ "sshd",                   GST_ROLE_SECURE_SHELL_SERVER },
+ 	{ "sysklogd",               GST_ROLE_SYSTEM_LOGGER },
+ 	{ "syslog",                 GST_ROLE_SYSTEM_LOGGER },
++	{ "syslog-ng",              GST_ROLE_SYSTEM_LOGGER },
+ 	{ "tftpd-hpa",              GST_ROLE_FILE_SERVER_TFTP },
+ 	{ "vcron",                  GST_ROLE_COMMAND_SCHEDULER },
++	{ "vixie-cron",             GST_ROLE_COMMAND_SCHEDULER },
+ 	{ "vsftpd",                 GST_ROLE_FILE_SERVER_FTP },
+ 	{ "wacom-tools",            GST_ROLE_GRAPHIC_TABLETS_MANAGEMENT },
+ 	{ "wdm",                    GST_ROLE_DISPLAY_MANAGER },
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.22.2.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.22.2.ebuild
new file mode 100644
index 000000000000..8860fcd96f63
--- /dev/null
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.22.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.22.2.ebuild,v 1.1 2009/04/09 22:16:26 eva Exp $
+
+inherit autotools eutils gnome2
+
+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="nfs policykit samba"
+
+RDEPEND="
+	>=dev-libs/liboobs-2.21.3
+	>=x11-libs/gtk+-2.11.3
+	>=dev-libs/glib-2.15.2
+	>=gnome-base/gconf-2.2
+	dev-libs/dbus-glib
+	>=gnome-base/nautilus-2.9.90
+	sys-libs/cracklib
+	nfs? ( net-fs/nfs-utils )
+	samba? ( >=net-fs/samba-3 )
+	policykit? ( >=sys-auth/policykit-0.5 )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35.0"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable policykit polkit)"
+
+	if ! use nfs && ! use samba; then
+		G2CONF="${G2CONF} --disable-shares"
+	fi
+
+	if use policykit && ! built_with_use app-admin/system-tools-backends policykit; then
+		eerror "app-admin/system-tools-backends was not built with USE='policykit'"
+		die "Please rebuild app-admin/system-tools-backends with policykit support"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix automagic policykit detection
+	epatch "${FILESDIR}/${P}-automagic-polkit.patch"
+
+	# Add more services to the list
+	epatch "${FILESDIR}/${P}-more-services.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}