Added 2 patches for compatibility

5 files changed, 84 insertions, 3 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 2f8b71a17130..90ebcfc538b4 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.6 2004/05/12 08:25:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.7 2004/05/23 18:03:57 dostrow Exp $
+
+*yaboot-1.3.12-r1 (23 May 2004)
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> yaboot-1.3.12-r1.ebuild,
+  files/yaboot-3.4.patch
+  files/yaboot-k2sata-ofpath.patch
+  Fixes compile issues with gcc-3.4 and adds support for secondary drives
+  on G5s using the builtin sata controller. I have passed the second patch
+  upstream for future release.
 
 *yaboot-1.3.12 (27 Apr 2004)
 
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 8e0f7ba64756..c3d4b4e2d74c 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,4 +1,4 @@
-MD5 1280e97f64ba86087ca22bf12c6f373f ChangeLog 4042
+MD5 9504b38e9bbda7425c5405bdb7733e63 ChangeLog 4394
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 6244b5fbfb4b54bb618abc34304cd3a3 yaboot-1.3.10-r1.ebuild 982
 MD5 69d08b738daa7870e5d4a558bdacfe51 yaboot-1.3.10-r2.ebuild 1022
@@ -6,7 +6,7 @@ MD5 b3ffab30880e6a92d941e22da3194468 yaboot-1.3.10.ebuild 979
 MD5 916bf805c76e005115c959e32c5e1a58 yaboot-1.3.11-r1.ebuild 1155
 MD5 43065aa836eadc3effccf1bcfdc89682 yaboot-1.3.11.ebuild 1096
 MD5 275a03c157b0087a8b6bfdef399a2b63 yaboot-1.3.12.ebuild 1060
-MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292
+MD5 6d9b2f905dc9e008110c268da76fe413 yaboot-1.3.12-r1.ebuild 1154
 MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10 65
 MD5 b23ffae9719feba081f90bcb62ed4928 files/digest-yaboot-1.3.10-r1 65
@@ -15,7 +15,10 @@ MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11 65
 MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
 MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12 65
 MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
+MD5 707fd650a40d63439e1417660b062d2a files/yaboot-3.4.patch 292
 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 d0f2552953da4d05dfe1cd68662a3ca2 files/yaboot-1.3.12-k2sata-ofpath.patch 1102
+MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12-r1 65
diff --git a/sys-boot/yaboot/files/digest-yaboot-1.3.12-r1 b/sys-boot/yaboot/files/digest-yaboot-1.3.12-r1
new file mode 100644
index 000000000000..e1c5454962dc
--- /dev/null
+++ b/sys-boot/yaboot/files/digest-yaboot-1.3.12-r1
@@ -0,0 +1 @@
+MD5 85cf685c1dc5873c2a5124ba4524b2d2 yaboot-1.3.12.tar.gz 274353
diff --git a/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch b/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch
new file mode 100644
index 000000000000..c9c345e3ee71
--- /dev/null
+++ b/sys-boot/yaboot/files/yaboot-1.3.12-k2sata-ofpath.patch
@@ -0,0 +1,26 @@
+--- yaboot-1.3.12.orig/ybin/ofpath	2004-05-23 17:20:56.382633120 -0400
++++ yaboot-1.3.12/ybin/ofpath	2004-05-23 17:20:26.013249968 -0400
+@@ -293,7 +293,7 @@
+ 	    ;;
+ 	mesh)
+ 	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
+-			lgrep "$i" "mesh" ; done)"
++			lg/rep "$i" "mesh" ; done)"
+ 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+ 	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
+ 	    ;;
+@@ -301,7 +301,13 @@
+ 	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
+ 			lgrep "$i" "k2-s-ata" ; done)"
+ 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+-	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk@0:$PARTITION"
++	    K2_DEVICE_ID=0
++	    while [ "$DEVICE_PATH" = "" ] ; do
++	        SCSI_HOSTNUMBER=`expr $SCSI_HOSTNUMBER - 1`
++	        let "K2_DEVICE_ID += 1"
++	        DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
++	    done
++	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk@0:$PARTITION"
+ 	    ;;
+ 	*)
+ 	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
diff --git a/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..7a16ca476d9f
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.12-r1.ebuild,v 1.1 2004/05/23 18:03:58 dostrow Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+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 -x86 -amd64 -alpha -hppa -mips -sparc ~ppc64"
+
+DEPEND="sys-apps/powerpc-utils
+	sys-fs/hfsutils
+	sys-fs/hfsplusutils"
+
+PROVIDE="virtual/bootloader"
+
+MAKEOPTS='PREFIX=/usr MANDIR=share/man'
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "${CC}" ] || CC="gcc"
+	# dual boot patch
+	epatch ${FILESDIR}/yabootconfig-${PV}.patch
+	epatch ${FILESDIR}/chrpfix.patch
+	epatch ${FILESDIR}/yaboot-3.4.patch
+	epatch ${FILESDIR}/yaboot-1.3.12-k2sata-ofpath.patch
+	emake ${MAKEOPTS} CC="${CC}" || 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} ${MAKEOPTS} install || die
+}
+