Untitled

Index: app-admin/system-tools-backends/files/stb.rc
===================================================================
--- app-admin/system-tools-backends/files/stb.rc	(revision 1820)
+++ app-admin/system-tools-backends/files/stb.rc	(working copy)
@@ -3,16 +3,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+depend() {
+	need dbus
+}
+
 start() {
 	ebegin "Starting system-tools-backend"
-	/usr/bin/system-tools-backends
+	start-stop-daemon --start --exec /usr/bin/system-tools-backends --
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping system-tools-backend"
-	# FIXME ugly
-	/bin/killall /usr/bin/system-tools-backends
+	start-stop-daemon --stop --pidfile /var/run/system-tools-backends.pid
 	eend $?
 }
 
Index: app-admin/system-tools-backends/files/fix-baselayout-2-rc-status.patch
===================================================================
--- app-admin/system-tools-backends/files/fix-baselayout-2-rc-status.patch	(revision 0)
+++ app-admin/system-tools-backends/files/fix-baselayout-2-rc-status.patch	(revision 0)
@@ -0,0 +1,21 @@
+diff -Naur system-tools-backends-2.4.1/Init/Services.pm system-tools-backends-2.4.1.new/Init/Services.pm
+--- Init/Services.pm	2007-09-26 05:13:27.000000000 +0530
++++ Init/Services.pm	2007-11-06 05:19:51.000000000 +0530
+@@ -647,7 +647,7 @@
+ 
+ sub get_gentoo_runlevels
+ {
+-  my($raw_output) = Utils::File::run_backtick("rc-status -nc -l");
++  my($raw_output) = Utils::File::run_backtick("rc-status --nocolor -l");
+   my(@runlevels);
+ 
+   return undef if (!$raw_output);
+@@ -659,7 +659,7 @@
+ sub get_gentoo_services_for_runlevel
+ {
+   my($runlevel) = @_;
+-  my($raw_output) = Utils::File::run_backtick("rc-status -nc $runlevel");
++  my($raw_output) = Utils::File::run_backtick("rc-status --nocolor $runlevel");
+   my(@raw_lines) = split(/\n/,$raw_output);
+   my($line, $service);
+   my(%services);
Index: app-admin/system-tools-backends/Manifest
===================================================================
--- app-admin/system-tools-backends/Manifest	(revision 1820)
+++ app-admin/system-tools-backends/Manifest	(working copy)
@@ -1,12 +1,16 @@
-AUX stb.rc 353 RMD160 e28d14956f260e285772fab9268675cf8c084b2e SHA1 536a3b2aac51ba0a81454cd58b5082f6e05d9cc5 SHA256 7236dd9ff5eb2acc06d3accd148c211cf2b804195b826a14b64e11f731883ffb
-MD5 1306fcf588a7abc1d2e5f5a86bd7dc58 files/stb.rc 353
-RMD160 e28d14956f260e285772fab9268675cf8c084b2e files/stb.rc 353
-SHA256 7236dd9ff5eb2acc06d3accd148c211cf2b804195b826a14b64e11f731883ffb files/stb.rc 353
+AUX fix-baselayout-2-rc-status.patch 795 RMD160 f26579d9aca0ce005a979b2a11ed438ccaa28035 SHA1 4901b18d4b29a79cbe622a07c3b955d95ff41cdc SHA256 7b08c56248acb22ab9d44d31d2f28aebc0f3c081f0c6bcb0b0c42fcee506a0e3
+MD5 35b3a9abd5c2408dd76aeefbff8cbe57 files/fix-baselayout-2-rc-status.patch 795
+RMD160 f26579d9aca0ce005a979b2a11ed438ccaa28035 files/fix-baselayout-2-rc-status.patch 795
+SHA256 7b08c56248acb22ab9d44d31d2f28aebc0f3c081f0c6bcb0b0c42fcee506a0e3 files/fix-baselayout-2-rc-status.patch 795
+AUX stb.rc 426 RMD160 f28f363a2df36cdbf97fae4ac18699e47337e22f SHA1 af82b1d3a0bcb3628388fbf0eca54bee681fec2d SHA256 565d68f6ecf932d1e3cd6c618e99df310852a9ca249b38338828def2d6779ac9
+MD5 21b74ccf2502750de78f1aff9d2b0a92 files/stb.rc 426
+RMD160 f28f363a2df36cdbf97fae4ac18699e47337e22f files/stb.rc 426
+SHA256 565d68f6ecf932d1e3cd6c618e99df310852a9ca249b38338828def2d6779ac9 files/stb.rc 426
 DIST system-tools-backends-2.4.1.tar.bz2 411012 RMD160 e4ac3486efbb1bc3f991116d360a72f3899f389d SHA1 bdd7a295c4b265173861e88deb7b12104dde76a2 SHA256 c0aea44c58d32870b429337751bf3f41cd471b8c8849a373c46999fd63d583e8
-EBUILD system-tools-backends-2.4.1.ebuild 1212 RMD160 3183b12ee9f2f5b90a4cf98491fa8a8d93888b7e SHA1 0af296f7fe929c23b0c5675fce7e8788d7ce3abe SHA256 95133d53f11fb3fa4e93571944d592263dcbbbcbeb75060b37662a55d810b7d0
-MD5 8711e20dcc2c0a8435ccf949aaa75ba5 system-tools-backends-2.4.1.ebuild 1212
-RMD160 3183b12ee9f2f5b90a4cf98491fa8a8d93888b7e system-tools-backends-2.4.1.ebuild 1212
-SHA256 95133d53f11fb3fa4e93571944d592263dcbbbcbeb75060b37662a55d810b7d0 system-tools-backends-2.4.1.ebuild 1212
+EBUILD system-tools-backends-2.4.1.ebuild 1486 RMD160 0d03167f2fbef6e8eace784f8ae885b7663fe44b SHA1 e733ae32b0013375bba940899ce93178bf22f6eb SHA256 21a74bf95358b10368d844e90f4459ab01034f221857ccb2543524feb3b36e9b
+MD5 f585869c4f781615b89e04c7a19bbee6 system-tools-backends-2.4.1.ebuild 1486
+RMD160 0d03167f2fbef6e8eace784f8ae885b7663fe44b system-tools-backends-2.4.1.ebuild 1486
+SHA256 21a74bf95358b10368d844e90f4459ab01034f221857ccb2543524feb3b36e9b system-tools-backends-2.4.1.ebuild 1486
 MISC ChangeLog 2658 RMD160 9851468db9f51f3e6e78ae4763ec673520ec9045 SHA1 4609f125e968aa94cf73f6fd1f8535b1f502bd77 SHA256 9263ad8871b6a47277206bb80717116ae15106982e1a8d5b97394f5ce606a834
 MD5 6f3f79114a1290b2ccea4c860c4a3657 ChangeLog 2658
 RMD160 9851468db9f51f3e6e78ae4763ec673520ec9045 ChangeLog 2658
Index: app-admin/system-tools-backends/system-tools-backends-2.4.1.ebuild
===================================================================
--- app-admin/system-tools-backends/system-tools-backends-2.4.1.ebuild	(revision 1820)
+++ app-admin/system-tools-backends/system-tools-backends-2.4.1.ebuild	(working copy)
@@ -29,6 +29,17 @@
 	enewgroup stb-admin || die "Failed to create stb-admin group"
 }
 
+src_unpack() {
+	gnome2_src_unpack
+	# Fix baselayout-2 problems with services-admin
+	epatch ${FILESDIR}/fix-baselayout-2-rc-status.patch
+}
+
+src_compile() {
+	# Autotools insanity, localstatedir gets set to /usr/local/var by default
+	gnome2_src_compile --localstatedir=/var
+}
+
 src_install() {
 	gnome2_src_install
 	newinitd "${FILESDIR}"/stb.rc system-tools-backends