gentoo resync : 22.01.2019

6 files changed, 211 insertions, 11 deletions

diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 10d09ea0babc..c746b80361d8 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,16 +1,19 @@
-AUX chrpfix.patch 979 BLAKE2B 0b3409ff68dd07f22faee5fd2af13e9d5fcfc6a3683cb09cc0d5858b03be33999d1818a3b7454028f2a6c7fa66734f1e0cd80d8fccc1587caede88411c88e6cd SHA512 e9be3e0a49b24c6b3879f45b29a14e186df95ebcfb2f4960b38c96c341de5123bc0bb8d42ed6ccab9a0bfb6632d1a5424b2167b4c6b566ee2a914a6594b80510
+AUX chrpfix.patch 983 BLAKE2B 8b2ecfaf5af26639abb3ed24e3b0cf5fe46e95d17a23e329ed646be444cfec754ab0c38b55c20defc5e8738dc4fc7f08937762f3674957ca858e28a4b5ffcf90 SHA512 2e21a50600d90d36c7532c19488bee5a010cd270c558607dab02a6e6d9df8f968ad6df4c5d99355d55a6a8aaf8084e553eb21629589946b036c4b9808a8a0d00
+AUX e2fsprogs-1.42.13-sysmacros.h.patch 2166 BLAKE2B 48aa9607e048115124f9321aa574ff9c0fb8d094487a964a6b856325e2d378e40f5bf3dd019731f60167ee157c205c3f139bbaf1b14ec84056c79c8d03fb734e SHA512 ebb3731731fa19b0b2a085b9ad2217dfe7502b050ac027fbd4afd86c240630e09b8ad63d37c476ab58d5c1d1658ab651bd5459c450db2a0b4721e2c2b84c3182
 AUX new-ofpath 4319 BLAKE2B 04866ae6446993febf28fd49fd382e6092724640e74e5dc940777dac21ee3acb12722f1e2c90f793f89de5ce97c8ce743a853ad8968e5c86a2a17c5525e0c6f1 SHA512 8095d1e085a38d3c058e750acabaaf58464117f1af03fcc4604e86c58cd305e138b340420d3f1a5da5e3752dea59cc823599a6cc7a585195011f0030f1b80787
-AUX new-ofpath-devspec.patch 936 BLAKE2B 6a0f7587b8ec86ec5e417c699d409a46498b2f8530176b7b16f278292ffa73eeb420dac42f814771f6326068d744de7ecc6fafd5e9c94d182ff6cafa11825337 SHA512 4848ebb10a3879224a5748741ed7134c3ae54f7425b786eae7ab6a9f13bdc893c70c15c2e1986a4a2d1f3f26fdc20c0da92c81c9f47e42c061670963d5cb82f0
+AUX new-ofpath-devspec.patch 940 BLAKE2B d398bb81e62ce4caecc2431657c2429d8fdb76b56c82ea2975784662f8eef52dd5201e98d78343ed6b9a4a3ce29844e4060edf25b24c232d2e7b0afe4e05b616 SHA512 ff3dfa9bb8d79d48d083b618e39ad98b0e6dc26c13986d0187961fcd323c8979439c0b21dc37655e4749db75ba397597c52a9a66b05a41155257219eaa0e660c
 AUX sysfs-ofpath.patch 3432 BLAKE2B 307f737b869ca0de81e638a48b4a7e0d9d597b0dc86cc3680efa6e40561706a8829b0c3a13c7d0f6153345d75d9394a8975131ec1722b8f18f8eb261753efec7 SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38
 AUX yaboot-1.3.16-memalign.patch 889 BLAKE2B df80c4bd0ed2291dd465822820874ea913693f22eb916a7707bdfbb6ea36fb5592d0f2bdd2c7643fff93f7be9d78431ac6f2f25ad31d110b7a31fe94cc118fae SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1229 BLAKE2B a1d8faa966e7e1daa609d4102e5e9a73a429db3d2a762620ed4251a00b52aec4ae939dfce13bed933de29ae1fc0d23774b5fe7206087a58951ad837a3e4420e4 SHA512 32e41b33a1e7109ec0a7ba9ca97ff0d45144d9499aa7657bc93a8007c6c6fa8206a6b406729cbb27407c84ef004b4cdb85e4664d9a4666cbde7700e7b3e82231
 AUX yaboot-nopiessp-gcc4.patch 1355 BLAKE2B 2728cceadba84f37953ed702d09b69a6b11d9320dc97490f145e30bb8845011f9e26d18d909ac2e330512f2651d26d7d0dfdbc85d3d5c45a28ea29d8bc4de16d SHA512 413b2353735d82a81e2831d1e51a995096eadfb3c17feb51b6b75035057557ed8c9adebd58fa1635fcaae36fd25c1783e491b85b4437dfb73e1569cf48a51359
