Added more stub functions for newer e2fsprogs, marked stable.

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

4 files changed, 50 insertions, 19 deletions

diff --git a/sys-boot/yaboot/ChangeLog b/sys-boot/yaboot/ChangeLog
index 264ed9bf3d2c..71a2dd9084d0 100644
--- a/sys-boot/yaboot/ChangeLog
+++ b/sys-boot/yaboot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/yaboot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.43 2012/05/15 15:17:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/ChangeLog,v 1.44 2012/06/20 13:54:25 josejx Exp $
+
+  20 Jun 2012; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.17-r2.ebuild,
+  files/yaboot-stubfuncs.patch:
+  Added more stub functions for newer e2fsprogs, marked stable.
 
   15 May 2012; Joseph Jezak <josejx@gentoo.org> yaboot-1.3.17-r1.ebuild:
   Marked ppc stable quickly to fix build problems in the stable tree.
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 512e86f5e181..a5da020e0e63 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -9,7 +9,7 @@ AUX yaboot-1.3.16-memalign.patch 889 RMD160 e5ed2a0b6f0c9262ba9a9d3469c4a0c16e77
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1495 RMD160 e79f715a1aff784b9fee789c41a8fa6deeab7b89 SHA1 e35d0c217ec5ff16fb293814fe95bca9009ff333 SHA256 b49b64f54de33026f9a8238685735bd737f007b898650b2a42eac4c4dbbc205d
 AUX yaboot-nopiessp-gcc4.patch 1623 RMD160 2c5cd0e61acf01bc82a5f49cf07838f143c49f99 SHA1 4a783fbb82f35f0d2792ff5a83dd480326677752 SHA256 61775623e47719ee0dfce343fa86957e17b4e40c6e695c254b1862cefa428fa1
 AUX yaboot-nopiessp.patch 1885 RMD160 ad6bc10b7f9eca86a155691ed11e7e8b234ff6bf SHA1 6adb7f426fede91e9f2a5276bf87b6f2ad0bea1d SHA256 69fcfa7a6c464304b8a9c68da8331909948686955f4a9e10d23505f700bee1ab
-AUX yaboot-stubfuncs.patch 3349 RMD160 022435554f2e517c6a2c6f3d7821401d41083b55 SHA1 d54b77dc3d3ba5ae5aa78ade98618517ef1d55ea SHA256 3b6f6447368e46bff61b0c8acbee0d95f8cf076d7cd33541c725fa006b003784
+AUX yaboot-stubfuncs.patch 3803 RMD160 9eefe3d21508bf7e44ac08d400f32b45c597d197 SHA1 aa9eb35148f59c4153b255ca5bc78e4de719de47 SHA256 58af65c19cb6f464bc32eaae1266eebbe1ff0a27857a984edc725a036c7ceecc
 AUX yabootconfig-1.3.13.patch 1655 RMD160 fd3e62c5cddbe359df3f2abee225392e0ff86144 SHA1 c50bd7dabe553e00c466cfa63cbdb9f20257a74b SHA256 ee662c068ba7800d1d0c85a927f3990658cc488ebd3672e40740b7473ba3bb20
 DIST yaboot-1.3.14.tar.gz 219089 RMD160 dd46fc044732c5bdf3dc23b3faa1dd746895cdd5 SHA1 2bf7594a921075371acf468a46776d0f93e315a6 SHA256 b1b0ddc798e332dc03065bac871b05f700b6f8383951a05dee68a7438f644933
 DIST yaboot-1.3.16.tar.gz 220360 RMD160 738118a5f12ab39c24c2e5983d8852e1b439c846 SHA1 6c87bb041e8dc569b624d99ec5a5d53c8911319f SHA256 16635d5ed0298d46e26e1da8f7a793e185ddb796e3e567554869676650a44650
@@ -17,14 +17,14 @@ DIST yaboot-1.3.17.tar.gz 224325 RMD160 6dce388238a6a4e554c1ab3e7cae4fbe4416dde3
 EBUILD yaboot-1.3.14-r2.ebuild 1268 RMD160 dddd538a19b1720f3410f0c3d7089d64895ce78c SHA1 6b817e1c7169c1c8c43a71e5be0baed1aa6fa8d6 SHA256 7b47d3446fb9f7f26be7f17191a93082400643958792eb6f405a7dd732de73a6
 EBUILD yaboot-1.3.16.ebuild 1341 RMD160 4b2126940730b0b9741c598426bea086cd7826e6 SHA1 853d744db363364f0c5b9af85b24b0f2f9a63192 SHA256 6a21594179712ca4819fdb7265cc6aa259a69a108f82de6529e7fa97c86bef7c
 EBUILD yaboot-1.3.17-r1.ebuild 1487 RMD160 4cafa16241f1294beaea20ca9859054e9a142414 SHA1 a34f3d573324f3c967cbf03494cb12c85d581957 SHA256 ced24c7338d45ab33ad29327e0b71f7ddaa45373209c95d18b2c0216c2781fb0
