summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/yaboot/Manifest21
-rw-r--r--sys-boot/yaboot/files/yaboot-3.4.patch13
-rw-r--r--sys-boot/yaboot/yaboot-1.3.11.ebuild3
3 files changed, 26 insertions, 11 deletions
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index b9bfcb1c5781..8e0f7ba64756 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,20 +1,21 @@
-MD5 6244b5fbfb4b54bb618abc34304cd3a3 yaboot-1.3.10-r1.ebuild 982
-MD5 b3ffab30880e6a92d941e22da3194468 yaboot-1.3.10.ebuild 979
-MD5 275a03c157b0087a8b6bfdef399a2b63 yaboot-1.3.12.ebuild 1060
-MD5 69d08b738daa7870e5d4a558bdacfe51 yaboot-1.3.10-r2.ebuild 1022
-MD5 841c64f4eb1b40fe560c3b5ef12d5cd8 yaboot-1.3.11.ebuild 1056
MD5 1280e97f64ba86087ca22bf12c6f373f ChangeLog 4042
MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+MD5 6244b5fbfb4b54bb618abc34304cd3a3 yaboot-1.3.10-r1.ebuild 982
+MD5 69d08b738daa7870e5d4a558bdacfe51 yaboot-1.3.10-r2.ebuild 1022
+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 15c7e4852d3cc4ca21044014d33737ee files/chrpfix.patch 979
-MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.patch 1987
-MD5 22f651a4c0cd422e1245d3a905f9ce31 files/yabootconfig 18898
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 2831519fd08125184e05a815a51d63ec files/digest-yaboot-1.3.12 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 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-r1 65
MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.11.patch 1987
+MD5 05ad83c8ec8ac7914cd6224a148daef6 files/yabootconfig-1.3.12.patch 1987
diff --git a/sys-boot/yaboot/files/yaboot-3.4.patch b/sys-boot/yaboot/files/yaboot-3.4.patch
new file mode 100644
index 000000000000..57964d8a911c
--- /dev/null
+++ b/sys-boot/yaboot/files/yaboot-3.4.patch
@@ -0,0 +1,13 @@
+--- ./lib/strstr.c.orig 2004-05-12 16:16:44.249220125 +0000
++++ ./lib/strstr.c 2004-05-12 16:14:47.245465904 +0000
+@@ -76,7 +76,9 @@
+ a = *++haystack;
+ if (a == '\0')
+ goto ret0;
+-shloop: }
++shloop:
++ a = a;
++ }
+ while (a != b);
+
+ jin: a = *++haystack;
diff --git a/sys-boot/yaboot/yaboot-1.3.11.ebuild b/sys-boot/yaboot/yaboot-1.3.11.ebuild
index ffcf02ca5041..2f163c4ce057 100644
--- a/sys-boot/yaboot/yaboot-1.3.11.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.11.ebuild
@@ -1,6 +1,6 @@
# 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.11.ebuild,v 1.4 2004/03/22 18:26:46 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.11.ebuild,v 1.5 2004/05/12 16:27:23 pvdabeel Exp $
inherit eutils
@@ -26,6 +26,7 @@ src_compile() {
export -n CXXFLAGS
[ -n "${CC}" ] || CC="gcc"
# dual boot patch
+ epatch ${FILESDIR}/yaboot-3.4.patch
epatch ${FILESDIR}/yabootconfig-${PV}.patch
epatch ${FILESDIR}/chrpfix.patch
emake ${MAKEOPTS} CC="${CC}" || die