summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2013-12-03 15:55:44 +0000
committerIan Stakenvicius <axs@gentoo.org>2013-12-03 15:55:44 +0000
commit8d63979c3d9d9c3c2d6a81598329b1f36cee580c (patch)
treeb02e702e9e6cc92678728aba830bd87bb1f4b8dd /virtual
parentrevbump; add IUSE test, test deps, test phase, thanks to Chicago for reporting (diff)
downloadgentoo-2-8d63979c3d9d9c3c2d6a81598329b1f36cee580c.tar.gz
gentoo-2-8d63979c3d9d9c3c2d6a81598329b1f36cee580c.tar.bz2
gentoo-2-8d63979c3d9d9c3c2d6a81598329b1f36cee580c.zip
adjust eudev atoms so that both USE=kmod or USE=modutils can satisfy virtual/udev[kmod]
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'virtual')
-rw-r--r--virtual/udev/ChangeLog7
-rw-r--r--virtual/udev/udev-200.ebuild7
-rw-r--r--virtual/udev/udev-204.ebuild7
-rw-r--r--virtual/udev/udev-208.ebuild7
4 files changed, 21 insertions, 7 deletions
diff --git a/virtual/udev/ChangeLog b/virtual/udev/ChangeLog
index e28be90e84c4..66651ae6283e 100644
--- a/virtual/udev/ChangeLog
+++ b/virtual/udev/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for virtual/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.64 2013/12/01 15:45:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/udev/ChangeLog,v 1.65 2013/12/03 15:55:44 axs Exp $
+
+ 03 Dec 2013; Ian Stakenvicius <axs@gentoo.org> udev-200.ebuild,
+ udev-204.ebuild, udev-208.ebuild:
+ adjust eudev atoms so that both USE=kmod or USE=modutils can satisfy
+ virtual/udev[kmod]
01 Dec 2013; Johannes Huber <johu@gentoo.org> udev-208.ebuild:
x86 stable, bug #487340
diff --git a/virtual/udev/udev-200.ebuild b/virtual/udev/udev-200.ebuild
index 395ada0c1822..658c6fee244f 100644
--- a/virtual/udev/udev-200.ebuild
+++ b/virtual/udev/udev-200.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/virtual/udev/udev-200.ebuild,v 1.3 2013/10/02 09:13:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-200.ebuild,v 1.4 2013/12/03 15:55:44 axs Exp $
EAPI=5
@@ -17,6 +17,9 @@ IUSE="gudev hwdb introspection keymap +kmod selinux static-libs"
DEPEND=""
RDEPEND="|| ( >=sys-fs/udev-200[gudev?,hwdb?,introspection?,keymap?,kmod?,selinux?,static-libs?]
>=sys-apps/systemd-200:0/0[gudev?,introspection?,keymap(+)?,kmod?,selinux?,static-libs(-)?]
- kmod? ( >=sys-fs/eudev-1[modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
+ kmod? ( || (
+ >=sys-fs/eudev-1[modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
+ >=sys-fs/eudev-1.1[kmod,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
+ ) )
!kmod? ( >=sys-fs/eudev-1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
)"
diff --git a/virtual/udev/udev-204.ebuild b/virtual/udev/udev-204.ebuild
index a71d51e2322d..6b4caae9ce6f 100644
--- a/virtual/udev/udev-204.ebuild
+++ b/virtual/udev/udev-204.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/virtual/udev/udev-204.ebuild,v 1.1 2013/11/11 14:06:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-204.ebuild,v 1.2 2013/12/03 15:55:44 axs Exp $
EAPI=5
inherit multilib-build
@@ -19,6 +19,9 @@ DEPEND=""
RDEPEND="|| ( >=sys-fs/udev-204[${MULTILIB_USEDEP},gudev?,hwdb?,introspection?,keymap?,kmod?,selinux?,static-libs?]
>=sys-apps/systemd-204-r2:0/1[${MULTILIB_USEDEP},gudev?,introspection?,kmod?,selinux?,static-libs(-)?]
>=sys-apps/systemd-204-r2:0/0[${MULTILIB_USEDEP},gudev?,introspection?,kmod?,selinux?,static-libs(-)?]
- kmod? ( >=sys-fs/eudev-1.1[${MULTILIB_USEDEP},modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
+ kmod? ( || (
+ >=sys-fs/eudev-1.1[${MULTILIB_USEDEP},modutils,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
+ >=sys-fs/eudev-1.1[${MULTILIB_USEDEP},kmod,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
+ ) )
!kmod? ( >=sys-fs/eudev-1.1[${MULTILIB_USEDEP},gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
)"
diff --git a/virtual/udev/udev-208.ebuild b/virtual/udev/udev-208.ebuild
index 79a89ccb22a5..bda7890032aa 100644
--- a/virtual/udev/udev-208.ebuild
+++ b/virtual/udev/udev-208.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/virtual/udev/udev-208.ebuild,v 1.4 2013/12/01 15:45:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-208.ebuild,v 1.5 2013/12/03 15:55:44 axs Exp $
EAPI=5
inherit multilib-build
@@ -19,6 +19,9 @@ DEPEND=""
RDEPEND="|| ( >=sys-fs/udev-208[${MULTILIB_USEDEP},gudev?,introspection?,kmod?,selinux?,static-libs?]
>=sys-apps/systemd-208:0/1[${MULTILIB_USEDEP},gudev?,introspection?,kmod?,selinux?,static-libs(-)?]
>=sys-apps/systemd-208:0/0[${MULTILIB_USEDEP},gudev?,introspection?,kmod?,selinux?,static-libs(-)?]
- kmod? ( >=sys-fs/eudev-1.3[${MULTILIB_USEDEP},modutils,gudev?,introspection?,selinux?,static-libs?] )
+ kmod? ( || (
+ >=sys-fs/eudev-1.3[${MULTILIB_USEDEP},modutils,gudev?,introspection?,selinux?,static-libs?]
+ >=sys-fs/eudev-1.3[${MULTILIB_USEDEP},kmod,gudev?,introspection?,selinux?,static-libs?]
+ ) )
!kmod? ( >=sys-fs/eudev-1.3[${MULTILIB_USEDEP},gudev?,introspection?,selinux?,static-libs?] )
)"