mkboot: fix the shebang, the notice about the -i option and the palo test/run

(Portage version: 2.1_pre7-r5)

6 files changed, 114 insertions, 14 deletions

diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog
index 384db8adcf9e..2c10d899b089 100644
--- a/sys-apps/debianutils/ChangeLog
+++ b/sys-apps/debianutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/debianutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.57 2006/04/02 16:36:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.58 2006/04/15 18:55:43 jer Exp $
+
+*debianutils-2.15-r1 (15 Apr 2006)
+
+  15 Apr 2006; Jeroen Roovers <jer@gentoo.org>
+  +files/debianutils-2.15-palo.patch, +debianutils-2.15-r1.ebuild:
+  mkboot: fix the shebang, the notice about the -i option and the palo test/run
 
   02 Apr 2006; Bryan Østergaard <kloeri@gentoo.org debianutils-2.15.ebuild:
   Stable on alpha, bug 127975.
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index c7354bc00be6..db5f5c5bd518 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4d93d1c110776fb319473d337099d705 ChangeLog 8843
 RMD160 983d5366c8ff4f332790cd1948d61f8e32cb8069 ChangeLog 8843
 SHA256 38f799ca62517f0f5053ddb72cbb115c7433af18e3877ba29793165bc111a4f2 ChangeLog 8843
@@ -10,28 +7,30 @@ SHA256 7aa60bdcd764e263191fc0a980034711109f0cf055a16dc62de1e9eea627e6bc debianut
 MD5 dde4623a7e4629ff3ae7a5c872e7acdf debianutils-2.14.1-r1.ebuild 1129
 RMD160 19cfbf6c147f0129c027cb5eee43e92e618ea2c6 debianutils-2.14.1-r1.ebuild 1129
 SHA256 5223d1d575184878a914e6b93dbb7fccd5f44f16db4eea35f19452c57d8c410a debianutils-2.14.1-r1.ebuild 1129
+MD5 b3359c3fa4fa4f91f1f33de1ae9d0dd4 debianutils-2.15-r1.ebuild 1189
+RMD160 ba7b7af94b9fd0907e8cef0a67140f489973e25d debianutils-2.15-r1.ebuild 1189
+SHA256 5d9fdf9b813ae0f6ec4d6bfb196487f42f645060e6ef9c5a3279ba1178fb95ef debianutils-2.15-r1.ebuild 1189
 MD5 c256bb3241a1a34e9030b0ffde676f11 debianutils-2.15.ebuild 1133
 RMD160 b1f9809be845ffb0e14fdabe0ddcaefcf7de1cae debianutils-2.15.ebuild 1133
 SHA256 770e5c75971ef568d36f80731d0f54b29ca76ba370dc1dfa38dbbe0db73fc737 debianutils-2.15.ebuild 1133
 MD5 c2a83b7cc35cd0a76df37cf57c8f6563 files/debianutils-2.14.1-no-bs-namespace.patch 1412
 RMD160 20226c9f11a6e3708c39c426f46391c5e828c1b9 files/debianutils-2.14.1-no-bs-namespace.patch 1412
 SHA256 1cac8819abad2ae16568461ccddfd27e98e2adc3103a61d647358f05ef6eb365 files/debianutils-2.14.1-no-bs-namespace.patch 1412
+MD5 ae87a5fea54d5a0eee0b4316f36070cc files/debianutils-2.15-palo.patch 1262
+RMD160 190487507a2b8b9001f880b6f985799ac7a20ade files/debianutils-2.15-palo.patch 1262
+SHA256 93f128143c75e9fe3a9d1c505fd23a974b8886cb9a8c4ffba187c3f040636e98 files/debianutils-2.15-palo.patch 1262
 MD5 930d33ac394a1a72aa0023368f998b2d files/digest-debianutils-2.13.1-r1 70
 RMD160 3f013b0c28742072ad752d20cca094cdeea43286 files/digest-debianutils-2.13.1-r1 70
 SHA256 29bf85eaf812546ab6f04b97575389478739bcc3398618e5e0869fa8cd29ea77 files/digest-debianutils-2.13.1-r1 70
 MD5 1139a531f41ec299352621154a9f8cca files/digest-debianutils-2.14.1-r1 70
 RMD160 8b62e025f92b2161f9c9ba6b593fdca43fc30ce4 files/digest-debianutils-2.14.1-r1 70
 SHA256 e9c296abd7e386ded37670a0afc88a2bf8958ffb5104bf66d4676fe15250144d files/digest-debianutils-2.14.1-r1 70
