summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2009-04-10 16:31:20 +0000
committerCaleb Tennis <caleb@gentoo.org>2009-04-10 16:31:20 +0000
commit7ca62bddd295dee9e10138fefb7356bfefbc2ca5 (patch)
tree2bfda84721d2e43642ee83c8bcb2927798f8a3c5 /sys-boot
parentfix device-mapper dep for lvm2, see #265599 (diff)
downloadhistorical-7ca62bddd295dee9e10138fefb7356bfefbc2ca5.tar.gz
historical-7ca62bddd295dee9e10138fefb7356bfefbc2ca5.tar.bz2
historical-7ca62bddd295dee9e10138fefb7356bfefbc2ca5.zip
fix device-mapper dep for lvm2, see #265599
Package-Manager: portage-2.1.6.11/cvs/Linux i686
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/lilo/ChangeLog7
-rw-r--r--sys-boot/lilo/Manifest14
-rw-r--r--sys-boot/lilo/lilo-22.8-r2.ebuild8
3 files changed, 12 insertions, 17 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 3106dd488309..20b225ebc21e 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/lilo
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.54 2008/08/18 16:07:39 chainsaw Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.55 2009/04/10 16:31:20 caleb Exp $
+
+ 10 Apr 2009; Caleb Tennis <caleb@gentoo.org> lilo-22.8-r2.ebuild:
+ fix device-mapper dep for lvm2, see #265599
18 Aug 2008; <chainsaw@gentoo.org>
-files/lilo-22.7.3-correct-usage-info.patch,
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 646280d760c7..0a21a6736ce0 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX lilo-22.8-correct-usage-info.patch 604 RMD160 d7cd1c5521c58ba19b1e0847746b5fe42ed23240 SHA1 96772a4f502876d7ebf3e016280dfa4bea382b35 SHA256 9a73c94e4c923141817def8030e43cc6eebaffa1bbce35ad3d511dc2583d645b
AUX lilo-22.8-makefile.patch 1776 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff SHA1 346d53bb307d1baa393da1db1fc516b1cc5ebee7 SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7
AUX lilo-22.8-nodevmapper.patch 437 RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c SHA1 fa6cae8448c13bd10c68a4ee79bb753f2f8ec4aa SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6
@@ -8,13 +5,6 @@ AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SH
AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0
DIST dolilo-0.5.tar.bz2 3777 RMD160 10a060878ee3fc50ba109c8d2decdd6b409bed2e SHA1 9617479e3736c24d3c06628c540a5eaeb184d849 SHA256 9b6994ec6416cdfb0205665a58dc2e6a1d6e36272a3cab94315daea1c55605f1
DIST lilo-22.8.src.tar.gz 437555 RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 SHA1 59852eab59b93dcea63b39eef1db7963b7268b0d SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb
-EBUILD lilo-22.8-r2.ebuild 4648 RMD160 24fc7c2fc9e0147835d9e9bc23d9b6db4a4c20b3 SHA1 4c215991ace60413dd96a2ddd21cc697a8cd8b7c SHA256 3a330a4c03f7492841f833481cfae7843385e124f15137bc5106f167f946a200
-MISC ChangeLog 10410 RMD160 acdc47d7cc43c318a521684d89d306a852ecac6c SHA1 dc6a26b78a42bb7668a1c9719f9084395b441fad SHA256 64deb25f34df2e4595fc5dedcbb18adda53065f3bc30699ed2eb5672c9215a4f
+EBUILD lilo-22.8-r2.ebuild 4676 RMD160 ecc77fbc276cc2ecda9096bf45391ef05a972e9f SHA1 11b4217c77432cc47de7fe83bd2d987e2457157a SHA256 de983ed421a87c33d77779ddaeb4d510c03ed0e778b99ee2af8e3434d576fb5b
+MISC ChangeLog 10522 RMD160 84bf94f4988d2af2bceccb68a986df69cfd802d0 SHA1 e12898cff26d4112b6144e36f52155c4e694aed0 SHA256 4b8d292b7d7095f397bb58e92f53f9876534c6cf722d7ea7568d0599f0757102
MISC metadata.xml 433 RMD160 0cdcb09c81bc08f00242e29ec9c6ca3147758268 SHA1 5b95309115281152235ed831285ad364325a3962 SHA256 fd16fe2b69f46f8966c35db99dafa92456172d360a876f5244b068bd0865032d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkipnlAACgkQp5vW4rUFj5onewCgg6Lb+j1PcFrhcyInF0Fdo5/0
-B08AoIpmoRzF90RThQqZcztpFIP7Wrsg
-=rNpk
------END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
index a4d5a039ee6e..0156980c9316 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2008/08/18 16:07:39 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r2.ebuild,v 1.4 2009/04/10 16:31:20 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -22,7 +22,9 @@ LICENSE="BSD GPL-2"
KEYWORDS="-* x86 amd64"
DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( >=sys-fs/device-mapper-1.02.12 )"
+RDEPEND="device-mapper? ( || (
+ >=sys-fs/lvm2-2.02.45
+ >=sys-fs/device-mapper-1.02.12 ) )"
PROVIDE="virtual/bootloader"