-AUX yaboot-stubfuncs.patch 4602 BLAKE2B 9ec25ccc2b7a491c4a94495aa16dedd1c354724716a1bd74b3136ecc4d2af781bc510e28545f27a59b1e2b232f2288d00ebe9c5101bcbef12a545d21631703f4 SHA512 599b0c0e1b1907ace9e0d449bddd934cf1d96364ff446e1cbbe5e743f46b44412a38b169f896a0a6fa51c19652b751089643331196ae66f0314bedc689ef04b8
+AUX yaboot-stubfuncs.patch 4610 BLAKE2B e2c8f77d4a0e12a74d9a52b0a410f671509ff1db205f09569108745eab31719218a0cd9d302d6d8471c50b54b458a5752417f5eff42017fa50476632b78b232c SHA512 1acb5a8a054ce469b7f0d7ee7960067a03fb1df0b43cafc7a1c4e9775b27ed7e982028185ebbc564116d51406b8ee7b12357cfab456ac00a26e9415e1da58fb8
 AUX yabootconfig-1.3.13.patch 1655 BLAKE2B bdd8f618bc30706b04adba1664a5414a233f9c32d793b364158a3f9b665872b9f2da3b5f9ac20e13b713280be2f6fb097055095a4d23f2953bff8630f116abdd SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98
+DIST e2fsprogs-1.42.13.tar.gz 6511931 BLAKE2B 2f849e82ad366f86d9d166f1901a99a8ac0ddc94471a29fb0de9132ae2ba8f8dc0f4c143acf889afdaa1daf1c57e7bf545a2b4e15ebb8463667f2768a8bc2ebb SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0
 DIST yaboot-1.3.14.tar.gz 219089 BLAKE2B e9f71476502dd61e1e277980eab486b35675f809249e27d72627f6469c75c7ea43740898cc8dc58196bb70d08dce52ef334fcd035ac92c66a4f77236a0371049 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
 DIST yaboot-1.3.16.tar.gz 220360 BLAKE2B e717b101f14b6178f9fdcd4cf45077c1b9c5db91504f8a000710c02d8b35f6094deb590710c09352fcd18385122a1824b99de5600b176c79da0937fa5b287b0b SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
 DIST yaboot-1.3.17.tar.gz 224325 BLAKE2B 41f96266f2342eebbfdc3c0eb64eeaf59e55a31d7388f86839cf9318d231ef808d3aa16fb3b3fdfe85a6fca743e191d064f0ed633723f135a7ca25483e460566 SHA512 da910c4c6ca2de817342bf4dbcefe2857606043e614782581a86bae206cf6cfe5597ad47aea15369feb60e02d8a4f9f4aa3b12863d715c757584c1f4d7ffb9de
 EBUILD yaboot-1.3.14-r2.ebuild 1090 BLAKE2B c0cec53d18160ba535a5efc3f55f552e5b5f266794201d961f03bc1eadeb25b4d6f667e13c49b9a1b8973c03dc8381190c2b2966ad542fae761c4bcd2bce654d SHA512 e400c540823a82924328d46385fcc5aac8b72aa29e7a0f85daf8d9ba7a87461300cc95acb9c01547c0209b4274e28447772e84aa94df18d53108da303eb9b4e3
 EBUILD yaboot-1.3.16.ebuild 1258 BLAKE2B 5c89562628f998bbe0bc5f4850ea6d802b3d28d1018af02d96f8b1d1d6a551e0ee2f7dfc68a9236e251715feae6ea557928981a8d97f5c70ee90e06175e01fac SHA512 447724cc4ad94e30c9cfa1520f599edce8363b127d244ac98c9680089af9a598f330fc33f954adafd764527e5b4bbfb85fcdcdf9ae192c941ab2b039d907a770
 EBUILD yaboot-1.3.17-r2.ebuild 1422 BLAKE2B e396ceaff0619050e0d7516a9fedd9071968f8506dcccf17c71e6572c00fc15da4ee9cab223a21c43ec473a056d773f53835b5d43026fffc85293b83ba8009e9 SHA512 06714ef51cb0a8597a8fd548a53c0c50390e9e6b89eec2bcc307cbb3d2fe88c1c6af98e07cee325d6b84e30aa6a53c5fd4c4d9a4588c7ce9814ee018d1c09c58
