fix path issue introduced by multilib patch. document SSD_NICELEVEL

(Portage version: 2.1.4.4)

4 files changed, 56 insertions, 2 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index e08a93e43b4a..6530eb6263a1 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.18 2008/03/31 16:09:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.19 2008/03/31 16:17:18 cardoe Exp $
+
+*openrc-0.2-r3 (31 Mar 2008)
+
+  31 Mar 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/openrc-0.2-nicelevel-doc.patch,
+  +files/openrc-0.2-path-fix-for-multilib-fix.patch, -openrc-0.2-r2.ebuild,
+  +openrc-0.2-r3.ebuild:
+  fix path issue introduced by multilib patch. document SSD_NICELEVEL
 
   30 Mar 2008; Mike Frysinger <vapier@gentoo.org>
   +files/9999/0001-msg-style.patch, +files/9999/0003-KV.patch,
diff --git a/sys-apps/openrc/files/openrc-0.2-nicelevel-doc.patch b/sys-apps/openrc/files/openrc-0.2-nicelevel-doc.patch
new file mode 100644
index 000000000000..d867d775221b
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.2-nicelevel-doc.patch
@@ -0,0 +1,23 @@
+From: Roy Marples <roy@marples.name>
+Date: Sat, 29 Mar 2008 09:37:59 +0000 (+0000)
+Subject: Document SSD_NICELEVEL.
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=c62bdce9c6f2a4dc89282cb4aa661b20848f5cae
+
+Document SSD_NICELEVEL.
+---
+
+diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
+index 20987cc..00ef29f 100644
+--- a/man/start-stop-daemon.8
++++ b/man/start-stop-daemon.8
+@@ -145,6 +145,10 @@ stopping schedule.
+ If not specified then a default value of SIGTERM/5 is
+ assumed.
+ .El
++.Sh ENVIRONMENT
++.Va SSD_NICELEVEL
++can also set the scheduling priority of the daemon, but the command line
++option takes precedence.
+ .Sh NOTE
+ .Nm
+ uses
diff --git a/sys-apps/openrc/files/openrc-0.2-path-fix-for-multilib-fix.patch b/sys-apps/openrc/files/openrc-0.2-path-fix-for-multilib-fix.patch
new file mode 100644
index 000000000000..32f2bbcab5b9
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.2-path-fix-for-multilib-fix.patch
@@ -0,0 +1,21 @@
+From: Roy Marples <roy@marples.name>
+Date: Thu, 27 Mar 2008 16:59:33 +0000 (+0000)
+Subject: No need for the extra rc.
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=fec78507f46d2dbde6c1bfb2be134b93c2a41c41
+
+No need for the extra rc.
+---
+
+diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
+index f449783..206d6c0 100644
+--- a/sh/rc-functions.sh.in
++++ b/sh/rc-functions.sh.in
+@@ -75,6 +75,6 @@ get_bootparam()
+ 
+ # Add our sbin to $PATH
+ case "${PATH}" in
+-	"${RC_LIBDIR}"/rc/sbin|"${RC_LIBDIR}"/rc/sbin:*);;
+-	*) export PATH="${RC_LIBDIR}/rc/sbin:${PATH}";;
++	"${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);;
++	*) export PATH="${RC_LIBDIR}/sbin:${PATH}";;
+ esac
diff --git a/sys-apps/openrc/openrc-0.2-r2.ebuild b/sys-apps/openrc/openrc-0.2-r3.ebuild
index 1db22de9cd9f..c118e497dc32 100644
--- a/sys-apps/openrc/openrc-0.2-r2.ebuild
+++ b/sys-apps/openrc/openrc-0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.6 2008/03/31 16:09:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r3.ebuild,v 1.1 2008/03/31 16:17:18 cardoe Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -68,7 +68,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch
 	epatch "${FILESDIR}"/${PN}-0.2-multiple-ntp-servers.patch
 	epatch "${FILESDIR}"/${PN}-0.2-multilib-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.2-path-fix-for-multilib-fix.patch
 	epatch "${FILESDIR}"/${PN}-0.2-sysctl-vserver-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.2-nicelevel-doc.patch
 }
 
 src_compile() {