Fix configure loop, bug #297482. Fix localstatedir for init script.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 27 insertions, 25 deletions

diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog
index 9fec752d8eab..cb79fd536619 100644
--- a/app-admin/system-tools-backends/ChangeLog
+++ b/app-admin/system-tools-backends/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/system-tools-backends
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.52 2009/12/17 23:17:01 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.53 2010/01/20 22:30:15 eva Exp $
+
+  20 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  files/system-tools-backends-2.8.2-automagic-polkit.patch,
+  system-tools-backends-2.8.3.ebuild, files/stb.rc:
+  Fix configure loop, bug #297482. Fix localstatedir for init script.
 
 *system-tools-backends-2.8.3 (17 Dec 2009)
 
diff --git a/app-admin/system-tools-backends/Manifest b/app-admin/system-tools-backends/Manifest
index 6b03f40fb570..e1b09e662b33 100644
--- a/app-admin/system-tools-backends/Manifest
+++ b/app-admin/system-tools-backends/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX stb.rc 529 RMD160 8378ce813af19a62de5407fa9eb21c149bf5afd5 SHA1 009e778c5ec5d8a7204442e449f22db98f552d4d SHA256 a751a6cfa927f61caf3d647c1cb905fcb52718984e3dd5ecdae484109f7f309d
+AUX stb.rc 533 RMD160 07c9e72ca74cd23662d922c19930010e755a4f53 SHA1 b6c8d98a835441114aa7683f7ff6f2cf6ceed928 SHA256 c143b324a20ff027f57ac91f3c78651ea52db6e07ae79139a2694adcc11ccde4
 AUX system-tools-backends-2.6.0-1ubuntu1.1.patch 532 RMD160 84f38fc3bcf9607a7e9da1cf0be13751298ded58 SHA1 36d7fd35c85a314f9dcb7dd0af66c09af044a28d SHA256 1891979d10de735a83f952c720f5210df92508b065ea3191b648e29200725ae2
 AUX system-tools-backends-2.6.0-automagic-polkit.patch 1073 RMD160 aa1dd5b1a9efed90b97681941b634ee777c8d55d SHA1 20b0cfdfb6c929ec5447e9f0d34ca9cfbb986c6d SHA256 78f425a95c2b7417056d89c45077bdc55e18953745b0e623e1192fbc9ed398cd
 AUX system-tools-backends-2.6.0-cleanup-pid-file.patch 878 RMD160 0d1fd02ae354e2231b9e0e8dd0d6b8da8d5008ee SHA1 752c9dd81c06a702cb44cf6b4c86fa4da6170574 SHA256 2479eba543e04e4ebe947a9ec90a39eeaa6f9ea79b835cfa19cfbeee5f08469a
@@ -12,19 +12,19 @@ AUX system-tools-backends-2.6.0-services.patch 474 RMD160 ebfda51db2af08189f186a
 AUX system-tools-backends-2.6.0-users.patch 615 RMD160 80fa489017b7c13b3e8f45ffc511ebcc826c01b0 SHA1 f522de3ab109e9e04b9ef12a0b15fa0be829e284 SHA256 2442a171debd600c949ed5d95660bf4d3045617e035b857b4c7665f0cd792cca
 AUX system-tools-backends-2.6.1-gettext.patch 816 RMD160 155c62dbb403851870947708fd0d408dac99f04c SHA1 5c993fffb12d5a0ed493f474fce409b3cbd87bd9 SHA256 8a129b76f2e2275c25695b3c38594c970206cef03dd1cb44c947014b194af81d
 AUX system-tools-backends-2.8.2-1ubuntu1.1.patch 945 RMD160 21cee9b97de5ede2b4c6b842ffaef584ca7e1e06 SHA1 971d55c88ce787163e6edf40e08cf54764d79885 SHA256 79a927db65f3e44f733fa920d45b520f3ec4c921d67920e3dddfc1439ca54d4c
-AUX system-tools-backends-2.8.2-automagic-polkit.patch 1472 RMD160 30979976c8a49b86c6ece7c4b550e2cb562e341a SHA1 ec9f0150bf47c143c6d5e957eecbd62eefba008f SHA256 32f95e3c51e192a0f17e617e1589f38e43571d6fa7b58907307395bc70f064e4
+AUX system-tools-backends-2.8.2-automagic-polkit.patch 1480 RMD160 be387df681b1b7b1d9cae5d053539c2110386fc1 SHA1 011334c7751090e0142199c63430d7600a7b9ccd SHA256 0a943f544a783738f82cdbbd230171efa9ce975db3f680f13060245d812a2e8e
 AUX system-tools-backends-2.8.2-cve-2008-4311.patch 1984 RMD160 7dec8a9df599b3e57ec1c57165ce8f54ebc548f0 SHA1 0ab99b264eccc73ae0a95bb05d5e66673c5497e6 SHA256 d7ef2a15e67cd9887ad41b75f5c545f63bf5a7cd8ef8ff1bab623182039dcd4b
 AUX system-tools-backends-2.8.2-default-permissions.patch 945 RMD160 d34076b1a568effefbb29d81c1b2df2a4c303085 SHA1 22102df758ac1cc804fcc209184b0a836f0eb3fd SHA256 f2752d877938d70805d31adf113c05ce45b62255cd195c4c74abe93695ec08c6
 DIST system-tools-backends-2.6.1.tar.bz2 441586 RMD160 7fb3a97ef291f80b330ad5c7146d0cd32a264a74 SHA1 fa49c81963ab8c522dfefb9a8c2ffda61380a01b SHA256 7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
 DIST system-tools-backends-2.8.3.tar.bz2 459208 RMD160 bb4eff2449b19b96e3c7142cf61a6c708a4dab26 SHA1 483d7452df6e7a89b9dff9627fc31fd3ecb8faf4 SHA256 67629bb6502a4c5b8b639867deb40ecabd5676a4655c264c1f0dbeb97de5c98c
 EBUILD system-tools-backends-2.6.1-r1.ebuild 2453 RMD160 1f4ab795b587c9e6d67cbd9c500948366090d602 SHA1 817bc15a6f35fbbe235f07efecca42ebafb147a2 SHA256 f50cbc07c6834bdb641ed0400bce07aa67f259406679c1af63121825a90389c7
