summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-11 06:56:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-11 06:56:36 +0000
commit6a6417cfba010b40178d8c73659fd853dcfeb105 (patch)
tree802f2a8c8bd861449a2dbea89f80f66d67abca7a /sys-apps/openrc
parentRemove virtual/init from build and runtime dependencies wrt #480576 (diff)
downloadgentoo-2-6a6417cfba010b40178d8c73659fd853dcfeb105.tar.gz
gentoo-2-6a6417cfba010b40178d8c73659fd853dcfeb105.tar.bz2
gentoo-2-6a6417cfba010b40178d8c73659fd853dcfeb105.zip
Replace virtual/init with direct dependencies for || ( sysvinit rinit ) because sys-apps/openrc is the only consumer of the virtual.
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/ChangeLog7
-rw-r--r--sys-apps/openrc/openrc-0.11.8.ebuild7
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild7
3 files changed, 16 insertions, 5 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index a5a1966fcf78..a42c5079f575 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.270 2013/08/11 06:27:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.271 2013/08/11 06:56:36 ssuominen Exp $
+
+ 11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> openrc-0.11.8.ebuild,
+ openrc-9999.ebuild:
+ Replace virtual/init with direct dependencies for || ( sysvinit rinit )
+ because sys-apps/openrc is the only consumer of the virtual.
11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> openrc-0.11.8.ebuild,
openrc-9999.ebuild:
diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild
index 7bd04f5a2dfd..935dfe616f24 100644
--- a/sys-apps/openrc/openrc-0.11.8.ebuild
+++ b/sys-apps/openrc/openrc-0.11.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.8.ebuild,v 1.12 2013/08/11 06:27:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.8.ebuild,v 1.13 2013/08/11 06:56:36 ssuominen Exp $
EAPI=4
@@ -36,7 +36,10 @@ DEPEND="${COMMON_DEPEND}
ncurses? ( sys-libs/ncurses[-tinfo] )
virtual/os-headers"
RDEPEND="${COMMON_DEPEND}
- virtual/init
+ !prefix? (
+ kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+ kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ )
ncurses? ( sys-libs/ncurses )"
src_prepare() {
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 76bf48b5e9a5..55ff188ef2e4 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.124 2013/08/11 06:27:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.125 2013/08/11 06:56:36 ssuominen Exp $
EAPI=5
@@ -38,7 +38,10 @@ DEPEND="${COMMON_DEPEND}
virtual/os-headers
ncurses? ( virtual/pkgconfig )"
RDEPEND="${COMMON_DEPEND}
- virtual/init"
+ !prefix? (
+ kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+ kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+ )"
src_prepare() {
sed -i 's:0444:0644:' mk/sys.mk || die