sys-libs/darwin-libc-headers: revbump to include more dependant headers

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

7 files changed, 418 insertions, 186 deletions

diff --git a/sys-libs/darwin-libc-headers/Manifest b/sys-libs/darwin-libc-headers/Manifest
index b3d6735ef293..20c4c8efc5fd 100644
--- a/sys-libs/darwin-libc-headers/Manifest
+++ b/sys-libs/darwin-libc-headers/Manifest
@@ -1,6 +1,28 @@
+DIST CommonCrypto-60092.50.5.tar.gz 606900 BLAKE2B 1b6ab62b1a9fac03c4568f3c0f2a64a2fdccc6f89f0f9aadce4ac9a1abd8ceb780c6ff8ee161bc3b1fd386b602a54c79590ee0c163e3b66a2d49276875a8448d SHA512 52d8108ac7951b3b588069338390d69afa581aecebc85130a46ba8a73316cc1964fe3e0251a703e769a420fcd11c056b03e952301785218dfdc5a31cdb971e2c
+DIST CommonCrypto-60118.220.1.tar.gz 625670 BLAKE2B 8287100e973b7fd69c2f0a9c456b33379f66dd7f27923a3b5a4af1621f8166c0f5ccc6db560bc418067ca3c2dc6d6a7ea33276024deafbd7d53e1b475501d1a7 SHA512 0f109b5b25e8036cf35946028fb078c47e6d9c966380848efe320ee5e53e197a3aa678b998d83c6537d82f1abd20a73bebbb66a09b788a617f573538d81dc342
+DIST CommonCrypto-60118.50.1.tar.gz 622283 BLAKE2B 8f1726190ef67f8777516d6b760846fcacaa61019dc54141bdc2ed06cb955b717e53cface03a87a01201c2e98740d283cf5ecba87e76f62a9d93863cc6138167 SHA512 fa1bd62acf0cd2912e082618024f26efc0e674dc1f4bf925d1c6ebc65eaf224673548bcef26f982892c3b032a0f52183ae4717bc0fefc3c0977a912e22dfeab4
 DIST Libc-1158.50.2.tar.gz 1876052 BLAKE2B 0bc7d8cdc343c6c67d54f4a15b1add6aafb59526ab19021cacc892b2ac652b5a8faa7d9319e5009d7097944f424cfce8b006fc7d8d3ec34b66c6c5b307056e91 SHA512 8d6bf09122f47184ce588ee1b6388fe7cf7cb9dc689310ac7ec56f616cecacc3667f76bfde4325e2a5558ea56ee20d89c626ff9ecd4e5cb7c466220290601a9c
 DIST Libc-1244.50.9.tar.gz 1989821 BLAKE2B 96d8be589318523d6a7f39c46a7a59bf8652e4924e1442130926ab285e4fb2a8f09bd674b304feae1907f747ab7bf3dffee1d1e990ce40ba1c5a4b8c03e5087c SHA512 425229c77d24b2fb6e69cd036460642191c7c6c7887b1e84f2c8f78a2791624a04c9d34bd93443ee7cf09381b0b5043db3bf25bb5f75bff5dd2c042ac1bf7882
 DIST Libc-1272.250.1.tar.gz 2020635 BLAKE2B 7ec6be323928e169a23de08858cfb8f42f0289710538163a43c8543337ad5b1eef214d858388700d773ec75adef6010a94c760a6c0fdb0892a5159d7667d8401 SHA512 787934b4c25cb27dd624d73553baf1af93dee1568535326f8499d2fecf30b396c8e3e2c5f060ec00b9ed098ad1143b3fe1c272b234533fb8889585ae1decab45
