Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2 ebuild.

(Portage version: 2.1.6.7/cvs/Linux i686)

3 files changed, 20 insertions, 11 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 7f779049dbdc..29c6f8623ff8 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.60 2009/01/28 14:57:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.61 2009/01/31 14:34:36 zzam Exp $
+
+  31 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-0.4.2.ebuild,
+  openrc-9999.ebuild:
+  Sync 0.4.2 and 9999 ebuild. This does not change anything for 0.4.2
+  ebuild.
 
   28 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> openrc-9999.ebuild:
   Use specialized svnversion command to get commit version.
diff --git a/sys-apps/openrc/openrc-0.4.2.ebuild b/sys-apps/openrc/openrc-0.4.2.ebuild
index 4444b84d9441..71ab0c7df3ba 100644
--- a/sys-apps/openrc/openrc-0.4.2.ebuild
+++ b/sys-apps/openrc/openrc-0.4.2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.1 2009/01/14 14:19:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.2 2009/01/31 14:34:36 zzam 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="master"
-	inherit git
+	ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk"
+	inherit subversion
 else
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2
 		mirror://gentoo/${P}.tar.bz2
@@ -58,7 +57,7 @@ pkg_setup() {
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		subversion_src_unpack
 	else
 		unpack ${A}
 	fi
@@ -73,8 +72,8 @@ src_compile() {
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)"
-		sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile
+		local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svnversion)"
+		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
 	fi
 
 	tc-export CC AR RANLIB
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 0741cbf52c37..ec0437175358 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.44 2009/01/28 14:57:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.45 2009/01/31 14:34:36 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -173,6 +173,9 @@ pkg_preinst() {
 		fi
 	done
 
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
 	# openrc-0.4.0 no longer loads the udev addon
 	enable_udev=0
 	if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \
@@ -280,11 +283,13 @@ pkg_postinst() {
 	else
 		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
 			mkdir -p "${ROOT}"/etc/runlevels/sysinit
-			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* "${ROOT}"/etc/runlevels/sysinit
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
+				"${ROOT}"/etc/runlevels/sysinit
 		fi
 		if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
 			mkdir -p "${ROOT}"/etc/runlevels/shutdown
-			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* "${ROOT}"/etc/runlevels/shutdown
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
+				"${ROOT}"/etc/runlevels/shutdown
 		fi
 	fi