Restore rc-daemon and bump dependency on pidof.

(Portage version: 2.1_pre7-r5)

4 files changed, 16 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-baselayout/ChangeLog b/sys-freebsd/freebsd-baselayout/ChangeLog
index d26fe38f642a..ec147394c0bc 100644
--- a/sys-freebsd/freebsd-baselayout/ChangeLog
+++ b/sys-freebsd/freebsd-baselayout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.5 2006/04/10 23:07:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.6 2006/04/13 19:40:20 flameeyes Exp $
+
+*freebsd-baselayout-20060401-r3 (13 Apr 2006)
+
+  13 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-baselayout-20060401-r2.ebuild,
+  +freebsd-baselayout-20060401-r3.ebuild:
+  Restore rc-daemon and bump dependency on pidof.
 
 *freebsd-baselayout-20060401-r2 (10 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-baselayout/Manifest b/sys-freebsd/freebsd-baselayout/Manifest
index 3fb1ab893f1d..777c277b1032 100644
--- a/sys-freebsd/freebsd-baselayout/Manifest
+++ b/sys-freebsd/freebsd-baselayout/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dc7c979e50746a2e18955807d23b40be ChangeLog 4452
 RMD160 5b77ed78c601d25bc2b895dc4f8e6b1d1478b798 ChangeLog 4452
 SHA256 04a5ea93016212697e2fbb9f74300ef2c675ae4c47c725dbddc0f23c5fe6bf11 ChangeLog 4452
-MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401-r2 560
-RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401-r2 560
-SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401-r2 560
+MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401-r3 560
+RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401-r3 560
+SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401-r3 560
 MD5 3982112fc4bf2d6f7adabbc28035fad3 files/dummy.initd 186
 RMD160 1802974f22719d82ec99911a3bd669412719a171 files/dummy.initd 186
 SHA256 1fe737503cd68c7a77aec997567e30aa5ff01adfb92f028ad57a5c4aab0afbc0 files/dummy.initd 186
@@ -16,16 +13,9 @@ SHA256 489703e9a80c9b9d66f3b4f922a191f238ad9111479b22d90bb6d0c8905a2383 files/pr
 MD5 2170d28b6f693a8e66230323f381265b files/ssd-fbsd.patch 1254
 RMD160 2a9f7aecb3b6e7cdeed746a3d85b162595f5d8ba files/ssd-fbsd.patch 1254
 SHA256 a2e4ecd2e8bdf92e548495753f0230973cdc72f14fa6cbb6b08f83f229d95d61 files/ssd-fbsd.patch 1254
-MD5 2942583055d4de93920fb2147eadefe2 freebsd-baselayout-20060401-r2.ebuild 20470
-RMD160 6ce65f65be31d4148eb92b0cea2de3d16c9d5250 freebsd-baselayout-20060401-r2.ebuild 20470
-SHA256 0eeb61f07fe9e2146c1ad11cefb6a0d60f49eaf24a84a656bf8d4a9500d8ca62 freebsd-baselayout-20060401-r2.ebuild 20470
+MD5 9305061ea12a71ba7da0dfa9940f6ad6 freebsd-baselayout-20060401-r3.ebuild 20260
+RMD160 5f31cc1126a8e581205dfc7ec531f04f178b8d87 freebsd-baselayout-20060401-r3.ebuild 20260
+SHA256 7b581b4f14ad31b6610b04ebff04432a33db4dc0633bc6d6b1435edc3ce508a4 freebsd-baselayout-20060401-r3.ebuild 20260
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEOuVSAiZjviIA2XgRAjy2AKDrK8wkyZE3WxRLXzxP54YhABBzlwCeNEbD
-/YfvE0X7kQ0lSOW+Dbb7DAk=
-=r1gt
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r2 b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r3
index 0b7a79ec7cb4..0b7a79ec7cb4 100644
--- a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r2
+++ b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r3
diff --git a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r3.ebuild
index 9af1d8d5220b..50fbc9e05e88 100644
--- a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild
+++ b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild,v 1.1 2006/04/10 23:07:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r3.ebuild,v 1.1 2006/04/13 19:40:21 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools
 
@@ -24,7 +24,7 @@ RDEPEND="userland_GNU? (
 			>=sys-apps/coreutils-5.2.1
 		) )
 	)
-	|| ( >=sys-apps/sysvinit-2.86-r3 sys-process/pidof-bsd )
+	|| ( >=sys-apps/sysvinit-2.86-r3 >=sys-process/pidof-bsd-20050501-r2 )
 	!build? ( !bootstrap? (
 		>=sys-libs/readline-5.0-r1
 		>=app-shells/bash-3.0-r10
@@ -426,11 +426,6 @@ src_install() {
 
 	# Hack to fix bug 9849, continued in pkg_postinst
 	unkdir
-
-	# On FreeBSD rc-daemon.sh doesn't seem to behave correctly; provide useful
-	# working system until this is fixed by removing it and forcing use of s-s-d
-	# directly.
-	rm -f ${D}/lib/rcscripts/sh/rc-daemon.sh
 }
 
 # Support function for remapping old wireless dns vars