Added patch for bug #103610

Package-Manager: portage-2.0.53_rc4

5 files changed, 78 insertions, 5 deletions

diff --git a/sys-boot/yaboot-static/ChangeLog b/sys-boot/yaboot-static/ChangeLog
index 3368d40433fe..f25c2ab527ba 100644
--- a/sys-boot/yaboot-static/ChangeLog
+++ b/sys-boot/yaboot-static/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/yaboot-static
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.10 2005/08/24 09:25:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.11 2005/10/08 23:32:22 dostrow Exp $
+
+*yaboot-static-1.3.13-r1 (08 Oct 2005)
+
+  08 Oct 2005; <dostrow@gentoo.org> +files/ofpath_device-tree_check.patch,
+  +yaboot-static-1.3.13-r1.ebuild:
+  Added patch for bug #103610. Thanks to Stefan Bruda <bruda@turing.ubishops.ca>
+  for pointing out the patch.
 
   24 Aug 2005; Markus Rothe <corsair@gentoo.org> yaboot-static-1.0.ebuild,
   yaboot-static-1.3.12.ebuild, yaboot-static-1.3.13.ebuild:
diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index dc25dbb421eb..97338e446f85 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,8 +1,11 @@
-MD5 8341ff523d1c07c5805312a86102194c ChangeLog 1269
+MD5 7b6768fd612263050b5f077a17117493 ChangeLog 1531
+MD5 37bdca0041d8a34b97afd57afff34334 files/digest-yaboot-static-1.0 67
+MD5 a3338822b410fb3fee44259cef3767dd files/digest-yaboot-static-1.3.12 70
+MD5 dc95121908334203a6170991e73aa231 files/digest-yaboot-static-1.3.13 70
+MD5 dc95121908334203a6170991e73aa231 files/digest-yaboot-static-1.3.13-r1 70
+MD5 979e81b2737b320c6674ab6717e6a1f2 files/ofpath_device-tree_check.patch 827
 MD5 69ecfc38132856e44f6dc96092142c8e metadata.xml 158
 MD5 ff69443a5e2335cac36f068ec8fe318c yaboot-static-1.0.ebuild 567
 MD5 ab0ebe8d0a18b37e751d20b957b03ca4 yaboot-static-1.3.12.ebuild 750
+MD5 0804952a0c1fea43c9b28f58cdb1c008 yaboot-static-1.3.13-r1.ebuild 880
 MD5 e8e32054781ca83bdd33a87bb5d12950 yaboot-static-1.3.13.ebuild 781
-MD5 37bdca0041d8a34b97afd57afff34334 files/digest-yaboot-static-1.0 67
-MD5 a3338822b410fb3fee44259cef3767dd files/digest-yaboot-static-1.3.12 70
-MD5 dc95121908334203a6170991e73aa231 files/digest-yaboot-static-1.3.13 70
diff --git a/sys-boot/yaboot-static/files/digest-yaboot-static-1.3.13-r1 b/sys-boot/yaboot-static/files/digest-yaboot-static-1.3.13-r1
new file mode 100644
index 000000000000..441a514f8f31
--- /dev/null
+++ b/sys-boot/yaboot-static/files/digest-yaboot-static-1.3.13-r1
@@ -0,0 +1 @@
+MD5 45bde87b63528b572502579e137447a1 yaboot-static-1.3.13.tbz2 148488
diff --git a/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch b/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch
new file mode 100644
index 000000000000..e3f02cf4cc46
--- /dev/null
+++ b/sys-boot/yaboot-static/files/ofpath_device-tree_check.patch
@@ -0,0 +1,31 @@
+--- usr.orig/sbin/ofpath	2005-10-08 15:59:15.000000000 -0700
++++ usr/sbin/ofpath	2005-10-08 16:21:35.000000000 -0700
+@@ -473,14 +473,6 @@
+ {
+     case "$DEVNODE" in
+ 	sd*)
+-	    if ls -l /proc/device-tree | grep -q ^lr ; then
+-		true
+-	    else
+-		echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
+-		echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
+-		return 1
+-	    fi
+-
+ 	    ## use common scsiinfo function to get info we need.
+ 	    scsiinfo || return 1
+ 
+@@ -715,13 +707,6 @@
+ {
+     case "$DEVNODE" in
+ 	sd*)
+-	    if ls -l /proc/device-tree | grep -q ^lr ; then
+-		true
+-	    else
+-		echo 1>&2 "$PRG: /proc/device-tree is broken."
+-		return 1
+-	    fi
+-
+ 	    ## use common scsiinfo function to get info we need.
+ 	    scsiinfo || return 1
+ 
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild
new file mode 100644
index 000000000000..54cfc65985d3
--- /dev/null
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.13-r1.ebuild,v 1.1 2005/10/08 23:32:22 dostrow Exp $
+
+inherit eutils
+
+DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
+
+HOMEPAGE="http://penguinppc.org/projects/yaboot/"
+SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ppc64"
+IUSE="ibm"
+DEPEND="!sys-boot/yaboot
+		sys-apps/powerpc-utils"
+RDEPEND="!ibm? ( sys-fs/hfsutils )
+		!ibm? ( sys-fs/hfsplusutils )"
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/ofpath_device-tree_check.patch
+}
+
+src_install() {
+	# don't blow away the user's old conf file
+	mv ${WORKDIR}/etc/yaboot.conf ${WORKDIR}/etc/yaboot.conf.unconfigured
+	cp -pPR ${WORKDIR}/* ${D}/
+}
+