New version - copyright message updated

7 files changed, 137 insertions, 16 deletions

diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index c159b0cf7c2a..553548f0ce36 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,17 +1,19 @@
+MD5 d8fb3961b147cd8a0c7a52d5a810a7a4 ChangeLog 4015
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+MD5 4c8d5ac00a1131330a8d2492d50793ee yaboot-1.3.10-r1.ebuild 982
+MD5 5cc966a93b5487bb79c5fa007fd7a60a yaboot-1.3.10-r2.ebuild 1022
+MD5 0a29994f14bd4538c04d17eb2efb1009 yaboot-1.3.10.ebuild 979
+MD5 916bf805c76e005115c959e32c5e1a58 yaboot-1.3.11-r1.ebuild 1155
+MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.11.ebuild 1056
+MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.12.ebuild 1056
+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
 MD5 cdcf832620e73598eb112a6000509afd files/digest-yaboot-1.3.10-r2 270
 MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11 65
+MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
+MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
 MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.10.patch 1987
 MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
-MD5 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
-MD5 79f1707ceab2b7d7daa98a62e15ca98c files/digest-yaboot-1.3.11-r1 65
-MD5 e51befd96c8aaa36f151790fad733456 files/yaboot-1.3.11-ofpath-fix.patch 1974
-MD5 d8fb3961b147cd8a0c7a52d5a810a7a4 ChangeLog 4015
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
-MD5 4c8d5ac00a1131330a8d2492d50793ee yaboot-1.3.10-r1.ebuild 982
-MD5 5cc966a93b5487bb79c5fa007fd7a60a yaboot-1.3.10-r2.ebuild 1022
-MD5 0a29994f14bd4538c04d17eb2efb1009 yaboot-1.3.10.ebuild 979
-MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.11.ebuild 1056
-MD5 916bf805c76e005115c959e32c5e1a58 yaboot-1.3.11-r1.ebuild 1155
+MD5 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12 65
diff --git a/sys-boot/yaboot/files/digest-yaboot-1.3.12 b/sys-boot/yaboot/files/digest-yaboot-1.3.12
new file mode 100644
index 000000000000..e1c5454962dc
--- /dev/null
+++ b/sys-boot/yaboot/files/digest-yaboot-1.3.12
@@ -0,0 +1 @@
+MD5 85cf685c1dc5873c2a5124ba4524b2d2 yaboot-1.3.12.tar.gz 274353
diff --git a/sys-boot/yaboot/files/yabootconfig-1.3.12.patch b/sys-boot/yaboot/files/yabootconfig-1.3.12.patch
new file mode 100644
index 000000000000..a6824f524517
--- /dev/null
+++ b/sys-boot/yaboot/files/yabootconfig-1.3.12.patch
@@ -0,0 +1,78 @@
+--- ybin/yabootconfig.orig	2003-02-08 23:53:46.000000000 -0500
++++ ybin/yabootconfig	2003-02-26 15:07:50.000000000 -0500
+@@ -4,6 +4,7 @@
+ ##
+ ## yabootconfig generates a simple /etc/yaboot.conf
+ ## Copyright (C) 2001, 2002, 2003 Ethan Benson
++## Patched for Gentoo and dual boot - Mark Guertin <gerk@gentoo.org>
+ ##
+ ## This program is free software; you can redistribute it and/or
+ ## modify it under the terms of the GNU General Public License
+@@ -264,6 +265,31 @@
+     return 0
+ }
+ 
++dualboot()
++{
++	DRIVELIST=`ls -d /dev/?d?* | grep "[sh]d[abcdefghijkl]" | cut -b 6-8 | sort -u`
++
++	for i in $DRIVELIST
++	do
++		HFS=`mac-fdisk -l "/dev/$i" | grep '\<Apple_HFS\>' | grep -v "CDROM" | cut -d" " -f1`
++		for h in $HFS
++		do
++			if [ !-x `hpmount -r $h` > /dev/null 2>&1 ] ; then
++				if [ `hpls mach_kernel 2>/dev/null` ] ; then
++					[ "$QUIET" = 0 ] && echo "Found possible OS X/Darwin partition at $h"
++					OSX=$h
++				fi
++				if [ "`hpls "System Folder" 2>/dev/null`" ] ; then
++					[ "$QUIET" = 0 ] && echo "Found possible Mac OS partition at $h"
++					MACOS=$h
++				fi		
++				hpumount $h > /dev/null 2>&1
++			fi
++		done
++	done
++}
++
++
+ ##########
+ ## Main ##
+ ##########
+@@ -579,6 +605,15 @@
+     fi
+ fi
+ 
++## setup any Mac OS/OS X partitions
++dualboot
++if [ -n "$MACOS" ] ; then
++	MACOSBOOT="macos=${MACOS}\n"
++fi
++if [ -n "$OSX" ] ; then
++	OSXBOOT="macosx=${OSX}\n"
++fi
++
+ ## generate global section of yaboot.conf
+ GLOBAL="## yaboot.conf generated by $PRG $VERSION
+ ##
+@@ -596,7 +631,7 @@
+ IMAGES="
+ image=$IMAGE
+ \tlabel=Linux
+-\tread-only\n${APPEND:-}"
++\tread-only\n${APPEND:-}\n${OSXBOOT:-}\n${MACOSBOOT:-}"
+ 
+ ## safely create a tmp file then move it into place after we are sure
+ ## it was written.
+@@ -667,4 +702,10 @@
+     fi
+ fi
+ 
++## Give user a warning about possible b0rkage
++
++[ "$QUIET" = 0 ] && echo -e "\nConfiguration complete.  If there are no errors above you should
++have a working configuration.  see man yaboot.conf if you run into
++any errors."
++
+ exit 0
diff --git a/sys-boot/yaboot/yaboot-1.3.10-r1.ebuild b/sys-boot/yaboot/yaboot-1.3.10-r1.ebuild
index 5a5b9e6bb1b5..dc56a2ef60b2 100644
--- a/sys-boot/yaboot/yaboot-1.3.10-r1.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.10-r1.ebuild,v 1.2 2004/02/23 00:34:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.10-r1.ebuild,v 1.3 2004/04/27 12:05:08 pvdabeel Exp $
 
 inherit eutils
 
diff --git a/sys-boot/yaboot/yaboot-1.3.10-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.10-r2.ebuild
index 158dd46b2c24..9b18edc98baf 100644
--- a/sys-boot/yaboot/yaboot-1.3.10-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.10-r2.ebuild,v 1.2 2004/02/23 00:34:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.10-r2.ebuild,v 1.3 2004/04/27 12:05:08 pvdabeel Exp $
 
 inherit eutils
 
diff --git a/sys-boot/yaboot/yaboot-1.3.10.ebuild b/sys-boot/yaboot/yaboot-1.3.10.ebuild
index 1c1114c75632..33695730106f 100644
--- a/sys-boot/yaboot/yaboot-1.3.10.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.10.ebuild,v 1.2 2004/02/23 00:34:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.10.ebuild,v 1.3 2004/04/27 12:05:08 pvdabeel Exp $
 
 inherit eutils
 
diff --git a/sys-boot/yaboot/yaboot-1.3.12.ebuild b/sys-boot/yaboot/yaboot-1.3.12.ebuild
new file mode 100644
index 000000000000..0945b196457d
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.12.ebuild
@@ -0,0 +1,40 @@
+# 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.ebuild,v 1.1 2004/04/27 12:05:08 pvdabeel 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
+	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
+}
+