summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-05-05 01:15:16 +0000
committerMike Frysinger <vapier@gentoo.org>2013-05-05 01:15:16 +0000
commitb04e19c95a6a22d94503852256330a0ea1bde864 (patch)
treebed248459cd77e963c3c7fabc526ae66120f89af /sys-apps/sysvinit
parentMigrate config file fix over to 9999 ebuild (diff)
downloadgentoo-2-b04e19c95a6a22d94503852256330a0ea1bde864.tar.gz
gentoo-2-b04e19c95a6a22d94503852256330a0ea1bde864.tar.bz2
gentoo-2-b04e19c95a6a22d94503852256330a0ea1bde864.zip
Fix blockers -- older sysvinit cannot be installed with newer util-linux.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps/sysvinit')
-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, 9 insertions, 6 deletions
diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog
index 635d6ba3a74c..100e4a96cb41 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.124 2013/05/04 09:04:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.125 2013/05/05 01:15:16 vapier Exp $
+
+ 05 May 2013; Mike Frysinger <vapier@gentoo.org> sysvinit-2.88-r4.ebuild,
+ sysvinit-2.88-r5.ebuild:
+ Fix blockers -- older sysvinit cannot be installed with newer util-linux.
04 May 2013; Samuli Suominen <ssuominen@gentoo.org> sysvinit-2.88-r4.ebuild,
sysvinit-2.88-r5.ebuild:
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild
index ce2803b5bc41..a9b33a39c0b4 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.16 2013/05/04 09:04:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r4.ebuild,v 1.17 2013/05/05 01:15:16 vapier 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.22"
+ !>=sys-apps/util-linux-2.23"
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 d5ba20ad36c2..031907d8173d 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.2 2013/05/04 09:04:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild,v 1.3 2013/05/05 01:15:16 vapier Exp $
EAPI="4"
@@ -15,8 +15,7 @@ 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 )
- !<sys-apps/util-linux-2.23"
+RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )"
DEPEND="${RDEPEND}
virtual/os-headers"