Added patch for bug #103610

Package-Manager: portage-2.0.53_rc4

6 files changed, 105 insertions, 16 deletions

diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index 97338e446f85..cafb175a9461 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,4 +1,4 @@
-MD5 7b6768fd612263050b5f077a17117493 ChangeLog 1531
+MD5 b9eb7bf983bded2415aaebbba4c80445 ChangeLog 1545
 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/ChangeLog b/sys-boot/yaboot/ChangeLog
index 724a804b806a..fec61d37a87e 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.19 2005/07/12 00:55:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.20 2005/10/09 00:41:36 dostrow Exp $
+
+*yaboot-1.3.13-r1 (09 Oct 2005)
+
+  09 Oct 2005; Daniel Ostrow <dostrow@gentoo.org> +files/yaboot-ofpath-device-tree.patch,
+  +yaboot-1.3.13-r1.ebuild:
+  Added patch for bug #103610. Thanks to Stefan Bruda <bruda@turing.ubishops.ca>
+  for pointing out the patch.
 
   12 Jul 2005; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.11-r1.ebuild,
   yaboot-1.3.12-r1.ebuild, yaboot-1.3.13.ebuild:
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 0f7860127c91..14bb5d348f86 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,19 +1,22 @@
-MD5 dd22fc34466940a2063af292e6e7efa1 ChangeLog 6377
-MD5 26fab11fcffe9efa9c34ab0118369c29 yaboot-1.3.13.ebuild 1404
-MD5 02e04abd101bf97d1824b54f89f57559 yaboot-1.3.11-r1.ebuild 1120
-MD5 9c2a69b11bc766ffdc32016e0bb1e967 metadata.xml 219
-MD5 bb8c0a6b8793792cbaab2f0a9a7b8ddb yaboot-1.3.12-r1.ebuild 1339
+MD5 6e11a4be43913a0b8a93f1acb11d9952 ChangeLog 6641
+MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
+MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
 MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12-r1 65
-MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
 MD5 7ec6d127710031625482bca6563021eb files/digest-yaboot-1.3.13 65
-MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
-MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
-MD5 de48fb3a5eb3326145096a19c6b07a6a files/yaboot-1.3.13-ofpath.patch 2921
+MD5 7ec6d127710031625482bca6563021eb files/digest-yaboot-1.3.13-r1 65
+MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
 MD5 627830060775688b9e45e1b1a6dd4cfe files/yaboot-1.3.12-k2sata-ofpath.patch 792
-MD5 116ac118087f29161456b653a8429522 files/yabootconfig-1.3.13.patch 1655
+MD5 de48fb3a5eb3326145096a19c6b07a6a files/yaboot-1.3.13-ofpath.patch 2921
+MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292
+MD5 ea6db5f8d6326bf51dfe4f085513e210 files/yaboot-nopiessp.patch 1884
+MD5 09dcc7eec83bc5d7fb9f6952815a03bd files/yaboot-ofpath-device-tree.patch 847
+MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.patch 1987
-MD5 ea6db5f8d6326bf51dfe4f085513e210 files/yaboot-nopiessp.patch 1884
-MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
-MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292
-MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
+MD5 116ac118087f29161456b653a8429522 files/yabootconfig-1.3.13.patch 1655
+MD5 9c2a69b11bc766ffdc32016e0bb1e967 metadata.xml 219
+MD5 02e04abd101bf97d1824b54f89f57559 yaboot-1.3.11-r1.ebuild 1120
+MD5 bb8c0a6b8793792cbaab2f0a9a7b8ddb yaboot-1.3.12-r1.ebuild 1339
+MD5 5e9f6eed2cf61242866b51e8786a6af4 yaboot-1.3.13-r1.ebuild 1460
+MD5 26fab11fcffe9efa9c34ab0118369c29 yaboot-1.3.13.ebuild 1404
diff --git a/sys-boot/yaboot/files/digest-yaboot-1.3.13-r1 b/sys-boot/yaboot/files/digest-yaboot-1.3.13-r1
new file mode 100644
index 000000000000..05cbce5d22c0
--- /dev/null
+++ b/sys-boot/yaboot/files/digest-yaboot-1.3.13-r1
@@ -0,0 +1 @@
+MD5 f12798d1b2063f21d07e0ae7f602ccaf yaboot-1.3.13.tar.gz 275886
diff --git a/sys-boot/yaboot/files/yaboot-ofpath-device-tree.patch b/sys-boot/yaboot/files/yaboot-ofpath-device-tree.patch
new file mode 100644
index 000000000000..042221965d37
--- /dev/null
+++ b/sys-boot/yaboot/files/yaboot-ofpath-device-tree.patch
@@ -0,0 +1,31 @@
+--- yaboot-1.3.13.orig/ybin/ofpath	2005-10-08 20:16:46.000000000 -0400
++++ yaboot-1.3.13/ybin/ofpath	2005-10-08 20:17:59.000000000 -0400
+@@ -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/yaboot-1.3.13-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.13-r1.ebuild
new file mode 100644
index 000000000000..d812f8853fbb
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.13-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.13-r1.ebuild,v 1.1 2005/10/09 00:41:36 dostrow Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PPC Bootloader"
+SRC_URI="http://penguinppc.org/projects/yaboot/${P}.tar.gz"
+HOMEPAGE="http://penguinppc.org/projects/yaboot/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ppc -ppc64"
+IUSE="ibm"
+
+DEPEND="sys-apps/powerpc-utils"
+RDEPEND="!ibm? ( sys-fs/hfsutils )
+		!ibm? ( sys-fs/hfsplusutils )"
+
+PROVIDE="virtual/bootloader"
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "$(tc-getCC)" ] || CC="gcc"
+	# dual boot patch
+	epatch ${FILESDIR}/yabootconfig-${PV}.patch
+	epatch ${FILESDIR}/chrpfix.patch
+	epatch ${FILESDIR}/yaboot-3.4.patch
+	epatch ${FILESDIR}/yaboot-${PV}-ofpath.patch
+	epatch ${FILESDIR}/yaboot-nopiessp.patch
+	epatch ${FILESDIR}/yaboot-ofpath-device-tree.patch
+	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	cp etc/yaboot.conf etc/yaboot.conf.bak
+	sed -e 's/\/local//' etc/yaboot.conf >| etc/yaboot.conf.edit
+	mv -f etc/yaboot.conf.edit etc/yaboot.conf
+	make ROOT=${D} PREFIX=/usr MANDIR=share/man install || die
+}
+
+pkg_postinst() {
+	ewarn "Please note if you are running a 2.6 kernel the verison"
+	ewarn "of ofpath included in this revision of yaboot requires"
+	ewarn "that you run a kernel >= 2.6.3, prior versions are unsupported."
+}