sys-libs/darwin-libc-headers: revbump to add missing Frameworks and headers

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian@gentoo.org>

4 files changed, 93 insertions, 15 deletions

diff --git a/sys-libs/darwin-libc-headers/Manifest b/sys-libs/darwin-libc-headers/Manifest
index a00293444e47..54ff64636d34 100644
--- a/sys-libs/darwin-libc-headers/Manifest
+++ b/sys-libs/darwin-libc-headers/Manifest
@@ -7,14 +7,20 @@ DIST Libc-1272.250.1.tar.gz 2020635 BLAKE2B 7ec6be323928e169a23de08858cfb8f42f02
 DIST Libinfo-503.50.4.tar.gz 283084 BLAKE2B 69f4a32910bcdd4870c23d54916b913336ea4e13430d23d94aa728958f4da54930702c332c427155501cb6c3929a49d585db401971dbe093e05ade18c57ea316 SHA512 145ad52b14050126da9f3e17507a7e3a83e962ac796d4f014b6b44554e33a499723fdf4f6912b1457e435997cff4f5fc29f1d7424397169c5709fce762fda9d5
 DIST Libinfo-517.200.9.tar.gz 306337 BLAKE2B da91c8d79997fc04eaaeca21b5dc90336c2d43dda4641fb91085f5a32157ab50ef022886b5b4ff09e2c306a8f887c4280a045fb01c04ca86f3e59d2bd5cf8d66 SHA512 8c2f72484f584312083095b8e8a373ae349e92bca2cacebd460e6e7c885d98d5dc3975eb37c348f6e65ff77af1990d3111468613af105b8605c7d575d8119eaa
 DIST Libinfo-517.30.1.tar.gz 293825 BLAKE2B dd19937b9c8419e953ff1e22f73dc89a9328706c87284fa6f138e23c97c236600f20e71d1926607211cc82766d3c3a9113381f2471046aceb01a56d3d332f2fb SHA512 48313e8ce4822ad61023faf364d7d64d7f15f8b70930d3052c321c9b555c4af20fd6563ae4b890e0504a1ca141423635a1bb7561cb82123cb0593ccafec6f915