+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.tar.gz 390395 BLAKE2B 2d8d1da31ff293da6bdb21b432679c8e96741e5662b0c0b5b2c1233cc9ba6d99ee0d1fb58131702f9d9f875e7349a6620d5ad12d5e366904ea490c423d562a36 SHA512 591e92f060c63b993cd79a6c5fe17d199b30eb2f59c72b653203723f9466dab3d7c63964f87a6e87ac3e0cb515221fd9c53a911b6b63d9c4093bbe6e430e71c7
+DIST darwin-libc-headers-10.13.tar.gz 398528 BLAKE2B 9db448448523dbd2bf438e4f91234c6fb747b8c91f461e1e1f1127b8268a3323139e5ce6eef42ea8b4a03fdb5a55c597ac6229769cbf5d17a7fffee313d2a176 SHA512 8834676930c1150677021dd923e137a8d995c02aaef1f1b6c7c1eff93f3932e629953ffd6b26c186e45a1b4567077e0c0d094fd4aad8154136ed909f289b2476
+DIST darwin-libc-headers-10.14.tar.gz 395144 BLAKE2B 2a45ed22c80f7d74f00b7bb70746ed32c2d4deed6d71921384d73aa877ed9a5bbf1afecc16539cc844d0a20234df4719a3517fbaba0add084ce1f2ec19a6e620 SHA512 e8948ef06d49c6dd8589c812b98f84957684896eac6bc5662a6e31378684ee00efe5d5b1b802ebf31ef1e07a2a9422f85e6a47a0e85cb66b21e8a7dd75c27b9c
+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 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.251.2.tar.gz 303618 BLAKE2B daa53d57ad98e71e12d7f9e3fa4762743c5500ab354cec0b5b14e643ce2243a4b65ccd0d5a77b14730cd29cec753a761d0660794a717316e5750e98ddcc69a92 SHA512 4e46651b37b87bfa2494714df161939083d6f50663cc37ed34504339866bb0957ea571508e4023b7873935eed4a6f4b8318f6ecea1dfc3f28b96ae57daee875e
+DIST libmalloc-166.220.1.tar.gz 277584 BLAKE2B 2fee2a98aa0babc958726522639ddd135b4383bb8328a4d879481e27ec051bd530fc540ba2d959504c457a67536197632e28384959107b103bb466f96223b9ba SHA512 ebbe6d6e5d4cb4e6d928df49c8ab6582e4197ae9b7ed4e1068afd4227ca3e7d22f0d10d47745abcd7f983a75419c8fa7c94d127e3624cee16fa557434b0c3cef
+DIST libplatform-126.50.8.tar.gz 85182 BLAKE2B 3b33b4539acf32358e6288345d33d208fa14fd25d7f1cf8e0af78c6da9c646a57e6f3220f712867d8ffd72e3ffe4ca6f6fce138994c8c825138e7465e4b896d8 SHA512 4c8a15d33aef84075031bf13dc14f1ce31c269ca4117d7249884f980da48ec057f7bf00b75a376f28cf47ff1d03210dbe1bdf2a19b611e5b647c40e10786c7d6
+DIST libplatform-161.50.1.tar.gz 87361 BLAKE2B 569ee093b15a063386dde8c0c7731bc9d1ae7a1377555d83f8c245663d8f79ddcf4287d7cad6c76e519cbc809b4ae0d1698b47f244fe58182eb92b5e1aefa1ce SHA512 d8f47b3eaeaa0600c9df0e11001082f1f211d23ce21c0fa0d7aa86270f4dcb7e7e4691124e9c7618984970c69a4c14c0a3df23a97390dd899130da90ab13a28a
+DIST libplatform-177.200.16.tar.gz 91526 BLAKE2B 699acdef02b7f47995a4c56ecdc28e581e6340eccc851d4a29b4156958e5fb90b4d5f5efc297a988f9de38e7d782cbd5c018509955559161d174ceb25f36a91e SHA512 563f103a8c6ba8cdc36972c0fa412fe82ad8ed347b48472ed3705a39fa17ce19b481e515d999e7493f4d5738551751d247afb16b9fda99357818e795305acf27
+DIST libpthread-218.60.3.tar.gz 186967 BLAKE2B 991569f288813ddebf060c36b7542bd2dab4524f3306b2674f82a7cd452294cc5a2eaab70acc9f13653b36b11439b890134de4f3aadeb38a60a5d10f6932b952 SHA512 3322e4439c72924cd9dda5739c5579e693488636d4ad1f4ba3e94a3f05cfeb0333450a48b317fb2e66e114dacb9acd76c8958c822e7038a4899372263b8ab679
+DIST libpthread-301.50.1.tar.gz 208501 BLAKE2B d9056fc4132e453ed21b054761a3b78f4675258b445fe00949a7aec34465c336d672ffd7a41bbe1f91f071ced1ef2acfbbe1fd6fa79f4bcf7ac089a78b84d010 SHA512 c4f9a4d1e4dcab72a976d5e6272c2d9a9b8e4335312563931d726369dd5cda71e185eeca28cd50e83ed82b8b302af5b7ae40d3b8e147fc426ef1ce17e3f068d8
+DIST libpthread-330.230.1.tar.gz 197145 BLAKE2B 2366a9961862ac5467e48abf1e8a6ab4f240ebb09a8c58a390b49b259aa8ee012017de3a1ab0df6f779f1fc601fe841704c68406ed457f14456041a67038b29a SHA512 6ef2cd2775668ca74f365201b3477e26e6459a2597694d7c12ff203970004abf12deaea7a00b5301ab02344fb390e402e99155bf4e28f28db23928cac9f3bf6e
+DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
+DIST libunwind-35.4.tar.gz 1094999 BLAKE2B 5ddc3bb3dca0ceb5c979fd55657ad3ca0a4601be5594749d26a461ea61f75891b564ea9b4d60943baafe07f924d3750e857c0cd27154aceb130cada1cc83ff41 SHA512 7fcfaf071c6bfecd1b5dbdae6a24186c9741b2d877eaea9f64158278dc19f84b5bc46f09df2a4b81cf40f6dc91594b5411a0084e9e8fefcdbbfd8b53668f2631
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r1.ebuild
new file mode 100644
index 000000000000..266ccf06c137
--- /dev/null
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IPV=503.50.4
+CPV=60092.50.5
+MPV=116.50.8
+PPV=218.60.3
+LPV=126.50.8
+UPV=35.3
+OPV=67
+DPV=433.5
+OSX=10.12
+DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.6"
+HOMEPAGE="https://opensource.apple.com/source/Libc"
+SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
+	https://opensource.apple.com/tarballs/Libinfo/Libinfo-${IPV}.tar.gz
+	https://opensource.apple.com/tarballs/CommonCrypto/CommonCrypto-${CPV}.tar.gz
+	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz
+	https://opensource.apple.com/tarballs/libpthread/libpthread-${PPV}.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/dyld/dyld-${DPV}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="${OSX}"
+KEYWORDS="~x64-macos"
+IUSE="+man"
+
+BDEPEND="sys-apps/darwin-miscutils"
+
+S=${WORKDIR}/Libc-${PV}
+
+src_prepare() {
+	default
+
+	# convert BSD find to GNU find syntax
+	sed -i \
+		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
+		xcodescripts/manpages.sh || die
+	chmod 755 xcodescripts/manpages.sh || die
+
+	# drop ownership stuff and use soft-links
+	sed -i \
+		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
+		-e 's/ln -hf/ln -sf/' \
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+
+	# add libmalloc manpage stuff to Libc to automate the installation
+	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
+	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
+		>> man/manpages.lst || die
+
+	# produce softlinks when installing libpthread manpages, don't do
+	# ownership or /usr/local stuff
+	sed -i \
+		-e 's/ln -fh/ln -fs/' \
+		-e '/chmod/d' -e '/chown/d' \
+		-e '/\/usr\/local\/share/d' \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
+}
+
+src_compile() {
+	: ;  # nothing to do
+}
+
+src_install() {
+	run_xcode_ish() {
+		env ARCHS="x86_64 i386" \
+			PLATFORM_NAME=macosx \
+			VARIANT_PLATFORM_NAME=macosx \
+			DERIVED_FILES_DIR="${T}" \
+			SRCROOT="${S}" \
+			DSTROOT="${ED}" \
+			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
+			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
+			"${BASH}" "$@"
+	}
+
+	run_xcode_ish ./xcodescripts/headers.sh || die
+	if use man ; then
+		run_xcode_ish ./xcodescripts/manpages.sh || die
+	fi
+
+	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
+	run_xcode_ish ./xcodescripts/install_files.sh || die
+	popd > /dev/null || die
+
+	insinto /usr/include
+	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
+	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
+	doins -r "${WORKDIR}"/libplatform-${LPV}/include/*
+	doins -r "${WORKDIR}"/libunwind-${UPV}/include/*
+	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
+	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
+	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+
+	insinto /usr/include/sys
+	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
+	doins -r "${WORKDIR}"/libpthread-${PPV}/sys/_pthread
+
+	insinto /usr/include/mach-o
+	doins "${WORKDIR}"/dyld-${DPV}/include/mach-o/dyld{,_images}.h
+
+	insinto /usr/include/CommonCrypto
+	doins "${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCrypto.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptoError.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptor.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonDigest.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonHMAC.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonKeyDerivation.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
+
+	insinto /Frameworks
+	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
+
+	run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-symlinks.sh || die
+
+	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || 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,utmpx}.h || die
+}
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2.ebuild
deleted file mode 100644
index 6244f28f39ba..000000000000
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1158.50.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MPV=116.50.8
-DESCRIPTION="Darwin system headers from Libc ${PV}, macOS 10.12.6"
-HOMEPAGE="https://opensource.apple.com/source/Libc"
-SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
-	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="10.12"
-KEYWORDS="~x64-macos"
-IUSE="+man"
-
-BDEPEND="sys-apps/darwin-miscutils"
-
-S=${WORKDIR}/Libc-${PV}
-
-src_prepare() {
-	default
-
-	# convert BSD find to GNU find syntax
-	sed -i \
-		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
-		xcodescripts/manpages.sh || die
-	chmod 755 xcodescripts/manpages.sh || die
-
-	# add libmalloc manpage stuff to Libc to automate the installation
-	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
-	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
-		>> man/manpages.lst || die
-}
-
-src_compile() {
-	: ;  # nothing to do
-}
-
-src_install() {
-	run_xcode_ish() {
-		env ARCHS="x86_64 i386" \
-			PLATFORM_NAME=macosx \
-			VARIANT_PLATFORM_NAME=macosx \
-			DERIVED_FILES_DIR="${T}" \
-			SRCROOT="${S}" \
-			DSTROOT="${ED}" \
-			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
-			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
-			"$@"
-	}
-
-	run_xcode_ish ./xcodescripts/headers.sh || die
-	if use man ; then
-		run_xcode_ish ./xcodescripts/manpages.sh || die
-	fi
-
-	insinto /usr/include
-	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
-
-	rm -Rf "${ED}"/remove-me "${ED}"/System || die
-}
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r1.ebuild
new file mode 100644
index 000000000000..0d7e34e9b122
--- /dev/null
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IPV=517.30.1
+CPV=60118.50.1
+MPV=140.50.6
+PPV=301.50.1
+LPV=161.50.1
+UPV=35.3
+OPV=67
+DPV=551.4
+OSX=10.13
+DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.6"
+HOMEPAGE="https://opensource.apple.com/source/Libc"
+SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
+	https://opensource.apple.com/tarballs/Libinfo/Libinfo-${IPV}.tar.gz
+	https://opensource.apple.com/tarballs/CommonCrypto/CommonCrypto-${CPV}.tar.gz
+	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz
+	https://opensource.apple.com/tarballs/libpthread/libpthread-${PPV}.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/dyld/dyld-${DPV}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="${OSX}"
+KEYWORDS="~x64-macos"
+IUSE="+man"
+
+BDEPEND="sys-apps/darwin-miscutils"
+
+S=${WORKDIR}/Libc-${PV}
+
+src_prepare() {
+	default
+
+	# convert BSD find to GNU find syntax
+	sed -i \
+		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
+		xcodescripts/manpages.sh || die
+	chmod 755 xcodescripts/manpages.sh || die
+
+	# drop ownership stuff and use soft-links
+	sed -i \
+		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
+		-e 's/ln -hf/ln -sf/' \
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+
+	# add libmalloc manpage stuff to Libc to automate the installation
+	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
+	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
+		>> man/manpages.lst || die
+
+	# produce softlinks when installing libpthread manpages, don't do
+	# ownership or /usr/local stuff
+	sed -i \
+		-e 's/ln -fh/ln -fs/' \
+		-e '/chmod/d' -e '/chown/d' \
+		-e '/\/usr\/local\/share/d' \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
+}
+
+src_compile() {
+	: ;  # nothing to do
+}
+
+src_install() {
+	run_xcode_ish() {
+		env ARCHS="x86_64 i386" \
+			PLATFORM_NAME=macosx \
+			VARIANT_PLATFORM_NAME=macosx \
+			DERIVED_FILES_DIR="${T}" \
+			SRCROOT="${S}" \
+			DSTROOT="${ED}" \
+			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
+			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
+			"${BASH}" "$@"
+	}
+
+	run_xcode_ish ./xcodescripts/headers.sh || die
+	if use man ; then
+		run_xcode_ish ./xcodescripts/manpages.sh || die
+	fi
+
+	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
+	run_xcode_ish ./xcodescripts/install_files.sh || die
+	popd > /dev/null || die
+
+	insinto /usr/include
+	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
+	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
+	doins -r "${WORKDIR}"/libplatform-${LPV}/include/*
+	doins -r "${WORKDIR}"/libunwind-${UPV}/include/*
+	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
+	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
+	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+
+	insinto /usr/include/sys
+	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
+	doins -r "${WORKDIR}"/libpthread-${PPV}/sys/_pthread
+
+	insinto /usr/include/mach-o
+	doins "${WORKDIR}"/dyld-${DPV}/include/mach-o/dyld{,_images}.h
+
+	insinto /usr/include/CommonCrypto
+	doins "${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCrypto.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptoError.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptor.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonDigest.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonHMAC.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonKeyDerivation.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
+
+	insinto /Frameworks
+	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
+
+	run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-symlinks.sh || die
+
+	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || 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,utmpx}.h || die
+}
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9.ebuild
deleted file mode 100644
index 8de7e71d9cd5..000000000000
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1244.50.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MPV=140.50.6
-DESCRIPTION="Darwin system headers from Libc ${PV}, macOS 10.13.6"
-HOMEPAGE="https://opensource.apple.com/source/Libc"
-SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
-	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0/10.13"
-KEYWORDS="~x64-macos"
-IUSE="+man"
-
-BDEPEND="sys-apps/darwin-miscutils"
-
-S=${WORKDIR}/Libc-${PV}
-
-src_prepare() {
-	default
-
-	# convert BSD find to GNU find syntax
-	sed -i \
-		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
-		xcodescripts/manpages.sh || die
-	chmod 755 xcodescripts/manpages.sh || die
-
-	# add libmalloc manpage stuff to Libc to automate the installation
-	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
-	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
-		>> man/manpages.lst || die
-}
-
-src_compile() {
-	: ;  # nothing to do
-}
-
-src_install() {
-	run_xcode_ish() {
-		env ARCHS="x86_64 i386" \
-			PLATFORM_NAME=macosx \
-			VARIANT_PLATFORM_NAME=macosx \
-			DERIVED_FILES_DIR="${T}" \
-			SRCROOT="${S}" \
-			DSTROOT="${ED}" \
-			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
-			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
-			"$@"
-	}
-
-	run_xcode_ish ./xcodescripts/headers.sh || die
-	if use man ; then
-		run_xcode_ish ./xcodescripts/manpages.sh || die
-	fi
-
-	insinto /usr/include
-	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
-
-	rm -Rf "${ED}"/remove-me "${ED}"/System || die
-}
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r1.ebuild
new file mode 100644
index 000000000000..e6851d945419
--- /dev/null
+++ b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IPV=517.200.9
+CPV=60118.220.1
+MPV=166.220.1
+PPV=330.230.1
+LPV=177.200.16
+UPV=35.4
+OPV=73
+DPV=655.1
+OSX=10.14
+DESCRIPTION="Darwin system headers from Libc ${PV}, macOS ${OSX}.3"
+HOMEPAGE="https://opensource.apple.com/source/Libc"
+SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
+	https://opensource.apple.com/tarballs/Libinfo/Libinfo-${IPV}.tar.gz
+	https://opensource.apple.com/tarballs/CommonCrypto/CommonCrypto-${CPV}.tar.gz
+	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz
+	https://opensource.apple.com/tarballs/libpthread/libpthread-${PPV}.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/dyld/dyld-${DPV}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-${OSX}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="${OSX}"
+KEYWORDS="~x64-macos"
+IUSE="+man"
+
+BDEPEND="sys-apps/darwin-miscutils"
+
+S=${WORKDIR}/Libc-${PV}
+
+src_prepare() {
+	default
+
+	# convert BSD find to GNU find syntax
+	sed -i \
+		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
+		xcodescripts/manpages.sh || die
+
+	# drop ownership stuff and use soft-links
+	sed -i \
+		-e 's/-o "$INSTALL_OWNER" -g "$INSTALL_GROUP"//' \
+		-e 's/ln -hf/ln -sf/' \
+		"${WORKDIR}"/Libinfo-${IPV}/xcodescripts/install_files.sh
+
+	# add libmalloc manpage stuff to Libc to automate the installation
+	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
+	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
+		>> man/manpages.lst || die
+
+	# produce softlinks when installing libpthread manpages, don't do
+	# ownership or /usr/local stuff
+	sed -i \
+		-e 's/ln -fh/ln -fs/' \
+		-e '/chmod/d' -e '/chown/d' \
+		-e '/\/usr\/local\/share/d' \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || die
+}
+
+src_compile() {
+	: ;  # nothing to do
+}
+
+src_install() {
+	run_xcode_ish() {
+		env ARCHS="x86_64 i386" \
+			PLATFORM_NAME=macosx \
+			VARIANT_PLATFORM_NAME=macosx \
+			DERIVED_FILES_DIR="${T}" \
+			SRCROOT="${S}" \
+			DSTROOT="${ED}" \
+			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
+			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
+			"${BASH}" "$@"
+	}
+
+	run_xcode_ish ./xcodescripts/headers.sh || die
+	if use man ; then
+		run_xcode_ish ./xcodescripts/manpages.sh || die
+	fi
+
+	pushd "${WORKDIR}"/Libinfo-${IPV} > /dev/null || die
+	run_xcode_ish ./xcodescripts/install_files.sh || die
+	popd > /dev/null || die
+
+	insinto /usr/include
+	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
+	doins -r "${WORKDIR}"/libpthread-${PPV}/pthread
+	doins -r "${WORKDIR}"/libplatform-${LPV}/include/*
+	doins -r "${WORKDIR}"/libunwind-${UPV}/include/*
+	doins -r "${WORKDIR}"/${PN}-${OSX}/include/*
+	doins "${WORKDIR}"/libclosure-${OPV}/Block.h
+	doins "${WORKDIR}"/dyld-${DPV}/include/dlfcn.h
+
+	insinto /usr/include/sys
+	doins "${WORKDIR}"/libpthread-${PPV}/sys/qos.h
+	doins -r "${WORKDIR}"/libpthread-${PPV}/sys/_pthread
+
+	insinto /usr/include/mach-o
+	doins "${WORKDIR}"/dyld-${DPV}/include/mach-o/dyld{,_images}.h
+
+	insinto /usr/include/CommonCrypto
+	doins "${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCrypto.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptoError.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonCryptor.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonDigest.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonHMAC.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonKeyDerivation.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonRandom.h \
+		"${WORKDIR}"/CommonCrypto-${CPV}/include/CommonSymmetricKeywrap.h
+
+	insinto /Frameworks
+	doins -r "${WORKDIR}"/${PN}-${OSX}/Frameworks/*.framework
+
+	run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-symlinks.sh || die
+
+	S="${WORKDIR}"/libpthread-${PPV} run_xcode_ish \
+		"${WORKDIR}"/libpthread-${PPV}/xcodescripts/install-manpages.sh || 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,utmpx}.h || die
+}
diff --git a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1.ebuild b/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1.ebuild
deleted file mode 100644
index 05521a152d47..000000000000
--- a/sys-libs/darwin-libc-headers/darwin-libc-headers-1272.250.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MPV=166.251.2
-DESCRIPTION="Darwin system headers from Libc ${PV}, macOS 10.14.4"
-HOMEPAGE="https://opensource.apple.com/source/Libc"
-SRC_URI="https://opensource.apple.com/tarballs/Libc/Libc-${PV}.tar.gz
-	https://opensource.apple.com/tarballs/libmalloc/libmalloc-${MPV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0/10.14"
-KEYWORDS="~x64-macos"
-IUSE="+man"
-
-BDEPEND="sys-apps/darwin-miscutils"
-
-S=${WORKDIR}/Libc-${PV}
-
-src_prepare() {
-	default
-
-	# convert BSD find to GNU find syntax
-	sed -i \
-		-e 's/find -E ${SRCROOT}/find ${SRCROOT} -regextype posix-extended/' \
-		xcodescripts/manpages.sh || die
-
-	# add libmalloc manpage stuff to Libc to automate the installation
-	cp "${WORKDIR}"/libmalloc-${MPV}/man/*.3 man/ || die
-	cat "${WORKDIR}"/libmalloc-${MPV}/man/manpages.lst \
-		>> man/manpages.lst || die
-}
-
-src_compile() {
-	: ;  # nothing to do
-}
-
-src_install() {
-	run_xcode_ish() {
-		env ARCHS="x86_64 i386" \
-			PLATFORM_NAME=macosx \
-			VARIANT_PLATFORM_NAME=macosx \
-			DERIVED_FILES_DIR="${T}" \
-			SRCROOT="${S}" \
-			DSTROOT="${ED}" \
-			PUBLIC_HEADERS_FOLDER_PATH="/usr/include" \
-			PRIVATE_HEADERS_FOLDER_PATH="remove-me" \
-			"$@"
-	}
-
-	run_xcode_ish ./xcodescripts/headers.sh || die
-	if use man ; then
-		run_xcode_ish ./xcodescripts/manpages.sh || die
-	fi
-
-	insinto /usr/include
-	doins -r "${WORKDIR}"/libmalloc-${MPV}/include/malloc
-
-	rm -Rf "${ED}"/remove-me "${ED}"/System || die
-}