Force systemd for udev virtuals, bug 547360.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 908c521805a20eaeba5e692467dfc8f7a3bf0100..4f19dae04cdefca52a92f6dd10d21b730fb04cf4 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9950 2015/04/21 17:31:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9951 2015/04/22 21:14:29 floppym Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  22 Apr 2015; Mike Gilbert <floppym@gentoo.org> targets/systemd/package.mask,
+  +targets/systemd/package.use.force:
+  Force systemd for udev virtuals, bug 547360.
+
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> targets/systemd/package.mask:
   Mask other udev providers apart of systemd for systemd subprofiles to help
   portage to not try to pull in wrong provider leading to strange blockers

diff --git a/profiles/targets/systemd/package.mask b/profiles/targets/systemd/package.mask
index c204a34b693b20e9a50487f2dd704683e9905d6a..5cc47372bf96bd6453716b7766864153ef7f7b1c 100644 (file)
--- a/profiles/targets/systemd/package.mask
+++ b/profiles/targets/systemd/package.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.mask,v 1.6 2015/04/22 04:13:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.mask,v 1.7 2015/04/22 21:14:29 floppym Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (21 Apr 2015)
+# This is for running sys-apps/systemd and also helps
+# portage to not try to pull in other providers leading to
+# strange blockers.
+sys-fs/eudev
+sys-fs/udev
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (26 Oct 2014)
 # package is masked for bugs #526762 and #526802 on non-systemd systems.

diff --git a/profiles/targets/systemd/package.use.force b/profiles/targets/systemd/package.use.force
new file mode 100644 (file)
index 0000000..2ac4bd8
--- /dev/null
+++ b/profiles/targets/systemd/package.use.force
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/systemd/package.use.force,v 1.1 2015/04/22 21:14:29 floppym Exp $
+
+# Mike Gilbert <floppym@gentoo.org> (22 Apr 2015)
+# Force systemd to avoid depgraph breakage, bug 547360.
+virtual/libgudev systemd
+virtual/libudev systemd
+virtual/udev systemd