summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-09-25 02:46:08 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-09-25 02:46:08 +0000
commit572e79882952d5233c6a502537c6ce5d5ebb3ebf (patch)
tree2e57ce367b68c5f16c9d32a49e5f0eaad7e59523 /sys-apps/debianutils
parentOnly reinstall missing script if not bootstrapping (diff)
downloadgentoo-2-572e79882952d5233c6a502537c6ce5d5ebb3ebf.tar.gz
gentoo-2-572e79882952d5233c6a502537c6ce5d5ebb3ebf.tar.bz2
gentoo-2-572e79882952d5233c6a502537c6ce5d5ebb3ebf.zip
Fix bug #25216, mark stable
Diffstat (limited to 'sys-apps/debianutils')
-rw-r--r--sys-apps/debianutils/ChangeLog7
-rw-r--r--sys-apps/debianutils/Manifest8
-rw-r--r--sys-apps/debianutils/debianutils-1.16.7-r3.ebuild6
-rw-r--r--sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch4
4 files changed, 15 insertions, 10 deletions
diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index ef9a6d85acfe..a23f9c6c6f90 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,11 @@
# 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.29 2003/09/19 19:48:57 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.30 2003/09/25 02:45:59 azarah Exp $
+
+ 25 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
+ debianutils-1.16.7-r3.ebuild, files/debianutils-1.16.7-gentoo.patch:
+ Fix bug #25216 (use portageq and not qpkg to check if grub is installed), mark
+ stable as otherwise its been working fine for a long time.
19 Sep 2003; Christian Birchinger <joker@gentoo.org>
debianutils-1.16.7-r3.ebuild:
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index b1e63eb11ca4..841296ff9fc2 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,8 @@
-MD5 85299c15f7a258f9399132b0c5fc50b1 ChangeLog 4866
MD5 87887aba6c686a198c4c7b41a8dd3731 debianutils-1.16.7-r2.ebuild 1428
-MD5 0afd8b3ab02ee0f96c5cf75c6731bb4e debianutils-1.16.7-r3.ebuild 1435
-MD5 a497960da56a8ef8cb07158e15407c18 files/debianutils-1.16.7-gcc33.patch 2588
-MD5 e814d4dcbe42ad46f0fa3449b653c173 files/debianutils-1.16.7-gentoo.patch 7521
+MD5 f503ffc75624e6938d7f901c4dee49d7 ChangeLog 5133
+MD5 0fe4c6729632570f4822de2063c5b671 debianutils-1.16.7-r3.ebuild 1433
MD5 3f67e66ea1d7aa13843f253310322f51 files/debianutils-compress.patch 743
+MD5 a497960da56a8ef8cb07158e15407c18 files/debianutils-1.16.7-gcc33.patch 2588
+MD5 e41515bbbed52bb2d011abf4fe11cb1a files/debianutils-1.16.7-gentoo.patch 7536
MD5 f668f7cf3760bd5f131cec5de5602523 files/digest-debianutils-1.16.7-r3 69
MD5 f668f7cf3760bd5f131cec5de5602523 files/digest-debianutils-1.16.7-r2 69
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild
index 70ad27177a8b..3d5d445a591a 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild
@@ -1,17 +1,17 @@
# 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.9 2003/09/19 19:48:57 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r3.ebuild,v 1.10 2003/09/25 02:45:59 azarah Exp $
IUSE="static build"
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
DESCRIPTION="A selection of tools from Debian"
HOMEPAGE="http://packages.debian.org/unstable/base/debianutils.html"
SRC_URI="mirror://gentoo/${PN}_${PV}.tar.gz"
SLOT="0"
LICENSE="GPL-2 BSD"
-KEYWORDS="x86 ~amd64 ~ppc sparc ~alpha ~mips ~hppa ~arm ia64"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64"
DEPEND="virtual/glibc"
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 5947a7907fec..e690dc546f4a 100644
--- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
+++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
@@ -20,8 +20,8 @@ diff -urN debianutils-1.16.7.old/mkboot debianutils-1.16.7/mkboot
- [ $(dpkg -s grub | grep -i ^status: | cut -d ' ' -f 4) = "installed" ]
+ # Right way in Gentoo to check, but grub is in system profile,
+ # so rather check for lilo first....
-+ if [ -x /usr/bin/qpkg ] ; then
-+ [ "$(qpkg -nc sys-apps/grub)" = "sys-apps/grub *" ]
++ if [ -x /usr/bin/portageq ] ; then
++ portageq has_version / "sys-apps/grub" && return 0 || return 1
+ else
+ return 1
+ fi