+EBUILD yaboot-1.3.17-r3.ebuild 2809 BLAKE2B a24ef6f3b369bfb304260255a85176bb1604769556301f8418d74179debe4094a2e04f7ad7b0711c1b61de751e409476f5a8aae29c36de88c0c3951771dc6481 SHA512 b4ceea2ed64c423ab90e149f756ed8b7dbfd6fd84ba10cbbb922f35aa2291e89c70cc990b2f016b9b1fad4caf079b5222367b7c4aae967182988203c5d30242d
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/yaboot/files/chrpfix.patch b/sys-boot/yaboot/files/chrpfix.patch
index e64369ba899a..59ea7a072633 100644
--- a/sys-boot/yaboot/files/chrpfix.patch
+++ b/sys-boot/yaboot/files/chrpfix.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-03-22 12:04:32.056149336 -0600
-+++ Makefile	2004-03-22 12:05:51.824138328 -0600
+--- a/Makefile.orig	2004-03-22 12:04:32.056149336 -0600
++++ b/Makefile	2004-03-22 12:05:51.824138328 -0600
 @@ -103,9 +103,11 @@
  
  all: yaboot addnote mkofboot
diff --git a/sys-boot/yaboot/files/e2fsprogs-1.42.13-sysmacros.h.patch b/sys-boot/yaboot/files/e2fsprogs-1.42.13-sysmacros.h.patch
new file mode 100644
index 000000000000..8bf887026ead
--- /dev/null
+++ b/sys-boot/yaboot/files/e2fsprogs-1.42.13-sysmacros.h.patch
@@ -0,0 +1,85 @@
+From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 19 May 2017 13:25:59 -0400
+Subject: [PATCH] include sys/sysmacros.h as needed
+
+The minor/major/makedev macros are not entirely standard.  glibc has had
+the definitions in sys/sysmacros.h since the start, and wants to move away
+from always defining them implicitly via sys/types.h (as this pollutes the
+namespace in violation of POSIX).  Other C libraries have already dropped
+them.  Since the configure script already checks for this header, use that
+to pull in the header in files that use these macros.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ lib/blkid/devname.c    | 3 +++
+ lib/blkid/devno.c      | 3 +++
+ lib/ext2fs/finddev.c   | 3 +++
+ lib/ext2fs/ismounted.c | 3 +++
+ misc/mk_hugefiles.c    | 3 +++
+ 7 files changed, 22 insertions(+)
+
+--- a/lib/blkid/devname.c
++++ b/lib/blkid/devname.c
+@@ -36,6 +36,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <time.h>
+ 
+ #include "blkidP.h"
+--- a/lib/blkid/devno.c
++++ b/lib/blkid/devno.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "blkidP.h"
+ 
+--- a/lib/ext2fs/finddev.c
++++ b/lib/ext2fs/finddev.c
+@@ -31,6 +31,9 @@
+ #if HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+--- a/lib/ext2fs/ismounted.c
++++ b/lib/ext2fs/ismounted.c
+@@ -49,6 +49,9 @@
+ #endif /* HAVE_GETMNTINFO */
+ #include <string.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+--- a/misc/mk_hugefiles.c
++++ b/misc/mk_hugefiles.c
+@@ -35,6 +35,9 @@ extern int optind;
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <libgen.h>
+ #include <limits.h>
+ #include <blkid/blkid.h>
+-- 
+2.20.1
+
diff --git a/sys-boot/yaboot/files/new-ofpath-devspec.patch b/sys-boot/yaboot/files/new-ofpath-devspec.patch
index ac03c15d8dd7..e9ad749d8f06 100644
--- a/sys-boot/yaboot/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot/files/new-ofpath-devspec.patch
@@ -1,5 +1,5 @@
---- ybin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
-+++ ybin/ofpath	2012-05-09 12:32:19.661560544 -0400
+--- a/ybin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
++++ b/ybin/ofpath	2012-05-09 12:32:19.661560544 -0400
 @@ -85,11 +85,20 @@
  [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
  
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index 8ae522b7d4eb..ba6fcc7b3606 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,7 +1,7 @@
 Stub out some functions that are not provided (and unneeded)
 
---- lib/malloc.c
-+++ lib/malloc.c
+--- a/lib/malloc.c
++++ b/lib/malloc.c
 @@ -64,6 +64,15 @@ void *malloc (unsigned int size)
      return caddr;
  }
