gentoo resync : 31.12.2018

4 files changed, 17 insertions, 8 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index c838628f2497..f03fd0f36bc8 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -11,8 +11,8 @@ DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576
 EBUILD screen-4.4.0.ebuild 3969 BLAKE2B 9777dcbd9eaadba0a16fc019e5af58740eb10181bb62f06d1520dde8d9f7ba9a285514c8d60e740f8c8ead0a677cbf21730bddf33e88aa5ad03570fcbe369cd2 SHA512 9802726e92c72416a3710c6d5988e9d2a136e2db8147784723228ac81d27492160ac738ddc5e6d75eaba5af4e6e23e1eb0f4d06d88199f4d04afe0e44fed0a39
 EBUILD screen-4.5.1.ebuild 4116 BLAKE2B 46e39151346890b58663aa75b214a99b96bbfb06bdf9c03cf3c8f99aeea7cf38659fc14e8412bedbab3f32e2c2bdbf70a89cecd1f9708e451b904bfdfde7dc93 SHA512 5b674abdaf9001196c0190359254718f87902cc05b2170a51a3bcca2d5f7c654d78cd98945f3bf15e4374f8c32a4b800f971b3ed4079247d032e39d595c92cea
 EBUILD screen-4.6.0.ebuild 4064 BLAKE2B 6091efb4d2f52bd5c2e128623b86e9ba731afba4e850118225fa8b911814b1e68f3882464a6d29d26effc3067d2417a649db4b4791322e5b122ea26b50e230b0 SHA512 72ccce15b6b5c9407ae311ba6308b03f88eecba8b88b160a1b02430f45e4154754c1c9682e456afda2ed08ff204f60b74668f28db3c8eac33c0576d73c4630a0
-EBUILD screen-4.6.1.ebuild 4051 BLAKE2B 2059f207ee7210b1d2429d1f77f6b6ddfc385a35677284d4b0b50e13b68c38898d9a9e88dfc83ce20b5281bbc212c36ec67aadc725b36e2a7cd6d6cb5b6df348 SHA512 19c7644857ae0144676659aaf92b6ad671f0b46c184ff63ec578fa2989c632bace893f00828f691348b8ef22a14203b088e4f82da43a4ac478a0cba12c181ec4
-EBUILD screen-4.6.2-r1.ebuild 4089 BLAKE2B cc84459814a932928b7fce199627381ebf927400089d58916957ea22206630b5f1818c2a53fc80019774a032ad15b950220e61c516f2733ac9556a04c9e899b2 SHA512 ecbf7c71987173e8f0ba2e45e9b32f5bdf3ea09bcbbc776584437ec687e942ebe266be0aacd671456225a748d43f5371978bc91a3748cada31b70c0de011a7e9
-EBUILD screen-4.6.2.ebuild 4100 BLAKE2B 57800241f7bca48e44821110ee35dc58eab83801d6fe19de0a4c70f4a42820ed825c81fcf9317edd8ae741efc8aaf28325124643a3cb3454de541d8945c5abf8 SHA512 91fadd575ad2b9600377e877c9c032115669933026e9be16f679757699caabcf9c49217d53b6fb8f10347c021e1fd18022702955ec450984cd2c57b211807238
+EBUILD screen-4.6.1.ebuild 4167 BLAKE2B 8e05fde741adaaaab0d3aa8a67a5da5d9d9a074ef761790ea23922771e3661ef5863dbaaefc594e7642fc084008f5fd17fc5ab5b0988788aaa3216cd7bcddbee SHA512 9c5688deee107cf15df84b363f783754b4cb4e5e57bf1f362597cdbf04238086a92b68d9e9b1e31e245220df8f6e2ec28919316dc845b56efc50035a771b1fc9
+EBUILD screen-4.6.2-r1.ebuild 4208 BLAKE2B 3c340b61e540df74ab8a8563ba1e70d21cd04030f0d19b662631d1156b7bcff181d3594da1649c72d4841ba45b469cad9e107b71d2e7293396f02313c69bddba SHA512 ee4b7477501baff3ea5d3735c117dfa6f5e3edcd9f43f917a5f6b471eb081338f9f3d20f3f2c34b784fe1616f5d124c072d394fc87134a527d14d308f6a9f21d
+EBUILD screen-4.6.2.ebuild 4216 BLAKE2B cba3196d9686f6141b748ce488da66b15cf2a238df269f296e906a5b0f4757e5c68596e3d709ccf5c4608026e796fa8b0dfb652cc7bf2aae313145b315ce10ec SHA512 768286ed5deb2c591d1a1c221f5a66f372915dbefdb17d1c2f3a2a6859e7b309010eba036334b541313bf6769ca3669fdc22c9013869a6e3a0380ccb743d2d29
 EBUILD screen-9999.ebuild 3986 BLAKE2B e40e9ca5125c3e788e9e8346bfbc124d94b28bc6a2f3cc13f2d12313efc883371c5e4bfe13ff77d0f4e2ff5c23a06d043501a8be35b8b40ea7972bc2d445bebc SHA512 e522598323cc369af7cd5e3876fbece8beb92c1d65a3075ced97753d951f30e4a4134e9e88a0d42bc7f32b1977f3fd08aaeab2b4b2d9bade370e8346181d17fa
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index 47cbadae8946..ee99e929f824 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,10 +59,13 @@ src_prepare() {
 		doc/screen.1 \
 		|| die
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
 	fi
 
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
 	# reconfigure
 	eautoreconf
 }
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
index 3d5650e31470..5c29400df81f 100644
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -58,10 +58,13 @@ src_prepare() {
 		doc/screen.1 \
 		|| die
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
 	fi
 
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
 	# reconfigure
 	eautoreconf
 }
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
index 5de7a9460c3f..74566a73346f 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,10 +60,13 @@ src_prepare() {
 		doc/screen.1 \
 		|| die
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
 	fi
 
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
 	# reconfigure
 	eautoreconf
 }