-EBUILD yaboot-1.3.17-r2.ebuild 1641 RMD160 c251248ac5f13ce759b9f72ad7ff886d75827ac1 SHA1 be02494c168351fedb8749980f9cd33275c23f2e SHA256 24ab05a65b99f47517eea800ac4c3c64aa7011753f177020f4a0084eba44e9b3
+EBUILD yaboot-1.3.17-r2.ebuild 1640 RMD160 2efbbabb293d89622b1b9b93967b56cfc0021ad3 SHA1 05559e04765c3a7c0d6d7fbb37e037df64ff8f22 SHA256 c4c61afddfb2fd72f4c5908063cb6b66a5b1e3cef6e1dc6ce1ca118c6bbeb09b
 EBUILD yaboot-1.3.17.ebuild 1382 RMD160 a72b1e10eb053cadbb91ce70798fb3a8a6a39a4d SHA1 69456b6a0525fec2ff2b826f18f6b16f7b9abe8e SHA256 6193823e37ae89c66d483848b660f91ffd41189c14173a0995299cc3e1287c89
-MISC ChangeLog 10774 RMD160 fa5437da5a0fef6b592ceb0c1508e50b618363f2 SHA1 27f64b6670f796c75e55e249975ceaea2d18e40a SHA256 637da332b0d6853fb0beb7fda7cfa986630c578477544e3294fe78f06d75282d
+MISC ChangeLog 10944 RMD160 0614d1ef22bf3a7666560b92c60cd3d2e98646b8 SHA1 5c509d2f9e880a305d3595e62253e07a18b14162 SHA256 ff26866ba3c98b9cf8f429a890bf8f933e973df5a1a9ff9a2d24c083e672c412
 MISC metadata.xml 175 RMD160 a674189a82ea2172e0949ce49eb80dd5bc23ddf5 SHA1 c203d37a08bfb7b826b080650c3019705490bfb1 SHA256 123ecdec2aa3d066ff52ce8a8013191ede4c949290dad2afc2a2c505500e765a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+yc6IACgkQcsIHjyDViGQmZgCeJwazkonnLcD6B1rRAxvjkUY3
-BQkAoKUnusto60ZnLxEweIlCGEzbfifP
-=FxgI
+iEYEARECAAYFAk/h1h0ACgkQcsIHjyDViGQmmQCfatlGn1ix2k0MdY+5cmABLf18
+TOQAoNQ9SSwViDZFDeVIx2m0AjZfkonh
+=VH1O
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index ae78202bde37..55724c3edda2 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,7 +1,5 @@
-diff --git a/lib/malloc.c b/lib/malloc.c
-index 0121112..e6b29c4 100644
---- a/lib/malloc.c
-+++ b/lib/malloc.c
+--- lib/malloc.c
++++ lib/malloc.c
 @@ -64,6 +64,15 @@ void *malloc (unsigned int size)
      return caddr;
  }
@@ -18,11 +16,9 @@ index 0121112..e6b29c4 100644
  /* Do not fall back to the malloc above as posix_memalign is needed by
   * external libraries not yaboot */
  int posix_memalign(void **memptr, size_t alignment, size_t size)
-diff --git a/lib/nonstd.c b/lib/nonstd.c
-index 5aeb0cb..b536180 100644
---- a/lib/nonstd.c
-+++ b/lib/nonstd.c
-@@ -65,3 +65,147 @@ char *getenv(const char *name)
+--- lib/nonstd.c	2012-06-20 09:38:54.000000000 -0400
++++ lib/nonstd.c	2012-06-20 09:38:57.000000000 -0400
+@@ -65,3 +65,178 @@
  {
  	return NULL;
  }
@@ -44,14 +40,22 @@ index 5aeb0cb..b536180 100644
 +	return prom_read((void *)fd, buf, count);
 +}
 +
++int write(int fd, void *buf, size_t count) {
++	return prom_write((void *)fd, buf, count);
++}
++
 +int close(int fd) {
 +	prom_close((void *)fd);
 +	return 0;
 +}
 +
++// No fsync, just assume we've sync'd
++int fsync(int fd) {
++	return 0;
++}
++
 +void exit(int status) {
 +	prom_exit();
-+	return;
 +}
 +
 +int __printf_chk(int flag, const char *format, ...) {
@@ -167,6 +171,29 @@ index 5aeb0cb..b536180 100644
 +	return 0;
 +}
 +
++int ioctl(int d, int request, ...) {
++	return 0;
++}
++
++int fallocate(int fd, int mode, unsigned int offset, unsigned int len) {
++	return 0;
++}
++
++int uname(void *buf) {
++	return 0;
++}
++
++int setrlimit(int resource, void *rlim) {
++	return 0;
++}
++
++unsigned long long int strtoull(const char *nptr, char **endptr, int base) {
++	return 0;
++}
++
++int getrlimit(int resource, void *rlim) {
++	return 0;
++}
 +
 +int stderr = 0;
 +int perror = 0;
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
index 10a60ac85ac8..b499e2de1cd0 100644
--- a/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
+++ b/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2012/05/12 03:08:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot/yaboot-1.3.17-r2.ebuild,v 1.2 2012/06/20 13:54:25 josejx Exp $
 
 EAPI=2
 
@@ -11,7 +11,7 @@ SRC_URI="http://yaboot.ozlabs.org/releases/${P}.tar.gz"
 HOMEPAGE="http://yaboot.ozlabs.org"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~ppc -ppc64"
+KEYWORDS="-* ppc -ppc64"
 IUSE="ibm"
 
 DEPEND="sys-apps/powerpc-utils