-DIST darwin-libc-headers-10.12-r1.tar.gz 500502 BLAKE2B d16487d66ddb95097629ab9f9b7b99e32a152ed5071a03cba832f2622d3cb013541554d7c744cd482ef258ff6a21b3260be311cf8043a1f340afbace3c0d9e85 SHA512 fd68bc8833b5e149655f836d15b667854c668e5b85ddafc68fcd11c81478fb27dc5be495c3b5f687031e674393cc9f0b94503d2177eb8f412e713b0ed7f17375
-DIST darwin-libc-headers-10.13-r1.tar.gz 522569 BLAKE2B b107ab33ddb88b95c81dfb6ae97dd8efabcda9591db1e3d2744b69d90dd888467424dab1e1ebfc93ad98fb2b9896c5e1fef960684d2e28e79a50d7c1b09963fe SHA512 14d8c049da718b7a9f737762228f173b07ca54a4d1e7e047ef1e16910c1112e0b7d93d469ab239cf4ba6540c1fb09290af75aa63ce865f707e5b1e574aa71604
-DIST darwin-libc-headers-10.14-r1.tar.gz 566088 BLAKE2B b1296312a6a5cbe0ff50e0441a01bc581f91e97d8cfbc8349e8bcf2dc4b6233691b1ad08ce2e562bcfbb75718401e78205232e00cff9901f5dc56ced49acd057 SHA512 f652937b62199013ad157c6a74d7c5ec7dba4b01aae305ba790e4937b7d22e9b5246c918668e50849d041a82c9d250d3efbc135896e51635e2616ff114882581
+DIST copyfile-138.tar.gz 52035 BLAKE2B be62d549a45d7f8140d10a3f5857e8d445e5b968e05b82ec73668176047a94b7799b41450223e32406c3ba6677a1a6c694eb8b0ad839a25c37dd4657c176e5d7 SHA512 455fb02b8f5e03a751ebaf05af7cbf2efa60ce5a8084bb3953044abf71ec6b75f394fa5f7ec7fac76532a4216b0930100aee972963cfada83eed73717a881fd6
+DIST copyfile-146.200.3.tar.gz 65045 BLAKE2B 4e5b3524e6e5a54046a68b04d0277645d6ba5be466e669cbdd7a78d41c3d1a69e222cea55198ae53c5803c96fd6ba7ab4543d0bdc42b5cc99054815a84de664f SHA512 555c320eeb27373f68f1a8844ead0614f734e47f7a3d87f867663fc8d6a9e6fa295c1159f9be4e32af2f0933f3e56dd52288a3b2ff970966de5436d2ac054f2f
+DIST copyfile-146.50.5.tar.gz 64621 BLAKE2B 1bbb368dff263e43ebd97802310f98af2592c5a04279297a645e042179f86815376b393b44cba60be5d25e89a15e3b58751da9fd30ccb923d57d62f9c08808d3 SHA512 e09cacf3c284ca3460cfc8263d75b810c2e853a6a134ff3568af86394c90f04d866ba8d1e5996a2e009034fdd9e44162b04faf2fcefe56aeb12e5d128b0a678f
+DIST darwin-libc-headers-10.12-r2.tar.gz 3867106 BLAKE2B 6ac9399716da731913e51b141935496e9ce5e596cc58b971224b39b3346c961e8b2143e88c279736a557c27e64dc286436e662b4fb63183440948d31ab761b52 SHA512 7098832b46fd79d3a5255711a8825c63bea5f513c7646363912b08203d24c30b334cb9745cf84732ea558e50f71c0327eca53c5a8bc81daafffb10c6a43bd3f1
+DIST darwin-libc-headers-10.13-r2.tar.gz 3653319 BLAKE2B 96874e314adaafe129fbd35b743ae7e3f4a258ee3a21872cc197c1fe9244f74309321664fecdd0591583425f0e4bad2eb2bc024ae5eb04a864e27db14a4cf39f SHA512 a41047db4740933e961f433660661fc84fd7a124e5ec9806859042ec32680075f35953b96a58576b494ac0c5add7abd91522b1111b862b23fef7d12049e35e5b
+DIST darwin-libc-headers-10.14-r2.tar.gz 3984239 BLAKE2B 6c0681691dffe9e105b05a63d7a9022f0085dd89154e721c11dbadedcb2382bfc029293a6c510288ea5196f69a763a7eee34a5b5224d1072bb41b4125d224f2d SHA512 422139e55ef36217b38f8ee7f3b8dc78ca127358b5fcfbe2906c22597aaa52a55c576830cf19528872fb4dc6960a134783292d714c21a8be5b7d664bfafff9b4
 DIST dyld-433.5.tar.gz 632900 BLAKE2B b051aee22eb646942473f698b1f29f9acbc0ab20b0c1a60578123b4db5032290f02301bd2d867724b424b74a08470cdd29b47234063df2d100fd535bb8ec3ed7 SHA512 9479b66e5956a852491e1d080d45ff4c9254aa5bf890c634a6cf973f6e45862d282e00ba81c6ff4c849a643585920b654964ed4dde280a73849a84dd8f7be830
 DIST dyld-551.4.tar.gz 832297 BLAKE2B e65c5b2ed90af6ec94f1295efc984404af99f0e5dc666bfc854379f13fd2e98b8048fae84b7bc8864fe27112abf12f741a33cc404b18ae7c88b7abd6a1d9e3c6 SHA512 896281c4b2330c92ed538af58f1b60906ed0a9ffa3099a5e8ef9a15b7ed974259bf546fd2ab7562739f2c8cf1fdfb44ea0ea7567092c77f2ea2cab377da064b0
 DIST dyld-655.1.tar.gz 907306 BLAKE2B d0c22abe50575dc80214d2eba8a057068e4e2d7f06f5562e7cdf29293de9c97fffece206d9324ba37c0b98afa583693e2c26fcc91f0ea089720fc960709e93a9 SHA512 7054461b6ff2ba24153f2097516c1273c77ec0fd7edd5108c336bc22990b45eb68974bcd654b9a45724fd631253443f01988e9b1647dc37f8ae5b8d18bb0352d
 DIST libclosure-67.tar.gz 128749 BLAKE2B 2ca085bd3b98bbcad6a10af27fcf058941b755a4f3ff88102ce5bda4293d2f693c06569726ad368c08bceea8997e3ffc4019c21320d64c861d866eb30dc99044 SHA512 b3c5ab14f8e0e60ef11421cc366f6596864d5837ade51a3ef7b9cf2de7958a0dacf6a5a07ee3e6db03bbecc696fce7b60091f5820450b29b447596c04d2d7ee7
 DIST libclosure-73.tar.gz 131448 BLAKE2B fec5d92d6e9ddb338d730eaddc1c83e94e1a16323308abb0531118dffe02f8e50aa85c2721041a17ab4ef3fc15ece3a6f4b5045bca9c4e3cf3d54c2fdd8b42d1 SHA512 9749a5a08b0720eec1acedc60952b0ccc40f9cbfc9a326e0640280e0d017b9d241827bb6c5a9e68077662439877f3bd14082b7972399144bcb723988bb30def1
