From 0c5e69c7e4fb0bc83fdd64dd3b783f48606ee85e Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 25 Dec 2019 12:01:33 +0100
Subject: [PATCH] sys-kernel/xnu-headers: install device headers

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
 ....16-r4.ebuild => xnu-headers-3789.70.16-r5.ebuild} | 11 ++++++-----
 ...71.2-r4.ebuild => xnu-headers-4570.71.2-r5.ebuild} | 11 ++++++-----
 ...1.1-r4.ebuild => xnu-headers-4903.241.1-r5.ebuild} | 11 ++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)
 rename sys-kernel/xnu-headers/{xnu-headers-3789.70.16-r4.ebuild => xnu-headers-3789.70.16-r5.ebuild} (93%)
 rename sys-kernel/xnu-headers/{xnu-headers-4570.71.2-r4.ebuild => xnu-headers-4570.71.2-r5.ebuild} (93%)
 rename sys-kernel/xnu-headers/{xnu-headers-4903.241.1-r4.ebuild => xnu-headers-4903.241.1-r5.ebuild} (93%)

diff --git a/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r4.ebuild b/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
similarity index 93%
rename from sys-kernel/xnu-headers/xnu-headers-3789.70.16-r4.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
index 89a1fbbe37c8..39dfc055c351 100644
--- a/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r4.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
@@ -45,8 +45,6 @@ src_install() {
 	insinto /usr/include/sys
 	doins syscall.h _posix_availability.h _symbol_aliasing.h
 
-	pushd bsd > /dev/null || die
-
 	get_files_list() {
 		local s="$1"
 		local f="$2"/Makefile
@@ -66,8 +64,11 @@ src_install() {
 
 	local d
 	local files
-	for d in bsm i386 machine miscfs/{devfs,specfs,union} net \
-		netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
+
+	pushd bsd > /dev/null || die
+
+	for d in bsm i386 machine miscfs/{devfs,specfs,union} \
+		net netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
 	do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
@@ -81,7 +82,7 @@ src_install() {
 
 	pushd osfmk > /dev/null || die
 
-	for d in mach{,/i386,/machine} mach_debug ; do
+	for d in device mach{,/i386,/machine} mach_debug ; do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
 		einfo "${d}:" ${files[*]}
diff --git a/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r4.ebuild b/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
similarity index 93%
rename from sys-kernel/xnu-headers/xnu-headers-4570.71.2-r4.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
index 92ff463dd335..e81f8ade9c28 100644
--- a/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r4.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
@@ -45,8 +45,6 @@ src_install() {
 	insinto /usr/include/sys
 	doins syscall.h _posix_availability.h _symbol_aliasing.h
 
-	pushd bsd > /dev/null || die
-
 	get_files_list() {
 		local s="$1"
 		local f="$2"/Makefile
@@ -66,8 +64,11 @@ src_install() {
 
 	local d
 	local files
-	for d in arm bsm i386 machine miscfs/{devfs,specfs,union} net \
-		netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
+
+	pushd bsd > /dev/null || die
+
+	for d in arm bsm i386 machine miscfs/{devfs,specfs,union} \
+		net netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
 	do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
@@ -81,7 +82,7 @@ src_install() {
 
 	pushd osfmk > /dev/null || die
 
-	for d in mach{,/arm,/i386,/machine} mach_debug ; do
+	for d in device mach{,/arm,/i386,/machine} mach_debug ; do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
 		einfo "${d}:" ${files[*]}
diff --git a/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r4.ebuild b/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r5.ebuild
similarity index 93%
rename from sys-kernel/xnu-headers/xnu-headers-4903.241.1-r4.ebuild
rename to sys-kernel/xnu-headers/xnu-headers-4903.241.1-r5.ebuild
index 036db4cec446..d6cb4db0860a 100644
--- a/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r4.ebuild
+++ b/sys-kernel/xnu-headers/xnu-headers-4903.241.1-r5.ebuild
@@ -45,8 +45,6 @@ src_install() {
 	insinto /usr/include/sys
 	doins syscall.h _posix_availability.h _symbol_aliasing.h
 
-	pushd bsd > /dev/null || die
-
 	get_files_list() {
 		local s="$1"
 		local f="$2"/Makefile
@@ -66,8 +64,11 @@ src_install() {
 
 	local d
 	local files
-	for d in arm bsm i386 machine miscfs/{devfs,specfs,union} net \
-		netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
+
+	pushd bsd > /dev/null || die
+
+	for d in arm bsm i386 machine miscfs/{devfs,specfs,union} \
+		net netinet{,6} netkey nfs sys{,/_types} uuid vfs ;
 	do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
@@ -81,7 +82,7 @@ src_install() {
 
 	pushd osfmk > /dev/null || die
 
-	for d in mach{,/arm,/i386,/machine} mach_debug ; do
+	for d in device mach{,/arm,/i386,/machine} mach_debug ; do
 		insinto /usr/include/${d}
 		files=( $(get_datafiles ${d}) )
 		einfo "${d}:" ${files[*]}
-- 
2.26.2