Move patches here so we get them in releases.

Package-Manager: portage-2.2_pre5

7 files changed, 272 insertions, 11 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 234b1b173432..67d54d4c8170 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.17 2008/03/30 17:42:10 vapier Exp $
+
+  30 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/9999/0001-msg-style.patch, +files/9999/0003-KV.patch,
+  +files/9999/0002-useful-functions.patch, openrc-0.2-r2.ebuild,
+  openrc-9999.ebuild:
+  Move patches here so we get them in releases.
 
   30 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r2.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index e15bd4341f7c..6b2041befd40 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 9999/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b
+AUX 9999/0002-useful-functions.patch 1797 RMD160 ac61d166b15c46187e3ed738f52e69441e6cba8b SHA1 f621a75b0965ce2dde74307046df21a050f3ffc6 SHA256 c475e38f5eabe8b1482a2bbc155d944c9ccc8d9bd8f3cdc85068362a898c130a
+AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539
 AUX openrc-0.2-freebsd-install-rc.patch 888 RMD160 5f3c421d389bf1d5ca8113ee7566b2fa9f3dd89d SHA1 e4f0ab407b88f28e3ce696e63ee0450338c3ca1a SHA256 a14eadfc0cb2da40d53783f73b4d8474827baaf7a38f21fd5c1050d295cff14e
 AUX openrc-0.2-multilib-fix.patch 2932 RMD160 13d72da315afdd2e8e26ea89e51f4dd54fe47f7f SHA1 da18061560ebd38b8d712cfc4c2390fd2f88dc45 SHA256 1d7e7cd190240d0359c305f387d06503f54087a6dc30d62c245809f03238320d
 AUX openrc-0.2-multiple-ntp-servers.patch 836 RMD160 166f26228c8f76dab12e7f0f69dd81c31b4dd510 SHA1 00832b699d08b2548078f03d2aeafeabe9dee636 SHA256 b758817e770321b201a75e0005839a2221c5c20c15df66b76c7e2a06eb532b74
 AUX openrc-0.2-sysctl-vserver-fix.patch 600 RMD160 bf7cf450d96247eba9e4deb2e8dca14b761cdb56 SHA1 8f413560cdcac5e300a958a805cf4aff58bdaae1 SHA256 7db22dcb9a1e3aca9b08d743df40939e46c456a5c249aa1bacbb6924e216fce6
 DIST openrc-0.2.tar.bz2 141615 RMD160 282122e6b152e3b86483eb2b3e90565adb11f08f SHA1 b41a9981b6d0e3963e278c37b292d3f4877bb8fc SHA256 5f8f718ef0c1e3188b7b19fc868fdf5719fc5a1a65d4376f2becd3b78ccc2ef1
