bump to 2.22.1-r1, fix automagic policykit dependency.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 71 insertions, 55 deletions

diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog
index 46d1d39de30d..5d1be612c6c3 100644
--- a/app-admin/gnome-system-tools/ChangeLog
+++ b/app-admin/gnome-system-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.81 2008/09/27 17:12:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.82 2008/10/13 21:26:52 eva Exp $
+
+*gnome-system-tools-2.22.1-r1 (13 Oct 2008)
+
+  13 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-system-tools-2.22.1-automagic-polkit.patch,
+  -gnome-system-tools-2.22.0.ebuild, -gnome-system-tools-2.22.1.ebuild,
+  +gnome-system-tools-2.22.1-r1.ebuild, metadata.xml:
+  bump to 2.22.1-r1, fix automagic policykit dependency.
 
 *gnome-system-tools-2.22.1 (27 Sep 2008)
 
diff --git a/app-admin/gnome-system-tools/Manifest b/app-admin/gnome-system-tools/Manifest
index 9db3041b0870..c33b0d787778 100644
--- a/app-admin/gnome-system-tools/Manifest
+++ b/app-admin/gnome-system-tools/Manifest
@@ -4,20 +4,19 @@ Hash: SHA1
 AUX gnome-system-tools-2.14.0-ALL_LINGUAS.patch 879 RMD160 ddf92cd90f134cf04c4566af4854f089141c7a1f SHA1 30ed7945344ea778173054919f4326dbc7fbf0d4 SHA256 a08f85690387aba07c29c98e9d6fd12d05e5532ad08854e9a3ffcfaa0fd1d360
 AUX gnome-system-tools-2.14.0-as-needed.patch 651 RMD160 2034a8d2e1032433d46102ac276323d8146b201f SHA1 43a16f5efd5c96d942b95b0a3c96ce3a7672f614 SHA256 6d51c42496d1655af47ee59aca8f99eeed1f9bbfa68fe302746a269540e09368
 AUX gnome-system-tools-2.14.0-doc.patch 1485 RMD160 0ea5ee70c11b5431c783e7636920b026f180a658 SHA1 1f7a52a57ec0ce5e421986335df9814ea8912236 SHA256 0db52371155882a52647db9ba35775a4db09b99414aae3bb1d7f5c5acf2276d1
+AUX gnome-system-tools-2.22.1-automagic-polkit.patch 1048 RMD160 3f6c3cfc8d1e06ae82c469c61b8c1608f8c11474 SHA1 2288b5d58d516428ac9cd480a85f905fbd6f7009 SHA256 36e147b3179d606b5bc431f1ff9fa159ab48e98536c65e91d1e4730b9459718f
 DIST gnome-system-tools-2.14.0.tar.bz2 2120911 RMD160 f45ef3ed63622de4fa9f4a7f973abc2228b7ed4d SHA1 dd9eedc0884b0250335e26b656f15d5d49a2ecb1 SHA256 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
 DIST gnome-system-tools-2.20.0.tar.bz2 3226583 RMD160 25280c4195ebcb39ebcb5558be9211718db1732c SHA1 757d37239cdb62ce9a389bb672bc3cdde5b657ee SHA256 5635b305322ee4d1e2dddd3a9b9f4b29f195663f4c51e77428f81f6bbd325581
-DIST gnome-system-tools-2.22.0.tar.bz2 3441541 RMD160 aaa3c07cec13734d7c7a96facf234c0a48938581 SHA1 780a7e03d4245bba1c102c59e84b4d23d7022f8d SHA256 57c348458efdf34118bc46102e2389cf32172f22e3429bb959a81a773ade56b9
 DIST gnome-system-tools-2.22.1.tar.bz2 3963700 RMD160 55d6f4cc2053d676e554c7502b3d89ae362d907d SHA1 11dd2ed621deecd7a381e41c95064ca5b3201832 SHA256 c3d02612457318b7d879d634219a5126dd37861089650554ad49736a9f5ecf57
 EBUILD gnome-system-tools-2.14.0.ebuild 1490 RMD160 e77bbef37824d80d32bf1b57ca38509b9ee64706 SHA1 7fb82dab18bd4e17be3f3fd630cef997a64d8d85 SHA256 5ee8f21eb51c19b7d74c01a04a12b98f7433801e0f072a4d7019e6364bb3c4a1
 EBUILD gnome-system-tools-2.20.0.ebuild 942 RMD160 f419a45e4076502efc69f369adfaae6f330724ab SHA1 0ab547b9cad3b61a024b0ecb4c3efc59c299a227 SHA256 af28176cb2af5e156709459a29b13bbc77c3976de64440017d1620c04fa00889
