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)

5 files changed, 14 insertions, 16 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index eb46644e0394..b3138286311c 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.74 2013/03/04 17:04:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.75 2013/04/09 10:05:19 ssuominen Exp $
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> lilo-22.8-r2.ebuild,
+  lilo-23.2-r1.ebuild, lilo-23.2-r2.ebuild, metadata.xml:
+  Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt
+  #461382
 
   04 Mar 2013; Agostino Sarubbo <ago@gentoo.org> lilo-23.2-r2.ebuild:
   Stable for x86, wrt bug #436916
diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
index a21892c23eca..9422208ee99a 100644
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild
+++ b/sys-boot/lilo/lilo-22.8-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-boot/lilo/lilo-22.8-r2.ebuild,v 1.6 2013/02/24 12:12:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r2.ebuild,v 1.7 2013/04/09 10:05:19 ssuominen Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -22,9 +22,7 @@ LICENSE="BSD GPL-2"
 KEYWORDS="-* amd64 x86"
 
 DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( || (
-	>=sys-fs/lvm2-2.02.45
-	>=sys-fs/device-mapper-1.02.12 ) )"
+RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
diff --git a/sys-boot/lilo/lilo-23.2-r1.ebuild b/sys-boot/lilo/lilo-23.2-r1.ebuild
index be7ac62bdc03..4bc1d8619b69 100644
--- a/sys-boot/lilo/lilo-23.2-r1.ebuild
+++ b/sys-boot/lilo/lilo-23.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r1.ebuild,v 1.3 2011/04/25 01:44:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r1.ebuild,v 1.4 2013/04/09 10:05:19 ssuominen Exp $
 
 EAPI="2"
 
@@ -23,9 +23,7 @@ LICENSE="BSD GPL-2"
 KEYWORDS="-* ~amd64 ~x86"
 
 DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( || (
-	>=sys-fs/lvm2-2.02.45
-	>=sys-fs/device-mapper-1.02.12 ) )"
+RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
 src_prepare() {
 	# this patch is needed when booting PXE and the device you're using
diff --git a/sys-boot/lilo/lilo-23.2-r2.ebuild b/sys-boot/lilo/lilo-23.2-r2.ebuild
index eb4b85add3ea..3ecaa38a03f9 100644
--- a/sys-boot/lilo/lilo-23.2-r2.ebuild
+++ b/sys-boot/lilo/lilo-23.2-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-boot/lilo/lilo-23.2-r2.ebuild,v 1.3 2013/03/04 17:04:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2-r2.ebuild,v 1.4 2013/04/09 10:05:19 ssuominen Exp $
 
 EAPI="2"
 
@@ -23,9 +23,7 @@ LICENSE="BSD GPL-2"
 KEYWORDS="-* amd64 x86"
 
 DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( || (
-	>=sys-fs/lvm2-2.02.45
-	>=sys-fs/device-mapper-1.02.12 ) )"
+RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
 
 src_prepare() {
 	# this patch is needed when booting PXE and the device you're using
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index 5d67132037ba..22eebf8deace 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='device-mapper'>Enable support for
-  <pkg>sys-fs/device-mapper</pkg></flag>
+ <flag name='device-mapper'>Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
  <flag name='minimal'>Do not install the dolilo helper script</flag>
  <flag name='pxeserial'>Avoid character echo on PXE serial console</flag>
 </use>