summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2008-03-26 19:55:30 +0000
committerDoug Goldstein <cardoe@gentoo.org>2008-03-26 19:55:30 +0000
commitb0a64000682affe406feb25da971341783f2e282 (patch)
treeda396cf87ac4bea10f89f69896158618926c4e73 /sys-apps/openrc
parentalpha/ia64/sparc stable (diff)
downloadhistorical-b0a64000682affe406feb25da971341783f2e282.tar.gz
historical-b0a64000682affe406feb25da971341783f2e282.tar.bz2
historical-b0a64000682affe406feb25da971341783f2e282.zip
handle Gentoo/FreeBSD clock -> adjkerntz
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/Manifest8
-rw-r--r--sys-apps/openrc/openrc-0.2_pre20080326.ebuild11
2 files changed, 11 insertions, 8 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index d34849cc3fd7..b0dd2beb8264 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,14 +2,14 @@
Hash: SHA1
DIST openrc-0.2_pre20080326.tar.bz2 141680 RMD160 7c5b1440fe9720802800d71ad480e0b1f28cbcaf SHA1 6f11ee5a4bef15d19063e2ed262a06a952e02168 SHA256 f0c2bdfa3dab230768eb1b1c8a3f257183fcb5d00d2a76e31f84ce2bfe195469
-EBUILD openrc-0.2_pre20080326.ebuild 6897 RMD160 dedd9b5737907e9b85018c063529fa5009e07555 SHA1 5503c16784dd63b735964e4dc9ea4f45ff7f6dc4 SHA256 c3572757b812f5edc197fdf3b6d6adb2ef45900fa6588661458b9b21fccb8ac3
+EBUILD openrc-0.2_pre20080326.ebuild 6993 RMD160 f1a8559fa1964304dcf9850d4b47a7a0e65710d5 SHA1 1b3ed963fe57173d629585720831ce4abe62e564 SHA256 e49ebbfaa1de50e90131c8f618e7e6f44f3868d44f4eaab7e72818f295a85f14
EBUILD openrc-9999.ebuild 6515 RMD160 0033eb983d269ad99626e361655baaf65f28c9dc SHA1 e468e9fae2960d4ec165aac3383c211b7cfa3126 SHA256 004ea188c2b7438412da30a905be116a02527fe388b06ff536e4056b43c105a3
MISC ChangeLog 696 RMD160 4d1af4705b025a535b601d27882315619b38262d SHA1 03a76b01c1254042b282afb75ce1f3c46ac7a151 SHA256 7863beccf05be18d0546af4aee2f1e93a09b66287790146d0f1be82255d61864
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFH6qfsoeSe8B0zEfwRAnl1AJ4uKIUAhV60IvKq9Muu4zbXMHJYoQCghqvi
-5RBpbdQ3uB47tnBPV6LZA2o=
-=r22f
+iD8DBQFH6qo4oeSe8B0zEfwRAvNIAJ0fhDmwpJn1djEf2Yj7DE7FpwJr9gCfTC+f
+TW8TVPmzqAXjyx+ZrIS6tag=
+=WobV
-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.2_pre20080326.ebuild b/sys-apps/openrc/openrc-0.2_pre20080326.ebuild
index 76a7d4581d2d..9d9694afc4d9 100644
--- a/sys-apps/openrc/openrc-0.2_pre20080326.ebuild
+++ b/sys-apps/openrc/openrc-0.2_pre20080326.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.2_pre20080326.ebuild,v 1.3 2008/03/26 19:45:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2_pre20080326.ebuild,v 1.4 2008/03/26 19:55:30 cardoe Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -103,16 +103,19 @@ pkg_preinst() {
[[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
# /etc/conf.d/clock moved to /etc/conf.d/hwclock
+ local clock
+ use kernel_FreeBSD && clock="adjkerntz"
+ use kernel_linux && clock="hwclock"
if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
- mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/hwclock
+ mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
fi
if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
rm -f "${ROOT}"/etc/runlevels/boot/clock
- ln -snf /etc/init.d/hwclock "${ROOT}"/etc/runlevels/boot/hwclock
+ ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
fi
if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
- ln -snf /etc/init.d/hwclock "${ROOT}${LIBDIR}"/rc/init.d/started/hwclock
+ ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
fi
# /etc/conf.d/rc is no longer used for configuration