-EBUILD gnome-system-tools-2.22.0.ebuild 1024 RMD160 91a6581a1caff83d3199f9c9113619129d5c8bd2 SHA1 7e7378469bea4b49eed79f8fefc1b45112868524 SHA256 8950fa89094f20534831a2e115a35d37062dac2b4f291efdf002c13a36d5f4e3
-EBUILD gnome-system-tools-2.22.1.ebuild 1024 RMD160 678697bba92ec121bc970dba65161e707c7dc61c SHA1 6d9c0cdaa10d0f712f0f2b43d48dc197deeda97d SHA256 0c395a325f929a10ffd06ce5766af8055843eb2efd5647e1d1d242097fe12450
-MISC ChangeLog 11063 RMD160 1145708bf75e6a34626628837cffbd8a568cd36a SHA1 e48855aaa80178b3cb9009732a83368214be5965 SHA256 bb2227aa7e05f987216f4ea95d44f07f6b3d8fb864254be07b22a75625a2405d
-MISC metadata.xml 559 RMD160 09d36cd55cb4bb7f1711a22f82103fb0c27f2276 SHA1 bfeb976aa50497b3cf362c128a34ea29ffff3598 SHA256 98e5777fa16d14176861c310f5024918c3ea55365bc05865537a02f370277b17
+EBUILD gnome-system-tools-2.22.1-r1.ebuild 1464 RMD160 8611f0d3adfa09f88db42060c0d6eaddd280e469 SHA1 76980c0567f131bb3b3ce248ca101b6bf39eadc5 SHA256 a571ca5682a99cf3f975b9b313315f92c79c8d7e3d261419df7b5a3d93a2a262
+MISC ChangeLog 11405 RMD160 6ce6e7073d4e553fd2c2f7bcfc364caa3e0a0dbd SHA1 b092e2d0bf71dc6d8d90a1a2f893bb9f5b346864 SHA256 9da2f708452bf134de8896b2aa6bfdbe81d1a30a30fd45406d79751674acc86e
+MISC metadata.xml 678 RMD160 046ed82cccaa6010911613df2f79c17d792e79d6 SHA1 1a0494f4b1cf31432dde8d5d855d2ed1874a6783 SHA256 0294a0b40903af230a3eb79115d33770f55adf0c599a9f375a6d394a12866455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjeaYgACgkQ1fmVwcYIWAY64ACgmNIRCjiIx0FHmi3+qrJVlo/l
-Xa0AnAgO4p7CP3qc/cxoWTmpW+IWLfu7
-=j77r
+iEYEARECAAYFAkjzvV0ACgkQ1fmVwcYIWAZ5SgCgwXLD0PuSJoseRBdd65DAZ7Bg
+VOUAoJOm7uh9o8w3YKz4O4gFFTm+8PKo
+=zGju
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.1-automagic-polkit.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.1-automagic-polkit.patch
new file mode 100644
index 000000000000..9c96c1c075bc
--- /dev/null
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.22.1-automagic-polkit.patch
@@ -0,0 +1,32 @@
+--- configure.in.old	2008-10-13 23:08:18.000000000 +0200
++++ 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.1, 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/gnome-system-tools-2.22.0.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.22.1-r1.ebuild
index 85aa3e83f31f..43e16643fc24 100644
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.22.0.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-2.22.1-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/gnome-system-tools/gnome-system-tools-2.22.0.ebuild,v 1.1 2008/03/26 00:14:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.22.1-r1.ebuild,v 1.1 2008/10/13 21:26:52 eva Exp $
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
@@ -10,9 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/gst/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nfs samba"
-
-# TODO: policykit seems to be an option but has no configure switch
+IUSE="nfs policykit samba"
 
 RDEPEND="
 	>=dev-libs/liboobs-2.21.3
@@ -23,7 +21,8 @@ RDEPEND="
 	>=gnome-base/nautilus-2.9.90
 	sys-libs/cracklib
 	nfs? ( net-fs/nfs-utils )
-	samba? ( >=net-fs/samba-3 )"
+	samba? ( >=net-fs/samba-3 )
+	policykit? ( >=sys-auth/policykit-0.5 )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -34,7 +33,23 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
+	G2CONF="${G2CONF} $(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"
+
+	eautoreconf
 }
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-2.22.1.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-2.22.1.ebuild
deleted file mode 100644
index 8dcbcad027fe..000000000000
--- a/app-admin/gnome-system-tools/gnome-system-tools-2.22.1.ebuild
+++ /dev/null
@@ -1,40 +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/gnome-system-tools/gnome-system-tools-2.22.1.ebuild,v 1.1 2008/09/27 17:12:33 eva Exp $
-
-inherit 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 samba"
-
-# TODO: policykit seems to be an option but has no configure switch
-
-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 )"
-
-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() {
-	if ! use nfs && ! use samba; then
-		G2CONF="${G2CONF} --disable-shares"
-	fi
-}
diff --git a/app-admin/gnome-system-tools/metadata.xml b/app-admin/gnome-system-tools/metadata.xml
index 7e9348f30546..100755dc9012 100644
--- a/app-admin/gnome-system-tools/metadata.xml
+++ b/app-admin/gnome-system-tools/metadata.xml
@@ -11,5 +11,7 @@
   </longdescription>
   <use>
 	  <flag name='nfs'>Adds support for NFS shares</flag>
+	  <flag name='policykit'>Use <pkg>sys-auth/policykit</pkg> to gain
+	  privileges to change configuration files</flag>
   </use>
 </pkgmetadata>