gentoo resync : 11.01.2018

4 files changed, 114 insertions, 2 deletions

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 5850fd04e1a2..846c89564fa9 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,5 +1,6 @@
 AUX dtc-1.4.1-echo-n.patch 2169 BLAKE2B 3426ecc1043fbc0f9f475664d61efce2746d091bb40528cd00f49463acc3a307b6220534d7d6f9470d6aadc22e593c851bf372c16a7dbc8165e92dc624a4ee68 SHA512 e481ed5489557dccbb31274bae2afc7798da79db63052db7e490b3428f04d01cf5661e8ce9794886a4669f5fbc783b8f5ac1993e34e9ae351a6e6207b10e4b2f
 AUX dtc-1.4.1-missing-syms.patch 851 BLAKE2B f846a06b2af8ab8879cc1f34e1b2132467c8e09f107db79e1d98523146cc4760b7c79ff6d9f795154953dce6206d5c1cbca2f08136f11069def6154b59b73aa0 SHA512 8217b73ea88f5e48ab4192074f6ce6dc21eebd1cef362fabee32fdd7a50951a2c55ea8d738e43d140763b93821b8f84dbe35c8871c6018a4d56191bb3f3e9ecb
+AUX dtc-1.4.4-posix-shell.patch 1232 BLAKE2B eadb56c06e7ff7699d462e3c4c50d1f2c6eda2024443ea24970e7b7c1f9ed1dc8ec5d097aa2a6ae9cad7f934142a9fd9d13d75e6262acc26ddbed8e32a4ffbf2 SHA512 f8d21d1fc4d9c441f1214cd122303efd6aba6f87f2130486be154fa5a94599a94033361481be75bec6b19e9c7ef73986d2ac35cab1af199f390d8a0969d89185
 DIST dtc-1.4.1.tar.xz 107920 BLAKE2B 523173f0adf812f2d4789b1891ad34d10dcc9f3189c9aed1903b1851d8922f116bb9c79b7ea3087ea8c43c82ccb21883893b22004187d693fdb79f3f0ca881f9 SHA512 63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05
 DIST dtc-1.4.2.tar.xz 112480 BLAKE2B 922e4924bd9672b7b5a28fbe6a02a685bcb87909356130788f72dd029a3abd075a45e9cc28bea1db5c793422e4ce093433c597f753d6fa6f7183d51d6b132e73 SHA512 af536fda543a2516e10c45b80bd1b5797a33ab43e08fab6953ec861fc98a73ee232cdd3f5053e889f6e760d238a5a221c2716b8a6fd22b627cd01efac99915b2
 DIST dtc-1.4.3.tar.xz 122732 BLAKE2B 94fe96dc846937ff8e405c4be36a32f0f320bdc6c608e95845227b6e9ab3e4c02643dd1169fd0c8c64777fa2ead8dd1cf0fc1cd2173450c23af124645f2c8b10 SHA512 ce9f39cef11f3e7048e8491f01844071bf54911ec36a0d2f2e1ed6c736b7e1a67be83cd2527895a686882d895142db020bf5131a282e0d68d1f4d32dc772db42