-EBUILD openrc-0.2-r2.ebuild 8226 RMD160 86b635ee032298991ded9d18a7b2970a68c26f1e SHA1 d33a751a491ab382dc09d25280fe91067593e4d1 SHA256 1c5b7f93adcffd3a79d2a095395d7b74e04a3efe82841222b4a90e8443b38165
-EBUILD openrc-9999.ebuild 7945 RMD160 5968d72df9489d98ff878c23f581ca4945c43741 SHA1 0bae3295c71e9e67a6135894559ab46c4bb052a1 SHA256 231cadb601280394b73e4e9805b799e0fac47fe2c90a9725e619895ed7451954
-MISC ChangeLog 2608 RMD160 7301f8ec163f5d8c5c35288648c4168fb56f7540 SHA1 c7b39230e6ea39c6cb0dc740a9dcea39db56007a SHA256 28d79824f17595af118c3878144b0eb449e7748ffb1185760908333ae7cb6ed8
+EBUILD openrc-0.2-r2.ebuild 8261 RMD160 1b692a277193648aeb36f85cf3272b48411665bf SHA1 b751b65904ed0f1465ee9e73bcf40c1affb41bc7 SHA256 597039be03a34e0e97aeb00f2b40ca9b00131575684b64a170b4edc921851bf8
+EBUILD openrc-9999.ebuild 7980 RMD160 48491ff3c79d78e400234b452016d366c0d7006e SHA1 0bf52fb9fd7d6a291a4c83e59dff88372706fb98 SHA256 60e3aad83352505b57e25eb93ba6b211f0713f8ea3e7ed56ec8083591bad0160
+MISC ChangeLog 2857 RMD160 fc6b42588d899897daeb6573ac3b3372cefbf745 SHA1 848aee7934da896453d38635ab898c5716ccb4ac SHA256 b4a06bd7f959ed6af5f3046654900691ddbbffcaaa0add4856da8972606704ce
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH77txj9hvisErhMIRAkNtAJ9rM7+miaQ0ecTs34U0PYi6DJwkFACgwp0H
-YAsQ25vdudJH7m4P4EPrPXg=
-=IrQl
+iD8DBQFH79HPj9hvisErhMIRAtBpAKDjUigN+3QQVomPDMB7+IKAL/hqygCgmigi
+uq4IRWfWPlDRIrPcMK1Jy8Q=
+=kuWN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/files/9999/0001-msg-style.patch b/sys-apps/openrc/files/9999/0001-msg-style.patch
new file mode 100644
index 000000000000..ab3559e71a70
--- /dev/null
+++ b/sys-apps/openrc/files/9999/0001-msg-style.patch
@@ -0,0 +1,46 @@
+From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 24 Mar 2008 01:48:19 -0400
+Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
+
+---
+ src/libeinfo/libeinfo.c |    9 +++------
+ 1 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
+index f8ddcb5..c46cacb 100644
+--- a/src/libeinfo/libeinfo.c
++++ b/src/libeinfo/libeinfo.c
+@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
+ 	if (! msg)
+ 		return;
+ 
+-	cols = get_term_columns(fp) - (strlen(msg) + 3);
++	cols = get_term_columns(fp) - (strlen(msg) + 5);
+ 
+ 	/* cons25 is special - we need to remove one char, otherwise things
+ 	 * do not align properly at all. */
+@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
+ 	if (term_is_cons25)
+ 		cols--;
+ 
+-	/* If extra spacing is required around msg, then please change
+-	 * via a runtime knob and leave this default as is as it saves 2 
+-	 * valuable columns when running on 80 column screens. */
+ 	if (cols > 0 && colour_terminal(fp)) {
+-		fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
++		fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
+ 			ecolor(ECOLOR_BRACKET), ecolor(color), msg,
+ 			ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
+ 	} else {
+ 		if (col > 0)
+ 			for (i = 0; i < cols - col; i++)
+ 				fprintf(fp, " ");
+-		fprintf(fp, " [%s]\n", msg);
++		fprintf(fp, " [ %s ]\n", msg);
+ 	}
+ }
+ 
+-- 
+1.5.4.4
+
diff --git a/sys-apps/openrc/files/9999/0002-useful-functions.patch b/sys-apps/openrc/files/9999/0002-useful-functions.patch
new file mode 100644
index 000000000000..345dbaad2852
--- /dev/null
+++ b/sys-apps/openrc/files/9999/0002-useful-functions.patch
@@ -0,0 +1,84 @@
+From c5552432d21e964ea1dbda7415040259b87ea77e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 24 Mar 2008 02:03:39 -0400
+Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api
+
+---
+ sh/functions.sh.in    |   27 +++++++++++++++++++++++++++
+ sh/rc-functions.sh.in |   22 ----------------------
+ 2 files changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/sh/functions.sh.in b/sh/functions.sh.in
+index 1a1fbba..140f6dc 100644
+--- a/sh/functions.sh.in
++++ b/sh/functions.sh.in
+@@ -38,6 +38,33 @@ yesno()
+ 	esac
+ }
+ 
++softlevel()
++{
++	echo $(rc-status --runlevel)
++}
++
++get_bootparam()
++{
++	local match="$1"
++	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
++
++	set -- $(cat /proc/cmdline)
++	while [ -n "$1" ]; do
++		case "$1" in
++			gentoo=*)
++				local params="${1##*=}"
++				local IFS=, x=
++				for x in ${params}; do
++					[ "${x}" = "${match}" ] && return 0
++				done
++				;;
++		esac
++		shift
++	done
++
++	return 1
++}
++
+ _sanitize_path()
+ {
+ 	local IFS=":" p= path=
+diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
+index 74db71e..eb45e49 100644
+--- a/sh/rc-functions.sh.in
++++ b/sh/rc-functions.sh.in
+@@ -51,28 +51,6 @@ is_union_fs()
+ 	unionctl "$1" --list >/dev/null 2>&1
+ }
+ 
+-get_bootparam()
+-{
+-	local match="$1"
+-	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
+-
+-	set -- $(cat /proc/cmdline)
+-	while [ -n "$1" ]; do
+-		case "$1" in
+-			gentoo=*)
+-				local params="${1##*=}"
+-				local IFS=, x=
+-				for x in ${params}; do
+-					[ "${x}" = "${match}" ] && return 0
+-				done
+-				;;
+-		esac
+-		shift
+-	done
+-
+-	return 1
+-}
+-
+ # Add our sbin to $PATH
+ case "${PATH}" in
+ 	@PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);;
+-- 
+1.5.4.4
+
diff --git a/sys-apps/openrc/files/9999/0003-KV.patch b/sys-apps/openrc/files/9999/0003-KV.patch
new file mode 100644
index 000000000000..8ab646f32c0d
--- /dev/null
+++ b/sys-apps/openrc/files/9999/0003-KV.patch
@@ -0,0 +1,120 @@
+From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 24 Mar 2008 03:14:02 -0400
+Subject: [PATCH] add back KV_* funcs
+
+---
+ sh/functions.sh.in |   35 +++++++++++++++++++++++++++++++++++
+ sh/runtests.sh     |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 80 insertions(+), 0 deletions(-)
+
+diff --git a/sh/functions.sh.in b/sh/functions.sh.in
+index 140f6dc..0522792 100644
+--- a/sh/functions.sh.in
++++ b/sh/functions.sh.in
+@@ -65,6 +65,41 @@ get_bootparam()
+ 	return 1
+ }
+ 
++KV_major() {
++	[ -z "$*" ] && return 1
++	local KV="$*"
++	echo ${KV%%.*}
++}
++
++KV_minor() {
++	[ -z "$*" ] && return 1
++	local KV="$*"
++	KV=${KV#*.}
++	echo ${KV%%.*}
++}
++
++KV_micro() {
++	[ -z "$*" ] && return 1
++	local KV="$*"
++	KV=${KV#*.*.}
++	echo ${KV%%[![:digit:]]*}
++}
++
++KV_to_int() {
++	[ -z "$*" ] && return 1
++	local KV_MAJOR="$(KV_major "$*")"
++	local KV_MINOR="$(KV_minor "$*")"
++	local KV_MICRO="$(KV_micro "$*")"
++	local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
++	echo "${KV_int}"
++}
++
++_RC_GET_KV_CACHE=""
++get_KV() {
++	[ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
++	echo $(KV_to_int "${_RC_GET_KV_CACHE}")
++}
++
+ _sanitize_path()
+ {
+ 	local IFS=":" p= path=
+diff --git a/sh/runtests.sh b/sh/runtests.sh
+index d0d6a17..debcf4f 100755
+--- a/sh/runtests.sh
++++ b/sh/runtests.sh
+@@ -3,6 +3,19 @@
+ top_srcdir=${top_srcdir:-..}
+ . ${top_srcdir}/test/setup_env.sh
+ 
++checkit() {
++	local output=$($1 $3)
++	local lret=$?
++	if [ ${lret} -ne 0 ] ; then
++		((tret+=lret))
++		echo "FAIL: exec: $*"
++	fi
++	if [ "${output}" != "$2" ] ; then
++		((tret+=lret))
++		echo "FAIL: output: $* : got='${output}' wanted='$2'"
++	fi
++}
++
+ ret=0
+ 
+ tret=0
+@@ -22,4 +35,36 @@ done
+ eend ${tret}
+ ((ret+=tret))
+ 
++compare_int() {
++	local got=$(KV_to_int $1)
++	local exp=$(KV_to_int $3)
++	if ! [ ${got} $2 ${exp} ] ; then
++		((tret+=1))
++		echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
++	fi
++}
++
++tret=0
++ebegin "Testing KV_{major,minor,micro,to_int}"
++for v in \
++	1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
++	1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
++do
++	checkit KV_major 1 ${v}
++	checkit KV_minor 2 ${v}
++	checkit KV_micro 3 ${v}
++
++	compare_int 1.2.2 -lt ${v}
++	compare_int 1.2.2.10 -lt ${v}
++	compare_int 1.2.4 -gt ${v}
++	compare_int 1.2.4-rc0 -gt ${v}
++	compare_int 1.2.3 -eq ${v}
++	compare_int 1.2.3-rc0 -eq ${v}
++	compare_int 1.2.3.2 -eq ${v}
++	compare_int 1.2.3.3 -eq ${v}
++	compare_int 1.2.3.4 -eq ${v}
++done
++eend ${tret}
++((ret+=tret))
++
+ exit ${ret}
+-- 
+1.5.4.4
+
diff --git a/sys-apps/openrc/openrc-0.2-r2.ebuild b/sys-apps/openrc/openrc-0.2-r2.ebuild
index ec38d1837755..da64978ab989 100644
--- a/sys-apps/openrc/openrc-0.2-r2.ebuild
+++ b/sys-apps/openrc/openrc-0.2-r2.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.5 2008/03/30 17:42:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
-	EGIT_BRANCH="Gentoo"
+	EGIT_BRANCH="master"
 	inherit git
 else
 	SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2
@@ -63,6 +63,7 @@ src_unpack() {
 		unpack ${A}
 	fi
 	cd "${S}"
+	epatch "${FILESDIR}"/9999/*.patch
 
 	epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch
 	epatch "${FILESDIR}"/${PN}-0.2-multiple-ntp-servers.patch
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index da2d73558bba..109c10f8a682 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,12 +1,12 @@
 # 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-9999.ebuild,v 1.16 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.17 2008/03/30 17:42:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
-	EGIT_BRANCH="Gentoo"
+	EGIT_BRANCH="master"
 	inherit git
 else
 	SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2
@@ -61,6 +61,7 @@ src_unpack() {
 		unpack ${A}
 	fi
 	cd "${S}"
+	epatch "${FILESDIR}"/9999/*.patch
 }
 
 src_compile() {