+DIST libdispatch-1008.220.2.tar.gz 503589 BLAKE2B d09427bbaf5a3c38ad036bb0d05ca3ba548be22bda59829be43db6aaa0509199d088b854326a95494fafd4870b2d00dcf31bd5ea4484b3a37e682c89cd6db781 SHA512 f3df85d1f37449ea8538a3e34f3b90abd939a6a3ff9ea0882a129597ab024773f5499bee173bf8062cbf5c48f8a1f52dbbebab12f5abb1248ddc78edc66f79ed
+DIST libdispatch-703.50.37.tar.gz 415675 BLAKE2B a30695458f274bb869556837ee69f0f47839fd8741cb446c0c9513ed0d971f44a7eb55d7276db34b5ac3409b68ec283576ea547f12052cfd656fc110ce95cfaf SHA512 a23d3850dc7b6b6e3ef09764a202d6600fc2f238b8dbfe9b13e63b6aae2336dc800d86d987afab88d9c4493d30824468a31a48997b2cfbd2d743e7f1e6dc28cf
+DIST libdispatch-913.60.2.tar.gz 463117 BLAKE2B ec8d90788c86853bd8b65ec953b0e96c57e7a58765d3cd2e53e6c6aae4effa16ae16d18b44e25121717e26774f031391e977d6adaae796192b1f14acdc1dbfcd SHA512 29520016db9fd89457f76d86d889834140e211b6da35bd370178814e97e8f6ffce4b36d96cf41af1280846cdff0ba4ea6ca58d0c63e29ab1a49595c6e52030f4
 DIST libmalloc-116.50.8.tar.gz 186880 BLAKE2B 00ec1cf6dc494fad1e817d942323da86f4de6ab35d92702b6c98b7b0fdb765e756f566298d3369165b0cdf687d43a655be64e3015f884c4d1cd7b7a286669de6 SHA512 a2a49a1d12e66618b124917617c942a51ac36b7b4a12c218b5c979b9d05db822949fc8ffada8901f551f5c2e7fce9abf1d3aeb4a6507f5870a9eab5b9f69ec18
 DIST libmalloc-140.50.6.tar.gz 208453 BLAKE2B 40b7f0052e81bc7862b7bffd302a7868f1f0e6dc11c799370842457635d32bbc61e75753b2b6ebaf2dceaf26b43d7bf4efc718df91c91e0f5572929cbc9bed1d SHA512 9d39f9758f85cfa61835f9deaa4ae4958569aac0da006c5f0e87aaab2cd902b60f60e537fa0d9250401b7177f8c186e8c8e6498b48ee3eaf856daf103bf61412
 DIST libmalloc-166.220.1.tar.gz 277584 BLAKE2B 2fee2a98aa0babc958726522639ddd135b4383bb8328a4d879481e27ec051bd530fc540ba2d959504c457a67536197632e28384959107b103bb466f96223b9ba SHA512 ebbe6d6e5d4cb4e6d928df49c8ab6582e4197ae9b7ed4e1068afd4227ca3e7d22f0d10d47745abcd7f983a75419c8fa7c94d127e3624cee16fa557434b0c3cef
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r3.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r4.ebuild
index 43aa934a38fa..622f6d899e35 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r3.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r4.ebuild
@@ -11,6 +11,8 @@ LPV=126.50.8
 UPV=35.3
 OPV=67
 DPV=433.5
+APV=703.50.37
+FPV=138
 OSX=10.12
 DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.6"
 HOMEPAGE="https://opensource.apple.com/source/Libc"
@@ -22,8 +24,10 @@ SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
 	https://opensource.apple.com/tarballs/libplatform/libplatform-${LPV}.tar.gz
 	https://opensource.apple.com/tarballs/libunwind/libunwind-${UPV}.tar.gz
 	https://opensource.apple.com/tarballs/libclosure/libclosure-${OPV}.tar.gz
