[gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/

[Mike Frysinger]

commit:     0b6c782b7853ff796d16200301ced0b34e16c594
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Jan 10 05:48:35 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 05:48:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6c782b

sys-apps/dtc: change dtdiff to use /bin/sh

 .../dtc/{dtc-9999.ebuild => dtc-1.4.4-r1.ebuild}   |  8 +++-
 sys-apps/dtc/dtc-9999.ebuild                       |  8 +++-
 sys-apps/dtc/files/dtc-1.4.4-posix-shell.patch     | 48 ++++++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
similarity index 85%
copy from sys-apps/dtc/dtc-9999.ebuild
copy to sys-apps/dtc/dtc-1.4.4-r1.ebuild
index 1dc3915445f..7521eebe76e 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-1.4.4-r1.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/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index 1dc3915445f..7521eebe76e 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 00000000000..b9b0175c0bd
--- /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@××××××××.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@××××××××.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
+