-EBUILD system-tools-backends-2.8.3.ebuild 2035 RMD160 c8f9f534a72a907d02e62f9a7f203b7b2a767b70 SHA1 973b91aa5b0e4359230bb4b49b1a883cc3eb72f5 SHA256 043b58eaebe3f04a979c8c69b3b1f240c49771dac201a729c7364c491bb722aa
-MISC ChangeLog 8995 RMD160 dd62e4faba27ca81d3ec8dd183bea5696b2be4cb SHA1 43a3185070d0f9a29eba893ba751261ea3358211 SHA256 f7f3d793e1d33a1ad67aabf58cef2ae43b935eadd46be13defd0404be9d61d62
+EBUILD system-tools-backends-2.8.3.ebuild 1916 RMD160 98b90cb5e96c712e539ca67698414fdbe20b572b SHA1 2de362367782f7d3f40277e5df52bdb676663e57 SHA256 718f9cd7708429b5d8058fd9072a17de8a771e4dd054de402f568e00963a41d2
+MISC ChangeLog 9232 RMD160 916962ba7f89d4399a5a1d19b5d40eaac5a61166 SHA1 ff6bd0df430fea558d64ec2a18734c473faec45b SHA256 fd2cdda0da080f3d19c75320d3c724df95ae033aff4923869fe915504621d509
 MISC metadata.xml 559 RMD160 143a946df38c5d0095722d5cddbcb11f68063c0b SHA1 886deef54679de98d9b5eb47e30b9252c654b6f3 SHA256 470dd48b7988000b39056ccfc6382a25bd18d39d2fcca4acf400631be13be462
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksqu/QACgkQ1fmVwcYIWAYztgCdHQ4Rnzm7/yxTHBs6jKNovJCw
-WHIAoIER5mzweAvL+Y3cq6KtxpMLIm3/
-=XqSP
+iEYEARECAAYFAktXg/wACgkQ1fmVwcYIWAYnxACfQ6uy4ObpN+mxOXZbkt2lf0Dn
+19wAnioXtydPQbf1T7poRev7QmcDW1DK
+=fN7W
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-tools-backends/files/stb.rc b/app-admin/system-tools-backends/files/stb.rc
index 145f03bdd633..0c20373d6c3a 100644
--- a/app-admin/system-tools-backends/files/stb.rc
+++ b/app-admin/system-tools-backends/files/stb.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/files/stb.rc,v 1.1 2008/01/24 22:41:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/files/stb.rc,v 1.2 2010/01/20 22:30:14 eva Exp $
 
 depend() {
 	need dbus
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting system-tools-backend"
-	start-stop-daemon --start --exec /usr/bin/system-tools-backends --
+	start-stop-daemon --start --exec /usr/sbin/system-tools-backends -- -D
 	eend $?
 }
 
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch
index edc8f93ec481..9c45182578e1 100644
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch
@@ -1,4 +1,4 @@
-From 6e46c905acbef72af0083abeff5b4cd5e522824f Mon Sep 17 00:00:00 2001
+From 978778deb06cd2080d2190410842d2b83139f856 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Mon, 14 Dec 2009 20:34:40 +0100
 Subject: [PATCH 1/4] Gentoo: fix automagic policykit dependency
@@ -8,7 +8,7 @@ Subject: [PATCH 1/4] Gentoo: fix automagic policykit dependency
  1 files changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index d196049..aa31a8e 100644
+index 5f9bbaf..98e18a9 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -1,4 +1,4 @@
@@ -30,8 +30,8 @@ index d196049..aa31a8e 100644
 +have_polkit=no
 +AC_ARG_ENABLE(polkit,
 +	AS_HELP_STRING([--enable-polkit],[Enable policykit support]))
-+AS_IF(["$enable_polkit" = "yes"], [
-+	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, [
++AS_IF([test "$enable_polkit" = "yes"], [
++	PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLICYKIT_REQUIRED, [
 +		have_polkit=yes
 +		AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
 +	], [
@@ -42,5 +42,5 @@ index d196049..aa31a8e 100644
  AC_SUBST(POLKIT_CFLAGS)
  AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
 -- 
-1.6.5.4
+1.6.6
 
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild
index afb49746cc8d..a1dc22e1701e 100644
--- a/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild
+++ b/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.8.3.ebuild,v 1.1 2009/12/17 23:17:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild,v 1.2 2010/01/20 22:30:15 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -31,7 +31,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable policykit polkit)"
+	G2CONF="${G2CONF}
+		$(use_enable policykit polkit)
+		--localstatedir=/var"
 
 	enewgroup stb-admin || die "Failed to create stb-admin group"
 }
@@ -56,11 +58,6 @@ src_prepare() {
 	eautoreconf
 }
 
-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