@@ -18,8 +18,8 @@ Stub out some functions that are not provided (and unneeded)
  /* 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)
---- lib/nonstd.c
-+++ lib/nonstd.c
+--- a/lib/nonstd.c
++++ b/lib/nonstd.c
 @@ -65,3 +65,208 @@
  {
  	return NULL;
diff --git a/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
new file mode 100644
index 000000000000..b127a5072d35
--- /dev/null
+++ b/sys-boot/yaboot/yaboot-1.3.17-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+# yaboot is sensitive to external libc dependencies
+# of e2fsprogs. Pin to known working versions.
+# As a bonus we can control CFLAGS used to build e2fsprogs.
+# See compile_bundled_e2fsprogs() below and https://bugs.gentoo.org/641560
+E2FS_P="e2fsprogs-1.42.13"
+
+DESCRIPTION="PPC Bootloader"
+HOMEPAGE="http://yaboot.ozlabs.org"
+SRC_URI="
+	http://yaboot.ozlabs.org/releases/${P}.tar.gz
+	mirror://sourceforge/e2fsprogs/${E2FS_P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc -ppc64"
+IUSE="ibm"
+
+DEPEND="
+	sys-apps/powerpc-utils
+"
+RDEPEND="!sys-boot/yaboot-static
+	!ibm? (
+		sys-fs/hfsutils
+		sys-fs/hfsplusutils
+		sys-fs/mac-fdisk
+	)"
+
+PATCHES=(
+	# dual boot patch
+	"${FILESDIR}/yabootconfig-1.3.13.patch"
+	"${FILESDIR}/chrpfix.patch"
+	"${FILESDIR}/${P}-nopiessp-gcc4.patch"
+	"${FILESDIR}/${PN}-stubfuncs.patch"
+
+	# Fix the devspec path on newer kernels
+	"${FILESDIR}/new-ofpath-devspec.patch"
+)
+
+src_prepare() {
+	# has to be copied before 'new-ofpath-devspec'
+	cp "${FILESDIR}/new-ofpath" "${S}/ybin/ofpath" || die
+	default
+
+	pushd "${WORKDIR}/${E2FS_P}"
+	eapply "${FILESDIR}"/e2fsprogs-1.42.13-sysmacros.h.patch
+	popd
+
+	# No need to hardcode this path -- the compiler already knows to use it.
+	# Error only on real errors, for prom printing format compile failure.
+	sed -i \
+		-e 's:-I/usr/include::' \
+		-e 's:-Werror:-Wno-error:g' \
+		Makefile || die
+
+	# We'll install bundled libext2fs.a here
+	DEPS_DIR="${T}"/bundled-deps
+	export DEPS_DIR
+}
+
+src_configure() {
+	pushd "${WORKDIR}/${E2FS_P}" || die
+	econf \
+		--enable-libblkid \
+		--enable-libuuid \
+		--disable-fsck \
+		--disable-quota
+	popd
+
+	default
+}
+
+src_compile() {
+	# Note: we use unmodified host's CFLAGS to build depends.
+	emake -C "${WORKDIR}/${E2FS_P}" V=1
+	# install-libs to install libext2fs.a for yaboot to statically link against
+	emake -C "${WORKDIR}/${E2FS_P}" DESTDIR="${DEPS_DIR}" install-libs V=1
+
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	# -std=gnu90 is needed to preserve 'inline' semantics
+	# of pre-c99 (always-inline) to avoid duplicate symbol
+	# definition, bug #641560.
+	# -L${deps_prefix}/usr/lib is needed to inject known
+	# working libext2fs.a as yaboot bundles header overrides
+	# that assume matcking implementation. System's version
+	# frequently does not work like in bug #641560.
+	emake \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib"
+}
+
+src_install() {
+	sed -i -e 's/\/local//' etc/yaboot.conf || die
+	emake \
+		ROOT="${D}" \
+		PREFIX=/usr \
+		MANDIR=share/man \
+		CC="$(tc-getCC) -std=gnu90" \
+		LD="$(tc-getLD) -L${DEPS_DIR}/usr/lib" \
+		\
+		install
+	mv "${ED}"/etc/yaboot.conf{,.sample} || die
+}