summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-05-16 20:57:59 +0000
committerWilliam Hubbs <williamh@gentoo.org>2012-05-16 20:57:59 +0000
commitb0e398f05e8c007adcb69d8114f18b089cda6766 (patch)
tree6075034d9a58d4f78880c56f58053db4e9184714 /sys-apps
parentInitial commit for notmuch (#389831) (diff)
downloadhistorical-b0e398f05e8c007adcb69d8114f18b089cda6766.tar.gz
historical-b0e398f05e8c007adcb69d8114f18b089cda6766.tar.bz2
historical-b0e398f05e8c007adcb69d8114f18b089cda6766.zip
update live ebuild for migration to /run on linux systems.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/openrc/ChangeLog5
-rw-r--r--sys-apps/openrc/Manifest12
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild16
3 files changed, 23 insertions, 10 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index dbc8519ad731..c114ceb43b08 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.218 2012/04/26 14:32:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.219 2012/05/16 20:57:59 williamh Exp $
+
+ 16 May 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ update live ebuild for migration to /run on linux systems.
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> openrc-0.9.9.3.ebuild,
openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 66f99e96287a..a2a3b2d7fedc 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -17,13 +17,13 @@ EBUILD openrc-0.9.9.1.ebuild 14113 RMD160 73169c09e489e4692a3cbe88649980519958cb
EBUILD openrc-0.9.9.2.ebuild 14113 RMD160 0abd76f9fb44bafc3f7c3e5ab4555aa16b367ece SHA1 5e0eba6eec223bb46fd17ac5d2b9dd149b3e32e8 SHA256 6a9a71bf343c0aaac5c655c0571bbe482e32036bff495b34242ba7c40725bf61
EBUILD openrc-0.9.9.3.ebuild 14125 RMD160 99452bcb825ff319cd228a53565ee82456bf5dca SHA1 1571950b22fe2133acc202eee46257f084f7834d SHA256 ed8395bce3dc857b0f6de2f903e8a6ae2e6a947303e4b389323ad9d70d90795b
EBUILD openrc-0.9.9.ebuild 14111 RMD160 edc75f091bcf00b35d9ab016163811e5d500e04f SHA1 8426ec2433394140bce8d073b37e1cd73c2aa1ba SHA256 cd930975d6c297ded8df70a5cfbc5d36d9b1141114d8ad1eb085721c7fa736f5
-EBUILD openrc-9999.ebuild 14124 RMD160 75b74e45d6193a9a47058772e9bc578c147ae821 SHA1 f33d232b7355dfc039ad1caa3e70acefc48139ab SHA256 5ecbcd15cb91482f82e5a01042b9dc4b3d36d732008e9097785efcccda156ed7
-MISC ChangeLog 37734 RMD160 bd4c382ae14412c1cc5f02753726db0fb97caf74 SHA1 64cf216ceaeea88cdacde18dc8a096736860d7d9 SHA256 f21e76148b999885784b9aed904c68e8eb8d313748ecb5c3a33a46b653f0d8a4
+EBUILD openrc-9999.ebuild 14421 RMD160 207c12046ce30a46792da3cdc1f02622d8d78c93 SHA1 954d00f3358606e93a0d072ea7ab2593a268ff27 SHA256 17386d13fb044ac4fa08d71ed5b677825c80182e719313a5b9f265e4c246c378
+MISC ChangeLog 37867 RMD160 197244bdda83edae4e23df5d70281b43368f3544 SHA1 9c51412f92077771bbb78ca3178ab83ed1851ff7 SHA256 3471a8402c8b4cb03e8cbb97e7630c506ddeddf234b3c604be1faf3a502ec27c
MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk+ZXJYACgkQvFcC4BYPU0rXoQCgzQEmu/YZ+AMcms8Voz7QdIRS
-nE8An0smm7yVkW3ZDCWWpVL3F7mcP4ke
-=FYlx
+iEYEARECAAYFAk+0FOMACgkQblQW9DDEZThz+ACgrrXTGPESzk/pHNcdDHmB7ISG
+CLYAnipAdKLo10dskgnaMqZag35tEtNn
+=1mc5
-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 072a86eb553a..02fdd13d4112 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.100 2012/04/26 14:32:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.101 2012/05/16 20:57:59 williamh Exp $
EAPI=4
@@ -25,7 +25,7 @@ RDEPEND="virtual/init
elibc_glibc? ( >=sys-libs/glibc-2.5 )
ncurses? ( sys-libs/ncurses )
pam? ( sys-auth/pambase )
- >=sys-apps/baselayout-2.0.0
+ >=sys-apps/baselayout-2.1-r1
kernel_linux? (
sys-process/psmisc
)
@@ -106,7 +106,10 @@ src_install() {
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
- keepdir /$(get_libdir)/rc/{init.d,tmp}
+ if ! use kernel_linux; then
+ keepdir /$(get_libdir)/rc/init.d
+ fi
+ keepdir /$(get_libdir)/rc/tmp
# Backup our default runlevels
dodir /usr/share/"${PN}"
@@ -415,6 +418,13 @@ pkg_postinst() {
chmod +x "${ROOT}"etc/local.d/*{start,stop}
fi
+ if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
+ if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+ ewarn "The dependency data could not be migrated to /run/openrc."
+ ewarn "This means you need to reboot your system."
+ fi
+ fi
+
# update the dependency tree after touching all files #224171
[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u