diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-01-20 22:30:15 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-01-20 22:30:15 +0000 |
| commit | 34c75b7f9074a9de3229648e92feb9ab44dfef05 (patch) | |
| tree | 351e102b009b4e523cc461f07da7c04c78f3b685 /app-admin | |
| parent | Marking kopete-facebook-0.1.4 ~ppc64 for bug 292413 (diff) | |
| download | gentoo-2-34c75b7f9074a9de3229648e92feb9ab44dfef05.tar.gz gentoo-2-34c75b7f9074a9de3229648e92feb9ab44dfef05.tar.bz2 gentoo-2-34c75b7f9074a9de3229648e92feb9ab44dfef05.zip | |
Fix configure loop, bug #297482. Fix localstatedir for init script.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
4 files changed, 19 insertions, 17 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/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 |