summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-05-04 09:04:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-05-04 09:04:15 +0000
commit51a7056fa7da496268b23c1c625cd97047e1a58e (patch)
tree3353bb26e301b5c67ef74ab7a6c0c4d173b66f09 /sys-apps
parentRevbump to use libfm subslot deps (diff)
downloadgentoo-2-51a7056fa7da496268b23c1c625cd97047e1a58e.tar.gz
gentoo-2-51a7056fa7da496268b23c1c625cd97047e1a58e.tar.bz2
gentoo-2-51a7056fa7da496268b23c1c625cd97047e1a58e.zip
Fix blockers since -r4 can be installed with =sys-apps/util-linux-2.22*
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/sysvinit/ChangeLog6
-rw-r--r--sys-apps/sysvinit/sysvinit-2.88-r4.ebuild4
-rw-r--r--sys-apps/sysvinit/sysvinit-2.88-r5.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index a709683b1c84..635d6ba3a74c 100644
--- a/sys-apps/sysvinit/ChangeLog
+++ b/sys-apps/sysvinit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/sysvinit
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.123 2013/05/04 04:57:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.124 2013/05/04 09:04:15 ssuominen Exp $
+
+ 04 May 2013; Samuli Suominen <ssuominen@gentoo.org> sysvinit-2.88-r4.ebuild,
+ sysvinit-2.88-r5.ebuild:
+ Fix blockers since -r4 can be installed with =sys-apps/util-linux-2.22*
*sysvinit-2.88-r5 (04 May 2013)
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild
index 8084fa2d5c43..ce2803b5bc41 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r4.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/sysvinit/sysvinit-2.88-r4.ebuild,v 1.15 2013/05/04 04:57:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild,v 1.16 2013/05/04 09:04:15 ssuominen Exp $
EAPI="4"
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
IUSE="selinux ibm static kernel_FreeBSD"
RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )
- !<sys-apps/util-linux-2.23"
+ !<sys-apps/util-linux-2.22"
DEPEND="${RDEPEND}
virtual/os-headers"
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild
index 69f5cc9774d6..d5ba20ad36c2 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r5.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/sysvinit/sysvinit-2.88-r5.ebuild,v 1.1 2013/05/04 04:57:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild,v 1.2 2013/05/04 09:04:15 ssuominen Exp $
EAPI="4"
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="selinux ibm static kernel_FreeBSD"
-RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )"
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )
+ !<sys-apps/util-linux-2.23"
DEPEND="${RDEPEND}
virtual/os-headers"