[patch] openrc-9999.patch

openrc.patch (text/plain), 2.27 KB, created by Benda Xu on 2012-09-17 06:48:39 UTC

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.102
diff -u -B -u -r1.102 openrc-9999.ebuild
--- openrc-9999.ebuild	10 Jul 2012 18:01:47 -0000	1.102
+++ openrc-9999.ebuild	17 Sep 2012 06:46:45 -0000
@@ -37,7 +37,7 @@
 make_args() {
 	unset LIBDIR #266688
 
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -55,6 +55,7 @@
 			MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
 	fi
 	use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX} PKG_PREFIX=${EPREFIX}/usr LOCAL_PREFIX=${EPREFIX}/usr/local"
 }
 
 pkg_setup() {
@@ -86,7 +87,7 @@
 # set_config <file> <option name> <yes value> <no value> test
 # a value of "#" will just comment out the option
 set_config() {
-	local file="${D}/$1" var=$2 val com
+	local file="${ED}/$1" var=$2 val com
 	eval "${@:5}" && val=$3 || val=$4
 	[[ ${val} == "#" ]] && com="#" && val='\2'
 	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
@@ -115,8 +116,8 @@
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
-	cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
-	rm -rf "${D}"/etc/runlevels
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
 
 	# Install the default net configuration
 	doconfd conf.d/net
@@ -127,6 +128,9 @@
 	# Cater to the norm
 	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
 
+	# set prefix if we are
+	set_config /etc/rc.conf rc_sys prefix "" use prefix
+
 	# On HPPA, do not run consolefont by default (bug #222889)
 	if use hppa; then
 		rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
@@ -169,6 +173,8 @@
 }
 
 pkg_preinst() {
+	use prefix && return 0
+
 	local f LIBDIR=$(get_libdir)
 
 	# default net script is just comments, so no point in biting people
@@ -346,6 +352,8 @@
 }
 
 pkg_postinst() {
+	use prefix && { [[ -d "${EPREFIX}"/run ]] || mkdir "${EPREFIX}"/run; return 0; }
+
 	local LIBDIR=$(get_libdir)
 
 	# Remove old baselayout links