mkboot fix

5 files changed, 13 insertions, 8 deletions

diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 5f8690981102..8691b0a1609d 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/debianutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.32 2003/12/10 03:06:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.33 2003/12/10 21:18:04 seemant Exp $
+
+*debianutils-1.16.7-r4 (10 Dec 2003)
+
+  10 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  debianutils-1.16.7-r3.ebuild, debianutils-1.16.7-r4.ebuild,
+  files/debianutils-1.16.7-gentoo.patch:
+  mkboot queries portage for sys-boot/grub instead of sys-apps/grub, thanks to
+  max@gentoo.org in #gentoo-dev
 
   09 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
   debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild:
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 7c6c711d718a..36bfe6acd23d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,5 +1,5 @@
-MD5 f60f63bae9ddb138fe28e04231d46bd3 debianutils-1.16.7-r4.ebuild 1423
-MD5 6044a5265c6e1d301cee7a526bd0e25b ChangeLog 5466
+MD5 b8305ebf87394d4667d563eb9a5b7f5f debianutils-1.16.7-r4.ebuild 1422
+MD5 4509bb315fdacd108ac6574cc9b23856 ChangeLog 5771
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 f668f7cf3760bd5f131cec5de5602523 files/digest-debianutils-1.16.7-r4 69
 MD5 1843cf4b665254b749f1612bf12f2c0d files/debianutils-1.16.7-gentoo.patch 7326
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
index a241eb3beeae..0a9d5710eabb 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild,v 1.14 2003/12/10 03:06:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.1 2003/12/10 21:18:04 seemant Exp $
 
 IUSE="static build"
 
diff --git a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
index e690dc546f4a..02502e9f633d 100644
--- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
+++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
@@ -10,7 +10,6 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel
       = "$1-$ver" ] ; then
        ln -sf "$1-$ver.old" "$dir/$1.old"
      else
-diff -urN debianutils-1.16.7.old/mkboot debianutils-1.16.7/mkboot
 --- debianutils-1.16.7.old/mkboot	2002-10-16 20:20:42.000000000 -0700
 +++ debianutils-1.16.7/mkboot	2003-04-03 16:16:55.000000000 -0800
 @@ -14,7 +14,13 @@
@@ -21,7 +20,7 @@ diff -urN debianutils-1.16.7.old/mkboot debianutils-1.16.7/mkboot
 +    # Right way in Gentoo to check, but grub is in system profile,
 +    # so rather check for lilo first....
 +    if [ -x /usr/bin/portageq ] ; then
-+        portageq has_version / "sys-apps/grub" && return 0 || return 1
++        portageq has_version / "sys-boot/grub" && return 0 || return 1
 +    else
 +        return 1
 +    fi
@@ -71,7 +70,6 @@ diff -urN debianutils-1.16.7.old/mkboot debianutils-1.16.7/mkboot
      echo -en "\nShould I make a bootdisk? (y/n) "
      read input
      if [ "$input" = "y" ] ; then
-diff -urN debianutils-1.16.7.old/mkboot~ debianutils-1.16.7/mkboot~
 --- debianutils-1.16.7.old/mkboot~	1969-12-31 16:00:00.000000000 -0800
 +++ debianutils-1.16.7/mkboot~	2002-10-16 20:20:42.000000000 -0700
 @@ -0,0 +1,177 @@
@@ -252,7 +250,6 @@ diff -urN debianutils-1.16.7.old/mkboot~ debianutils-1.16.7/mkboot~
 +fi
 +
 +makedisk $1
-diff -urN debianutils-1.16.7.old/run-parts.c debianutils-1.16.7/run-parts.c
 --- debianutils-1.16.7.old/run-parts.c	2002-10-16 21:19:37.000000000 -0700
 +++ debianutils-1.16.7/run-parts.c	2003-04-03 16:17:20.000000000 -0800
 @@ -120,7 +120,8 @@
diff --git a/sys-apps/debianutils/files/digest-debianutils-1.16.7-r3 b/sys-apps/debianutils/files/digest-debianutils-1.16.7-r4
index 43e9c44d417a..43e9c44d417a 100644
--- a/sys-apps/debianutils/files/digest-debianutils-1.16.7-r3
+++ b/sys-apps/debianutils/files/digest-debianutils-1.16.7-r4