Fix patches directory, bug #252340. Update ebuild to match the old 0.4.0 ebuild.

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

3 files changed, 37 insertions, 9 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 7897c70fa93b..599d689dddbc 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.51 2008/12/23 23:22:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.52 2008/12/24 06:59:46 zzam Exp $
+
+  24 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> openrc-0.4.1.ebuild:
+  Fix patches directory, bug #252340. Update ebuild to match the old 0.4.0
+  ebuild.
 
 *openrc-0.4.1 (23 Dec 2008)
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index e86c113883fe..c6e2d7976980 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -20,14 +20,14 @@ DIST openrc-0.4.0.tar.bz2 144297 RMD160 e41e9d75e104bd04fa64291f9b520235ea4c6fbc
 DIST openrc-0.4.1.tar.bz2 144429 RMD160 86510cb298eaa8f5f8cef4569e4df903650935de SHA1 1e56096b02a91ae7f455765f3334dfa8cc887f97 SHA256 0b6de456b1f5398089f8d4f805dcee427dced4d6245dfe1427b1994c2d2fa16b
 EBUILD openrc-0.3.0-r1.ebuild 9039 RMD160 f29f86e9ef54b08998bb9fa73674427c5ada7423 SHA1 b38cda65d80d5327cd2e9f49128e72559e9cc2c1 SHA256 c52156c84ccb363804c9227ad7cc331a61ce931e77e4e0fffdae2b77f6021443
 EBUILD openrc-0.4.0.ebuild 10171 RMD160 821b7be9e1beb8077956182486eddd4d91fe8616 SHA1 11151224c0fbac35df00b32214a276e3e8655ef6 SHA256 8566d3cd469064a63df333f4b9927df14d5d684e44920c2ee935b375da4f7a40
-EBUILD openrc-0.4.1.ebuild 9490 RMD160 e5c2400a7b5ed681d805c1a8a9d02413340db266 SHA1 38d51733fdb4c3612fc7377806d1be7e51fd421a SHA256 30cef2529f8dcc56fe2d40b1d2fab3e325f45d56dc556800099f138fb1eac638
+EBUILD openrc-0.4.1.ebuild 10168 RMD160 ba7aea34a0595033099b929f0ae176b5b448d085 SHA1 52acad3969d20b421ee3f6fe9b31bbcb3932a62e SHA256 f1a33fb952a6737c75c0a3531b1e7d5d2a240ff41ef66410c1f98d3978cf2b34
 EBUILD openrc-9999.ebuild 9937 RMD160 177a1210df9c10de3336c0da2d354b8a85b520d1 SHA1 7b5e417804bd164e914563c31c75b2dda0996221 SHA256 3b00f23035e19d2d191507e0828947b0d15e33f7af1337505201973276929603
-MISC ChangeLog 9951 RMD160 b048cdf9c686a239a84fa0a624f5a364eb0691fd SHA1 e08d653a335aa168550cff1d390471d1e837d893 SHA256 f4993f2ed21cf967fd947b5b458512066077be266f4cd3f9f1097b25dd221abb
+MISC ChangeLog 10109 RMD160 d87761b657bd788d782a5ef4f394d25b075df3d2 SHA1 6b031ed1cdf156121ca89959ab0391d45c74e24f SHA256 9bfefb802393db2839aa64628f62c990d6ba737c3010b55dea1db8bce5688a5c
 MISC metadata.xml 231 RMD160 c39b780fbbb9eb38f1ba1a0ee134231ca8e7449c SHA1 d5a4c0d0c7641c862b43e742f832bab6c69482d8 SHA256 02e8fa3806efbc7cea8bc78653397b8d59b398faca8bcfd3aabb216103cd8f4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklRcrYACgkQoeSe8B0zEfzkgACeIiJnESzp//7hRyzCWRAzlMSv
-7lUAn3cz+zhFHSp4/bFBE6B/Vj2Uc42d
-=yFpL
+iEYEARECAAYFAklR3egACgkQt2vP6XvVdOcTIQCguSL+zvGhbeIU2iV6LFgudr0j
+u1oAoOaLyACAowkPM1h4D7tkQSowvVlv
+=90PE
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.4.1.ebuild b/sys-apps/openrc/openrc-0.4.1.ebuild
index fb798ac4d421..a364894648da 100644
--- a/sys-apps/openrc/openrc-0.4.1.ebuild
+++ b/sys-apps/openrc/openrc-0.4.1.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.4.1.ebuild,v 1.1 2008/12/23 23:22:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.1.ebuild,v 1.2 2008/12/24 06:59:46 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ RDEPEND="virtual/init
 	pam? ( virtual/pam )
 	>=sys-apps/baselayout-2.0.0
 	!<sys-fs/udev-133
-	!<sys-fs/sysvinit-2.86-r11"
+	!<sys-apps/sysvinit-2.86-r11"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 
@@ -63,7 +63,7 @@ src_unpack() {
 		unpack ${A}
 	fi
 	cd "${S}"
-	epatch "${FILESDIR}"/0.4.1/*.patch
+	epatch "${FILESDIR}"/0.4.0/*.patch
 }
 
 src_compile() {
@@ -174,6 +174,25 @@ pkg_preinst() {
 	# 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 ]] && \
+		[[ -e "${ROOT}"/etc/init.d/udev ]] && \
+		! has_version ">=sys-apps/openrc-0.4.0"
+	then
+		# make sure udev is in sysinit if it was enabled before
+		local rc_devices=$(
+			[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+			[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+			echo "${rc_devices:-${RC_DEVICES:-auto}}"
+		)
+		case ${rc_devices} in
+			udev|auto)
+				enable_udev=1
+				;;
+		esac
+	fi
+
 	# skip remaining migration if we already have openrc installed
 	has_version sys-apps/openrc && return 0
 
@@ -272,6 +291,11 @@ pkg_postinst() {
 		fi
 	fi
 
+	if [[ "$enable_udev" = 1 ]]; then
+		elog "Auto adding udev init script to the sysinit runlevel"
+		ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+	fi
+
 	# update the dependency tree bug #224171
 	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u