@@ -8,6 +9,7 @@ EBUILD dtc-1.4.1-r1.ebuild 1126 BLAKE2B 36cde85023f009b326e607a617f0a3bc25e23ded
 EBUILD dtc-1.4.1.ebuild 1030 BLAKE2B 436b96829a79350fafbdf65e187ac0ab21b0ca70199a41d641582a40a6ba265b5686040332b6e677a876803c7c4fa1990a998de77346352ec3493a8553d6560e SHA512 763ae7ca11d522cbdeee7ea5675805ddf7d17d0cf773091bf0978b30bf7fec1ebef64904a8e0b291eb3139e4295cb1dc1d833a8afc5d6aa09760fb0ebe5fa72b
 EBUILD dtc-1.4.2.ebuild 1055 BLAKE2B fd0ea82524a6b633ccaf8a21d68e56ed7965e31587c9d25a5dabea7db98e510a58086b09f642a208c867ca757fb5cfd4d31ef02477f6f6f5e25d1298441041d8 SHA512 caa47d8d9a68a473712aac7cbbd6cea0d6bbd3cce9e598236be8d13f7d64013516ed9aa1a91099117f204bd9a12e91e7d907a04fb490c0c2895ff1391b0ab9dc
 EBUILD dtc-1.4.3.ebuild 1123 BLAKE2B 0ce6d8ff290534e99b3236173b704f3cd5a8c3810b35823f1d98054ee6fa6b72922da2ae7fed79b705d91d70ea947c873901b6d5cfee849b9aecf77827a67be7 SHA512 a22759aaa334a1276e2f7793787f357f4b9e72e04df87ed21debb904d713415574673832e8fc87ca60d45eb7bb3e69b549463a610c63ec0a471b5010c3603930
+EBUILD dtc-1.4.4-r1.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a91aeff689a25623a4085a9ed706a9495f8ee59e9a9e415cb8b8f559d8474ac7670f61deec48e9582424f4 SHA512 bea9060f27a2fbfddecf0d3b58ca26c429166e5efe71678f6f3cdf3a59b71c4e27ce6f9ef84806c6527d8804ee7a0a1ceb323c81e301c5f44f3aafef7aa5721b
-EBUILD dtc-9999.ebuild 1055 BLAKE2B fd0ea82524a6b633ccaf8a21d68e56ed7965e31587c9d25a5dabea7db98e510a58086b09f642a208c867ca757fb5cfd4d31ef02477f6f6f5e25d1298441041d8 SHA512 caa47d8d9a68a473712aac7cbbd6cea0d6bbd3cce9e598236be8d13f7d64013516ed9aa1a91099117f204bd9a12e91e7d907a04fb490c0c2895ff1391b0ab9dc
+EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
diff --git a/sys-apps/dtc/dtc-1.4.4-r1.ebuild b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..7521eebe76e8
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		Makefile || die
+
+	tc-export AR CC
+	export V=1
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 1dc3915445fb..7521eebe76e8 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,9 +24,15 @@ DEPEND="
 	sys-devel/flex
 "
 DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
 	Documentation/manual.txt
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
new file mode 100644
index 000000000000..b9b0175c0bd3
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch
@@ -0,0 +1,48 @@
+From 4d9522764985462741c7bb4af1ab231b9251476b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 10 Jan 2018 00:41:43 -0500
+Subject: [PATCH] dtdiff: change to POSIX shell
+
+This changes from the bash-specific process substitution feature to
+reading with pipes.  It relies on /dev/fd or /proc/self/fd existing.
+
+URL: https://crbug.com/756559
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ dtdiff | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/dtdiff b/dtdiff
+index 5fa772b0ab62..4d1b71756c2f 100644
+--- a/dtdiff
++++ b/dtdiff
+@@ -1,8 +1,4 @@
+-#! /bin/bash
+-
+-# This script uses the bash <(...) extension.
+-# If you want to change this to work with a generic /bin/sh, make sure
+-# you fix that.
++#! /bin/sh
+ 
+ 
+ DTC=dtc
+@@ -35,4 +31,15 @@ if [ $# != 2 ]; then
+     exit 1
+ fi
+ 
+-diff -u <(source_and_sort "$1") <(source_and_sort "$2")
++for dir in /dev/fd /proc/self/fd; do
++    if [ -d "${dir}" ]; then
++        break
++    fi
++done
++
++source_and_sort "$1" | (
++    # Duplicate current stdin from the first file to fd 3 so we can change fd 0
++    # to the second file.
++    exec 3<&0
++    source_and_sort "$2" | diff -u "${dir}/3" "${dir}/0"
++)
+-- 
+2.15.1
+