summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-04-09 10:09:20 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-04-09 10:09:20 +0000
commit038abc6d583bc9d0cb871856633b9d2cabb9ae03 (patch)
tree318a0bc8c4a84f34e8786cbd0f0c0169bdcd1488 /sys-kernel
parentRemove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt #4... (diff)
downloadgentoo-2-038abc6d583bc9d0cb871856633b9d2cabb9ae03.tar.gz
gentoo-2-038abc6d583bc9d0cb871856633b9d2cabb9ae03.tar.bz2
gentoo-2-038abc6d583bc9d0cb871856633b9d2cabb9ae03.zip
Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt #461382
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/dracut/ChangeLog10
-rw-r--r--sys-kernel/dracut/dracut-014-r3.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-018-r3.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-019-r6.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-022-r6.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-023-r4.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-024-r4.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-025.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-026-r1.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-026-r2.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-026.ebuild4
-rw-r--r--sys-kernel/dracut/dracut-027.ebuild4
12 files changed, 31 insertions, 23 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 4a6d9edf3013..03f8ea1caeff 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-kernel/dracut
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.117 2013/04/02 14:51:03 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.118 2013/04/09 10:09:20 ssuominen Exp $
+
+ 09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> dracut-014-r3.ebuild,
+ dracut-018-r3.ebuild, dracut-019-r6.ebuild, dracut-022-r6.ebuild,
+ dracut-023-r4.ebuild, dracut-024-r4.ebuild, dracut-025.ebuild,
+ dracut-026.ebuild, dracut-026-r1.ebuild, dracut-026-r2.ebuild,
+ dracut-027.ebuild:
+ Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt
+ #461382
02 Apr 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+files/025-0000-fix-version-print.patch, dracut-025.ebuild:
diff --git a/sys-kernel/dracut/dracut-014-r3.ebuild b/sys-kernel/dracut/dracut-014-r3.ebuild
index b12de6c97e16..1a717d770a8a 100644
--- a/sys-kernel/dracut/dracut-014-r3.ebuild
+++ b/sys-kernel/dracut/dracut-014-r3.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-kernel/dracut/dracut-014-r3.ebuild,v 1.8 2013/01/05 19:14:01 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-014-r3.ebuild,v 1.9 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -46,7 +46,7 @@ IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
RESTRICT="test"
NETWORK_DEPS=">=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2"
-DM_DEPS="|| ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 )"
+DM_DEPS=">=sys-fs/lvm2-2.02.33"
RDEPEND="
app-arch/cpio
diff --git a/sys-kernel/dracut/dracut-018-r3.ebuild b/sys-kernel/dracut/dracut-018-r3.ebuild
index 9ecf696c9d85..4070f7c19baa 100644
--- a/sys-kernel/dracut/dracut-018-r3.ebuild
+++ b/sys-kernel/dracut/dracut-018-r3.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-kernel/dracut/dracut-018-r3.ebuild,v 1.5 2013/01/05 19:14:01 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-018-r3.ebuild,v 1.6 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -71,7 +71,7 @@ RDEPEND="
!>=sys-fs/udev-186
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-019-r6.ebuild b/sys-kernel/dracut/dracut-019-r6.ebuild
index ffd7a817817f..9a2f07cec01f 100644
--- a/sys-kernel/dracut/dracut-019-r6.ebuild
+++ b/sys-kernel/dracut/dracut-019-r6.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-kernel/dracut/dracut-019-r6.ebuild,v 1.6 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r6.ebuild,v 1.7 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -71,7 +71,7 @@ RDEPEND="
virtual/udev
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-022-r6.ebuild b/sys-kernel/dracut/dracut-022-r6.ebuild
index 90b7341ee839..7c4abcaf0a75 100644
--- a/sys-kernel/dracut/dracut-022-r6.ebuild
+++ b/sys-kernel/dracut/dracut-022-r6.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-kernel/dracut/dracut-022-r6.ebuild,v 1.6 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r6.ebuild,v 1.7 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -70,7 +70,7 @@ RDEPEND="${CDEPEND}
>=sys-apps/util-linux-2.20
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-023-r4.ebuild b/sys-kernel/dracut/dracut-023-r4.ebuild
index 4f30761a361d..5104cc9624e0 100644
--- a/sys-kernel/dracut/dracut-023-r4.ebuild
+++ b/sys-kernel/dracut/dracut-023-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-kernel/dracut/dracut-023-r4.ebuild,v 1.4 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-023-r4.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -76,7 +76,7 @@ RDEPEND="${CDEPEND}
>=sys-apps/util-linux-2.21
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-024-r4.ebuild b/sys-kernel/dracut/dracut-024-r4.ebuild
index c9f4186a8a19..e3392ca249ba 100644
--- a/sys-kernel/dracut/dracut-024-r4.ebuild
+++ b/sys-kernel/dracut/dracut-024-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-kernel/dracut/dracut-024-r4.ebuild,v 1.4 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-024-r4.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -77,7 +77,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-025.ebuild b/sys-kernel/dracut/dracut-025.ebuild
index 0fbb5f83d301..5a9122c202e3 100644
--- a/sys-kernel/dracut/dracut-025.ebuild
+++ b/sys-kernel/dracut/dracut-025.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-kernel/dracut/dracut-025.ebuild,v 1.4 2013/04/02 14:51:03 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-025.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -77,7 +77,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-026-r1.ebuild b/sys-kernel/dracut/dracut-026-r1.ebuild
index b5d89b5c647d..438c3dfadd10 100644
--- a/sys-kernel/dracut/dracut-026-r1.ebuild
+++ b/sys-kernel/dracut/dracut-026-r1.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-kernel/dracut/dracut-026-r1.ebuild,v 1.3 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r1.ebuild,v 1.4 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -77,7 +77,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-026-r2.ebuild b/sys-kernel/dracut/dracut-026-r2.ebuild
index 4cee330e2e98..59d6b9dfdb1b 100644
--- a/sys-kernel/dracut/dracut-026-r2.ebuild
+++ b/sys-kernel/dracut/dracut-026-r2.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-kernel/dracut/dracut-026-r2.ebuild,v 1.1 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r2.ebuild,v 1.2 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -79,7 +79,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-026.ebuild b/sys-kernel/dracut/dracut-026.ebuild
index 212dcf8a6f56..fb16c4927787 100644
--- a/sys-kernel/dracut/dracut-026.ebuild
+++ b/sys-kernel/dracut/dracut-026.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-kernel/dracut/dracut-026.ebuild,v 1.2 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026.ebuild,v 1.3 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -77,7 +77,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )
diff --git a/sys-kernel/dracut/dracut-027.ebuild b/sys-kernel/dracut/dracut-027.ebuild
index 8ea829521740..07ca65e0c3c3 100644
--- a/sys-kernel/dracut/dracut-027.ebuild
+++ b/sys-kernel/dracut/dracut-027.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-kernel/dracut/dracut-027.ebuild,v 1.2 2013/04/02 14:16:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027.ebuild,v 1.3 2013/04/09 10:09:20 ssuominen Exp $
EAPI=4
@@ -79,7 +79,7 @@ RDEPEND="${CDEPEND}
virtual/pkgconfig
debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
+ device-mapper? ( >=sys-fs/lvm2-2.02.33 )
net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
selinux? ( sys-libs/libselinux sys-libs/libsepol )
dracut_modules_biosdevname? ( sys-apps/biosdevname )