summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Moss <robmoss@gentoo.org>2004-09-09 17:09:37 +0000
committerRobert Moss <robmoss@gentoo.org>2004-09-09 17:09:37 +0000
commit3576e86f993c862500e4fc075a5e87e75d1def3e (patch)
tree467b815230eb56ead483866263d4f0e589fe3d56 /app-admin
parentMoving to www-client/mozilla (diff)
downloadgentoo-2-3576e86f993c862500e4fc075a5e87e75d1def3e.tar.gz
gentoo-2-3576e86f993c862500e4fc075a5e87e75d1def3e.tar.bz2
gentoo-2-3576e86f993c862500e4fc075a5e87e75d1def3e.zip
OR dependencies. Yum :-)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/grubconf/ChangeLog5
-rw-r--r--app-admin/grubconf/Manifest2
-rw-r--r--app-admin/grubconf/grubconf-0.5.1.ebuild7
3 files changed, 10 insertions, 4 deletions
diff --git a/app-admin/grubconf/ChangeLog b/app-admin/grubconf/ChangeLog
index 483a6669da4e..67345fc02fab 100644
--- a/app-admin/grubconf/ChangeLog
+++ b/app-admin/grubconf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/grubconf
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/ChangeLog,v 1.6 2004/08/22 16:46:25 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/ChangeLog,v 1.7 2004/09/09 17:09:37 robmoss Exp $
+
+ 09 Sep 2004; <rmoss@gentoo.org> grubconf-0.5.1.ebuild:
+ Updating to allow usage of grub-static as well as grub as a dependency.
22 Aug 2004; <rmoss@gentoo.org> grubconf-0.5.1.ebuild:
Fixing the splashimage issue - force enabling it as support is present in all
diff --git a/app-admin/grubconf/Manifest b/app-admin/grubconf/Manifest
index 417002023dce..3156bc3ebe21 100644
--- a/app-admin/grubconf/Manifest
+++ b/app-admin/grubconf/Manifest
@@ -1,5 +1,5 @@
MD5 b294051b307acb33deb7b562a5b18a22 grubconf-0.4.ebuild 611
-MD5 ee2c3fc54c19886d494cfe613b952ce8 grubconf-0.5.1.ebuild 765
+MD5 2ea2ed61e6d0e7a395640d23b9f205fa grubconf-0.5.1.ebuild 798
MD5 cc25126a76e9731229d5069f9fd688da grubconf-0.5.ebuild 611
MD5 5f569b238c8494ae7435fbdb01f89883 ChangeLog 996
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/app-admin/grubconf/grubconf-0.5.1.ebuild b/app-admin/grubconf/grubconf-0.5.1.ebuild
index 24b4fd60b9b0..04ef171f4043 100644
--- a/app-admin/grubconf/grubconf-0.5.1.ebuild
+++ b/app-admin/grubconf/grubconf-0.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/grubconf-0.5.1.ebuild,v 1.5 2004/08/22 16:46:25 robmoss Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/grubconf/grubconf-0.5.1.ebuild,v 1.6 2004/09/09 17:09:37 robmoss Exp $
inherit gnome2 eutils
@@ -18,7 +18,10 @@ RDEPEND=">=app-text/scrollkeeper-0.3.11
>=gnome-base/libgnomeui-2
>=gnome-base/gconf-1.2"
DEPEND="${RDEPEND}
- sys-boot/grub
+ || (
+ sys-boot/grub
+ sys-boot/grub-static
+ )
>=dev-util/pkgconfig-0.12.0"
src_unpack() {