Version bump.

Package-Manager: portage-2.1.10.46/cvs/Linux x86_64

3 files changed, 100 insertions, 2 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index e986fc7daca0..8c1f839f9b86 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/yaboot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.37 2011/05/22 07:48:57 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.38 2012/02/24 15:15:33 josejx Exp $
+
+*yaboot-1.3.17 (24 Feb 2012)
+
+  24 Feb 2012; Joseph Jezak <josejx@gentoo.org> +yaboot-1.3.17.ebuild,
+  +files/yaboot-1.3.17-nopiessp-gcc4.patch:
+  Version bump.
 
   22 May 2011; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.16.ebuild,
   +files/yaboot-1.3.16-memalign.patch:
diff --git a/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
new file mode 100644
index 000000000000..8e060e54c2e8
--- /dev/null
+++ b/sys-boot/yaboot/files/yaboot-1.3.17-nopiessp-gcc4.patch
@@ -0,0 +1,42 @@
+diff -Nrup yaboot-1.3.13.orig/Config.gentoo yaboot-1.3.13/Config.gentoo
+--- yaboot-1.3.13.orig/Config.gentoo	1970-01-01 00:00:00.000000000 +0000
++++ yaboot-1.3.13/Config.gentoo	2005-06-12 00:41:14.889576152 +0000
+@@ -0,0 +1,6 @@
++check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
++	then echo "$(1)"; else echo "$(2)"; fi)
++
++CFLAGS     += $(call check_gcc, -fno-stack-protector)
++CFLAGS     += $(call check_gcc, --nopie)
++
+diff -Nrup yaboot-1.3.13.orig/Makefile yaboot-1.3.13/Makefile
+--- yaboot-1.3.13.orig/Makefile	2004-07-11 20:12:03.000000000 +0000
++++ yaboot-1.3.13/Makefile	2005-06-12 00:41:14.890576000 +0000
+@@ -1,6 +1,7 @@
+ ## Setup
+ 
+ include Config
++include Config.gentoo
+ 
+ VERSION = 1.3.13
+ # Debug mode (spam/verbose)
+@@ -79,7 +80,7 @@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr/
+ 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
+	second/iso_util.o \
+	lib/nonstd.o \
+-	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
++	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o lib/ssp.o
+ 
+ ifeq ($(USE_MD5_PASSWORDS),y)
+ OBJS += second/md5.o
+diff -Naur yaboot-1.3.14.orig/lib/ssp.c yaboot-1.3.14/lib/ssp.c
+--- yaboot-1.3.14.orig/lib/ssp.c	1970-01-01 00:00:00.000000000 +0000
++++ yaboot-1.3.14/lib/ssp.c	2010-06-20 18:50:57.000000000 +0000
+@@ -0,0 +1,7 @@
++extern void __stack_chk_fail_local (void) ;
++
++void
++__stack_chk_fail_local (void)
++{
++  return;
++}
+
diff --git a/sys-boot/yaboot/yaboot-1.3.17.ebuild b/sys-boot/yaboot/yaboot-1.3.17.ebuild
new file mode 100644
index 000000000000..1fac8bba0e1b
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.17.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17.ebuild,v 1.1 2012/02/24 15:15:33 josejx Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PPC Bootloader"
+SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
+HOMEPAGE="http://yaboot.ozlabs.org"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~ppc -ppc64"
+IUSE="ibm"
+
+DEPEND="sys-apps/powerpc-utils"
+RDEPEND="!ibm? ( sys-fs/hfsutils
+				 sys-fs/hfsplusutils
+				 sys-fs/mac-fdisk )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath"
+
+	# dual boot patch
+	epatch "${FILESDIR}/yabootconfig-1.3.13.patch"
+	epatch "${FILESDIR}/chrpfix.patch"
+	if [[ "$(gcc-major-version)" -eq "3" ]]; then
+		epatch "${FILESDIR}/${PN}-nopiessp.patch"
+	fi
+	if [[ "$(gcc-major-version)" -eq "4" ]]; then
+		epatch "${FILESDIR}/${P}-nopiessp-gcc4.patch"
+	fi
+
+	# Error only on real errors, for prom printing format compile failure
+	sed -i "s:-Werror:-Wno-error:g" Makefile
+}
+
+src_compile() {
+	export -n CFLAGS
+	export -n CXXFLAGS
+	[ -n "$(tc-getCC)" ] || CC="gcc"
+	emake PREFIX=/usr MANDIR=share/man CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	sed -i -e 's/\/local//' etc/yaboot.conf
+	make ROOT="${D}" PREFIX=/usr MANDIR=share/man install || die
+	mv "${D}/etc/yaboot.conf" "${D}/etc/yaboot.conf.sample"
+}