summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/udev/ChangeLog7
-rw-r--r--sys-fs/udev/udev-212-r1.ebuild6
-rw-r--r--sys-fs/udev/udev-9999.ebuild6
3 files changed, 12 insertions, 7 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 7c137a9f913c..88fc5c662e6c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1021 2014/03/29 06:22:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1022 2014/04/03 19:34:23 ssuominen Exp $
+
+ 03 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> udev-212-r1.ebuild,
+ udev-9999.ebuild:
+ Punt USE="openrc" and always pull in sys-fs/udev-init-scripts to match
+ behavior of sys-apps/systemd's ebuild.
29 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> -udev-212.ebuild:
old
diff --git a/sys-fs/udev/udev-212-r1.ebuild b/sys-fs/udev/udev-212-r1.ebuild
index e5d15f65c917..f3b57e92d96e 100644
--- a/sys-fs/udev/udev-212-r1.ebuild
+++ b/sys-fs/udev/udev-212-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.5 2014/03/29 06:17:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-212-r1.ebuild,v 1.6 2014/04/03 19:34:23 ssuominen Exp $
EAPI=5
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl doc +firmware-loader gudev introspection +kmod +openrc selinux static-libs"
+IUSE="acl doc +firmware-loader gudev introspection +kmod selinux static-libs"
RESTRICT="test"
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10"
PDEPEND=">=sys-apps/hwids-20140304[udev]
- openrc? ( >=sys-fs/udev-init-scripts-26 )"
+ >=sys-fs/udev-init-scripts-26"
S=${WORKDIR}/systemd-${PV}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index c04caf5b6086..0707d0e42153 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.292 2014/03/28 18:32:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.293 2014/04/03 19:34:23 ssuominen Exp $
EAPI=5
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl doc +firmware-loader gudev introspection +kmod +openrc selinux static-libs"
+IUSE="acl doc +firmware-loader gudev introspection +kmod selinux static-libs"
RESTRICT="test"
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10"
PDEPEND=">=sys-apps/hwids-20140304[udev]
- openrc? ( >=sys-fs/udev-init-scripts-26 )"
+ >=sys-fs/udev-init-scripts-26"
S=${WORKDIR}/systemd-${PV}