Fix update code. Switch over to svn repository.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r1 i686

3 files changed, 24 insertions, 24 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 2decb9f64ddd..06a298a127a3 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
 # 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.45 2008/12/10 22:09:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.46 2008/12/13 08:35:25 zzam Exp $
+
+  13 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> openrc-9999.ebuild:
+  Fix update code. Switch over to svn repository.
 
   10 Dec 2008; Doug Goldstein <cardoe@gentoo.org> openrc-9999.ebuild:
   Add runlevel migration support and update depends for live git build
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 72085fcd2f6e..992f74438735 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -24,13 +24,13 @@ DIST openrc-0.4.0.tar.bz2 144297 RMD160 e41e9d75e104bd04fa64291f9b520235ea4c6fbc
 EBUILD openrc-0.2.5.ebuild 9024 RMD160 fb7d2b6fd10ac87a66fe554b2480e75aa8ff438b SHA1 c5a8636fbe4c70ba8762aa46c9f0d5e3c6bcbb38 SHA256 69f907e50ec99c0c55a0a84addb23d75ce6bf617678f13f519a684697b443409
 EBUILD openrc-0.3.0-r1.ebuild 9027 RMD160 ae483e1f1a20a565c2f9160fbab38758077e981e SHA1 2fbc328ebb01aff7380ec50a9e9302d585a1defd SHA256 b15628b0cea9912c2b3bcf39fa1d9077fa968dbb2df4ef83666712bd97a4779e
 EBUILD openrc-0.4.0.ebuild 9478 RMD160 fd4f3227ae95fb8fa1261486e22d9b42a958882c SHA1 bbf3dda0c2d13e53efd1d52a9e3a87e29d9424f6 SHA256 42ede1247a9db5846a1532a2b86559a12ad990a3d9a1783a68939b94383165bc
-EBUILD openrc-9999.ebuild 9257 RMD160 0bf16b86c00d0aae0c27e1f3686ab88ef613ed4f SHA1 55e07bc0996c5247a3b1120fda8525ed946666af SHA256 244bc88414af2472b4e6ed8ba0c52f28d59c67dcfb3a29aefe2a6a41df293320
-MISC ChangeLog 8835 RMD160 3cae13c107f0171dad6b53bb305136eff6cc0fa7 SHA1 98ab1f43bf4fa5cfa3f3d6a67e8627b713b356f0 SHA256 34ab220d88378862c735edf85751659d2d2c239310b0f224edc152139055f0cf
+EBUILD openrc-9999.ebuild 9247 RMD160 e9037054c81757e627a4489926bf1fc27b7ecf61 SHA1 4158fbb119c203f3a32daa3582dd0e7140dde9ad SHA256 0ec1a60053f4eb2faef6ce6322f24193ca633df3927a32fc5da289510fe70bb6
+MISC ChangeLog 8957 RMD160 91fcf9b2425a91208b1d21ac3028e78a6c6c173f SHA1 3f0d9d816e9e6ff39b79dcd861fb37b3af070582 SHA256 800e6f7b8bf89bb56a9fe1d205b328e7c21ffd78819462fa2e933f627fea3646
 MISC metadata.xml 231 RMD160 c39b780fbbb9eb38f1ba1a0ee134231ca8e7449c SHA1 d5a4c0d0c7641c862b43e742f832bab6c69482d8 SHA256 02e8fa3806efbc7cea8bc78653397b8d59b398faca8bcfd3aabb216103cd8f4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklAPjIACgkQoeSe8B0zEfx2egCfZR7442y2cYtZAcDv9Z8VP85R
-xYAAn1nxYNvGmHCTRKXacWTkUNpa6bzv
-=myXF
+iEYEARECAAYFAklDc9MACgkQt2vP6XvVdOfQ2wCbBl9kg9tT2JlJMg62KkveR5xP
+v9cAn0H+9s/hlDBTx5gCJBcryEgrqBMu
+=pLZ4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 582987ad61a0..9ce472adf019 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,13 +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.38 2008/12/10 22:09:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.39 2008/12/13 08:35:25 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 svn info|awk '/Revision/ { print $2 }')"
+		sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile
 	fi
 
 	tc-export CC AR RANLIB
@@ -256,6 +255,15 @@ pkg_postinst() {
 	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
 		einfo "Copying across default runlevels"
 		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+	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
+		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
+		fi
 	fi
 
 	# update the dependency tree bug #224171
@@ -264,17 +272,6 @@ pkg_postinst() {
 	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
 		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
 		ewarn "your files to /etc/conf.d/modules and delete the directory."
-	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
-		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
-		fi
 	fi
 
 	elog "You should now update all files in /etc, using etc-update"