-MD5 2003427638987c496d640728278cf18a files/digest-debianutils-2.15 68
-RMD160 ecfb70426dc69ef4667c2e27009d65a1cca49fe7 files/digest-debianutils-2.15 68
-SHA256 9624aced5c2caaecc6c2464bae76136d844ed5f0e2cb8f59e705b3c19de8d0ec files/digest-debianutils-2.15 68
+MD5 d30e26a9ea91d5454308017a7bbcc684 files/digest-debianutils-2.15 250
+RMD160 7cb6e56ae3e64d9f32d470b64132364b736fb6c6 files/digest-debianutils-2.15 250
+SHA256 91a2e89dbc7288812733d6c0b9f6c0eecd70a387dd84ea5a4f495246d26cbfa9 files/digest-debianutils-2.15 250
+MD5 d30e26a9ea91d5454308017a7bbcc684 files/digest-debianutils-2.15-r1 250
+RMD160 7cb6e56ae3e64d9f32d470b64132364b736fb6c6 files/digest-debianutils-2.15-r1 250
+SHA256 91a2e89dbc7288812733d6c0b9f6c0eecd70a387dd84ea5a4f495246d26cbfa9 files/digest-debianutils-2.15-r1 250
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEL/2sugEuf3OQ0akRAnvOAJ9s6aIy7TjfezRuIR0ztiy+480s9gCeIUj1
-5YnYaAZgayeNz308DrMWTv4=
-=gdc1
------END PGP SIGNATURE-----
diff --git a/sys-apps/debianutils/debianutils-2.15-r1.ebuild b/sys-apps/debianutils/debianutils-2.15-r1.ebuild
new file mode 100644
index 000000000000..74cbce8a4415
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-2.15-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-2.15-r1.ebuild,v 1.1 2006/04/15 18:55:43 jer Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="http://packages.debian.org/unstable/utils/debianutils"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static build"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.14.1-no-bs-namespace.patch
+	epatch "${FILESDIR}"/${PN}-2.15-palo.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	emake || die
+}
+
+src_install() {
+	into /
+	dobin tempfile mktemp || die
+
+	if ! use build ; then
+		dobin run-parts || die "run-parts failed"
+		dosbin installkernel || die "installkernel failed"
+
+		into /usr
+		dosbin savelog mkboot || die "savelog/mkboot failed"
+
+		doman mktemp.1 tempfile.1 run-parts.8 savelog.8 \
+			installkernel.8 mkboot.8
+		cd debian
+		dodoc changelog control
+	fi
+}
diff --git a/sys-apps/debianutils/files/debianutils-2.15-palo.patch b/sys-apps/debianutils/files/debianutils-2.15-palo.patch
new file mode 100644
index 000000000000..969daf0eb371
--- /dev/null
+++ b/sys-apps/debianutils/files/debianutils-2.15-palo.patch
@@ -0,0 +1,43 @@
+--- mkboot.	2006-04-02 19:17:59.000000000 +0200
++++ mkboot	2006-04-15 20:41:00.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # mkboot: make the system bootable
+ # Debian GNU/Linux
+ # Copyright 1996-1997 Guy Maor <maor@debian.org>
+@@ -85,7 +85,7 @@
+ # check whether PALO is installed
+ palocheck() {
+     printf "\nChecking for PALO..."
+-    if [ -f /etc/palo.conf ] && [ -x /sbin/palo ]; then
++    if [ -f /etc/palo.conf ] && which palo > /dev/null; then
+        echo "Yes"
+        return 0
+     fi
+@@ -380,9 +380,13 @@
+     fi
+ 
+     if palocheck; then
+-        printf "\nPALO is installed. To automatically switch to new kernels, point your\n"
+-        echo "default entry in palo.conf to $1"
+-        exit 0
++        palo="$(which palo)"
++        printf "\nShould I run $palo? (y/N) "
++	read input
++	if [ "$input" = "y" ] ; then
++	    palo && exit 0
++	fi
++	echo "There was a problem running $palo."
+     fi
+ 
+     printf "\nShould I make a bootdisk? (y/N) "
+@@ -392,7 +396,7 @@
+     fi
+ 
+     printf "\nWARNING: Your system is probably unbootable now.  After correcting any\n"
+-    echo "problems, rerun this script with the command \`mkboot -installkernel'."
++    echo "problems, rerun this script with the command \`mkboot -i'."
+     exit 1
+ fi
+ 
diff --git a/sys-apps/debianutils/files/digest-debianutils-2.15 b/sys-apps/debianutils/files/digest-debianutils-2.15
index af6dc15dfe84..ff6938abf59a 100644
--- a/sys-apps/debianutils/files/digest-debianutils-2.15
+++ b/sys-apps/debianutils/files/digest-debianutils-2.15
@@ -1 +1,3 @@
 MD5 cf312e8791c13297ef345e4e868b7ddc debianutils_2.15.tar.gz 186036
+RMD160 d92e8f7eccdf365063e0ac6cd9312bb8fe1203ba debianutils_2.15.tar.gz 186036
+SHA256 3977562546280605882ccd5c7e82083f100c368352d2db834fb782b8432ff227 debianutils_2.15.tar.gz 186036
diff --git a/sys-apps/debianutils/files/digest-debianutils-2.15-r1 b/sys-apps/debianutils/files/digest-debianutils-2.15-r1
new file mode 100644
index 000000000000..ff6938abf59a
--- /dev/null
+++ b/sys-apps/debianutils/files/digest-debianutils-2.15-r1
@@ -0,0 +1,3 @@
+MD5 cf312e8791c13297ef345e4e868b7ddc debianutils_2.15.tar.gz 186036
+RMD160 d92e8f7eccdf365063e0ac6cd9312bb8fe1203ba debianutils_2.15.tar.gz 186036
+SHA256 3977562546280605882ccd5c7e82083f100c368352d2db834fb782b8432ff227 debianutils_2.15.tar.gz 186036