+	https://opensource.apple.com/tarballs/libdispatch/libdispatch-${APV}.tar.gz
+	https://opensource.apple.com/tarballs/copyfile/copyfile-${FPV}.tar.gz
 	https://opensource.apple.com/tarballs/dyld/dyld-${DPV}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r1.tar.gz"
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r2.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="${OSX}"
@@ -47,7 +51,8 @@ src_prepare() {
 	sed -i \
 		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
 		-e 's/ln -hf/ln -sf/' \
-		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh \
+		"${WORKDIR}"/copyfile-${FPV}/xcodescripts/install_files.sh || die
 
 	# add libmalloc manpage stuff to Libc to automate the installation
 	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
@@ -83,12 +88,21 @@ src_install() {
 	run_xcode_ish ./xcodescripts/headers.sh || die
 	if use man ; then
 		run_xcode_ish ./xcodescripts/manpages.sh || die
+		for f in "${ED}"/usr/share/man/man*/* ; do
+			[[ -e ${f} ]] || rm "${f}"
+		done
 	fi
 
 	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
 	run_xcode_ish ./xcodescripts/install_files.sh || die
 	popd > /dev/null || die
 
+	if use man ; then
+		pushd "${WORKDIR}"/copyfile-${FPV} > /dev/null || die
+		run_xcode_ish ./xcodescripts/install_files.sh || die
+		popd > /dev/null || die
+	fi
+
 	insinto /usr/include
 	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
 	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
@@ -97,6 +111,8 @@ src_install() {
 	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
 	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
 	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+	doins "${WORKDIR}"/copyfile-${FPV}/copyfile.h \
+		"${WORKDIR}"/copyfile-${FPV}/xattr_flags.h
 
 	insinto /usr/include/sys
 	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
@@ -115,6 +131,12 @@ src_install() {
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
 
+	insinto /usr/include/dispatch
+	doins "${WORKDIR}"/libdispatch-${APV}/dispatch/*.h \
+		"${WORKDIR}"/libdispatch-${APV}/dispatch/darwin/module.modulemap
+	insinto /usr/include/os
+	doins "${WORKDIR}"/libdispatch-${APV}/os/object.h
+
 	insinto /Frameworks
 	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
 
@@ -124,9 +146,11 @@ src_install() {
 	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
 		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
 
+	ln -s ../nameser.h "${ED}"/usr/include/arpa/nameser.h || die
+
 	rm -Rf "${ED}"/remove-me "${ED}"/System "${ED}"/usr/local || die
 	use man || rm -Rf "${ED}/usr/share/man"
 
-	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util}.h || die
+	# drop conflicting header (db is antiquated)
+	rm "${ED}"/usr/include/db.h || die
 }
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r3.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r4.ebuild
index d57d46178029..a7a635ddd3b4 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r3.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r4.ebuild
@@ -11,6 +11,8 @@ LPV=161.50.1
 UPV=35.3
 OPV=67
 DPV=551.4
+APV=913.60.2
+FPV=146.50.5
 OSX=10.13
 DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.6"
 HOMEPAGE="https://opensource.apple.com/source/Libc"
@@ -22,8 +24,10 @@ SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
 	https://opensource.apple.com/tarballs/libplatform/libplatform-${LPV}.tar.gz
 	https://opensource.apple.com/tarballs/libunwind/libunwind-${UPV}.tar.gz
 	https://opensource.apple.com/tarballs/libclosure/libclosure-${OPV}.tar.gz
+	https://opensource.apple.com/tarballs/libdispatch/libdispatch-${APV}.tar.gz
+	https://opensource.apple.com/tarballs/copyfile/copyfile-${FPV}.tar.gz
 	https://opensource.apple.com/tarballs/dyld/dyld-${DPV}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r1.tar.gz"
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r2.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="${OSX}"
@@ -47,7 +51,8 @@ src_prepare() {
 	sed -i \
 		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
 		-e 's/ln -hf/ln -sf/' \
-		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh \
+		"${WORKDIR}"/copyfile-${FPV}/xcodescripts/install_files.sh || die
 
 	# add libmalloc manpage stuff to Libc to automate the installation
 	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
@@ -83,12 +88,21 @@ src_install() {
 	run_xcode_ish ./xcodescripts/headers.sh || die
 	if use man ; then
 		run_xcode_ish ./xcodescripts/manpages.sh || die
+		for f in "${ED}"/usr/share/man/man*/* ; do
+			[[ -e ${f} ]] || rm "${f}"
+		done
 	fi
 
 	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
 	run_xcode_ish ./xcodescripts/install_files.sh || die
 	popd > /dev/null || die
 
+	if use man ; then
+		pushd "${WORKDIR}"/copyfile-${FPV} > /dev/null || die
+		run_xcode_ish ./xcodescripts/install_files.sh || die
+		popd > /dev/null || die
+	fi
+
 	insinto /usr/include
 	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
 	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
@@ -97,6 +111,8 @@ src_install() {
 	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
 	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
 	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+	doins "${WORKDIR}"/copyfile-${FPV}/copyfile.h \
+		"${WORKDIR}"/copyfile-${FPV}/xattr_flags.h
 
 	insinto /usr/include/sys
 	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
@@ -115,6 +131,12 @@ src_install() {
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
 
+	insinto /usr/include/dispatch
+	doins "${WORKDIR}"/libdispatch-${APV}/dispatch/*.h \
+		"${WORKDIR}"/libdispatch-${APV}/dispatch/darwin/module.modulemap
+	insinto /usr/include/os
+	doins "${WORKDIR}"/libdispatch-${APV}/os/object.h
+
 	insinto /Frameworks
 	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
 
@@ -124,9 +146,11 @@ src_install() {
 	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
 		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
 
+	ln -s ../nameser.h "${ED}"/usr/include/arpa/nameser.h || die
+
 	rm -Rf "${ED}"/remove-me "${ED}"/System "${ED}"/usr/local || die
 	use man || rm -Rf "${ED}/usr/share/man"
 
-	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util}.h || die
+	# drop conflicting header (db is antiquated)
+	rm "${ED}"/usr/include/db.h || die
 }
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r3.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r4.ebuild
index ccc6bf1be69c..8de0fcb25482 100644
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r3.ebuild
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r4.ebuild
@@ -11,6 +11,8 @@ LPV=177.200.16
 UPV=35.4
 OPV=73
 DPV=655.1
+APV=1008.220.2
+FPV=146.200.3
 OSX=10.14
 DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.3"
 HOMEPAGE="https://opensource.apple.com/source/Libc"
@@ -22,8 +24,10 @@ SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
 	https://opensource.apple.com/tarballs/libplatform/libplatform-${LPV}.tar.gz
 	https://opensource.apple.com/tarballs/libunwind/libunwind-${UPV}.tar.gz
 	https://opensource.apple.com/tarballs/libclosure/libclosure-${OPV}.tar.gz
+	https://opensource.apple.com/tarballs/libdispatch/libdispatch-${APV}.tar.gz
+	https://opensource.apple.com/tarballs/copyfile/copyfile-${FPV}.tar.gz
 	https://opensource.apple.com/tarballs/dyld/dyld-${DPV}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r1.tar.gz"
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}-r2.tar.gz"
 
 LICENSE="APSL-2"
 SLOT="${OSX}"
@@ -46,7 +50,8 @@ src_prepare() {
 	sed -i \
 		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
 		-e 's/ln -hf/ln -sf/' \
-		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh \
+		"${WORKDIR}"/copyfile-${FPV}/xcodescripts/install_files.sh || die
 
 	# add libmalloc manpage stuff to Libc to automate the installation
 	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
@@ -82,12 +87,21 @@ src_install() {
 	run_xcode_ish ./xcodescripts/headers.sh || die
 	if use man ; then
 		run_xcode_ish ./xcodescripts/manpages.sh || die
+		for f in "${ED}"/usr/share/man/man*/* ; do
+			[[ -e ${f} ]] || rm "${f}"
+		done
 	fi
 
 	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
 	run_xcode_ish ./xcodescripts/install_files.sh || die
 	popd > /dev/null || die
 
+	if use man ; then
+		pushd "${WORKDIR}"/copyfile-${FPV} > /dev/null || die
+		run_xcode_ish ./xcodescripts/install_files.sh || die
+		popd > /dev/null || die
+	fi
+
 	insinto /usr/include
 	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
 	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
@@ -96,6 +110,8 @@ src_install() {
 	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
 	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
 	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+	doins "${WORKDIR}"/copyfile-${FPV}/copyfile.h \
+		"${WORKDIR}"/copyfile-${FPV}/xattr_flags.h
 
 	insinto /usr/include/sys
 	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
@@ -114,6 +130,12 @@ src_install() {
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
 		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
 
+	insinto /usr/include/dispatch
+	doins "${WORKDIR}"/libdispatch-${APV}/dispatch/*.h \
+		"${WORKDIR}"/libdispatch-${APV}/dispatch/darwin/module.modulemap
+	insinto /usr/include/os
+	doins "${WORKDIR}"/libdispatch-${APV}/os/object.h
+
 	insinto /Frameworks
 	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
 
@@ -123,9 +145,11 @@ src_install() {
 	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
 		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
 
+	ln -s ../nameser.h "${ED}"/usr/include/arpa/nameser.h || die
+
 	rm -Rf "${ED}"/remove-me "${ED}"/System "${ED}"/usr/local || die
 	use man || rm -Rf "${ED}/usr/share/man"
 
-	# drop empty or conflicting headers (db is antiquated)
-	rm "${ED}"/usr/include/{db,util}.h || die
+	# drop conflicting header (db is antiquated)
+	rm "${ED}"/usr/include/db.h || die
 }