gentoo resync : 10.11.2017

4 files changed, 21 insertions, 6 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 63ed705b3f0c..a186ca9b50e7 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -18,10 +18,10 @@ EBUILD perl-5.24.1-r2.ebuild 17081 SHA256 65031fd44a9009849ef7181b4a2e9c860a020d
 EBUILD perl-5.24.2.ebuild 17076 SHA256 04ab03a05f633a34a64eae317809ea6d84465d9c68fc3e0d88f23f3086afc087 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea WHIRLPOOL 2746c2eeeb3f6ade4b72027d0e8d3e04276abe4f9495b3c3d106779367a31d21ad2ba128c74099c86a301cb81ab69d5d807e5f3dd78e27b5e1fc8625923d2694
 EBUILD perl-5.24.3.ebuild 17074 SHA256 afbc638fc2b96816d1b90eb6efc5d5778becf5e27f149b50ea88302ff8acd37c SHA512 729ece15a14c7ab5c01d950d370bbf2a299c7782e39fbac9a90e911f7cff4696049284670a679b18fd0f430ecefbcfc966dbc1ad8d79628321efb8ae4ed901aa WHIRLPOOL 48d272286ceb1d0ef5224bf816514a54f10be1da3a9b02bb3f2df96bf73749c946a3c60ef64ea64ac925d766832c7727ac6d9cd5a8aba9c11730cd4037e1640d
 EBUILD perl-5.26.0.ebuild 17985 SHA256 fc7d20774e02c3681595bfb53772a60765746053eeaeffd58a2753b7537c9b25 SHA512 f45357a04344573edcbe589d5da44b5a915a5db8262c7bdc34c73c163a184050d4f0223106696504b8f9f1fa2297b4534313a8513d45aa12240027eef833f6a4 WHIRLPOOL 09c8a57bf356e6000c40f751be446e6d04648bd42ba18b77430ca6f9eab8d6b79b3580eb304e6c630241b573309c729d97d88347a32629e908ab1c31f1412532
-EBUILD perl-5.26.1-r1.ebuild 19106 SHA256 06b52db92357c1a05eaa0e33ed8571a5889b87cd84404f4b151e90bd7fa8c75b SHA512 c0f79b66b5087f80f13ed8aa9c59f3b9ecefc79761bab837af8ccaf490e769babcf169def8d7b4f642fbfb6a71e587bc2ad81190d011261e4244c9453e0e3b07 WHIRLPOOL 04060b57470272abef2e514e386b016e74db6e76dd0b0ba3a12ffdc244105a41715d6987838a71ec3a4c6d1d1b4283f1908621ecc7c2d0d85abcc49061930691
+EBUILD perl-5.26.1-r1.ebuild 19361 SHA256 d0f3f86a196742aedb8046ab1efaddec386fdbdf51a7314563c3be8bb6b07845 SHA512 faf300e65fea48059af5c9e4e7e96519a5c61766524ac8d8f096896aaeda9293bab36e09e0ab4cb3063292677f29315ed142e09f2b4a37092a7235dd8fa4e3a8 WHIRLPOOL b0f9de74d3792e739e774658e76b1e7f43a269d546b1c72a18448c29f7f86da7686b5c9a476e88df05e90ff5dfe66b81ea600709f3712e376328009d9df0d859
 EBUILD perl-5.26.1.ebuild 19090 SHA256 44ac70d043d05744910f1423fd5ac52b7577616b7fd802ddb081d178c5fa3052 SHA512 dcbca9dfd36210eef3d1b57419e711b592479079c10aa212971b9778b82a777f87bead09c907c713cdde7af6292bc29bc57e472f4969830e04d6f09ae10ea453 WHIRLPOOL 462bf0e095c1ca792bb377685d0c25417335c03aaeb67374cb5d6507ab19f4cfea60c97e88f29319e378370fc7a1c3436cc199f28fd0ca9a92575badacfac6d4
-EBUILD perl-5.26.9999.ebuild 19099 SHA256 88d51668df8cd6b6e2d8493928e319dfc7efd9a214133d4a381bff50db4cb7d7 SHA512 23f2609696cd0ecdfc9e987b3f4ca16c1c9a866c8ca4a7f0713dd161884f176b991dcf2a4668b8110b411ab1efbc134f1da089f0a3edc0abca43d572a5a6e8cc WHIRLPOOL 6fe5a7fe9b0fe8340b9fec96037d5b25f7a0177bc08b0179181ce7e56502b63c1b5e2c8596fd837096e65e44dd9e912dccb2d97f6edbaf071f8eeb6438b8d880
-EBUILD perl-5.28.9999.ebuild 19085 SHA256 ea315d3244e781f08241bd18b677c930dabd51096167999f03115d597f136a83 SHA512 f2b553f12150801bbbfd433b592568cc6e35bbbf2b96e29a1246386283a8eaf9e66b8e818a299fc2f80210952d4236ce460159bc2f45ece91aadc082dd6be30a WHIRLPOOL 9caa4c665688fb89e34b3ff022f1f76c91ea02b579075643bfe4a9a3280bad4a7d1fa4a14070e262edd005023bc2c246ecd02de73285a8364b6bb511c53f567c
+EBUILD perl-5.26.9999.ebuild 19354 SHA256 f5f70e884af11690f61f74af789d0dc39feae8284bb9d1078c2701e161e83157 SHA512 9d0c68ab7be7dcc91581fddb70906ab44f4461f750689785ac185bd71bba41b4495248c7d770b7bbc79e624592cebf832899d40e15cf7ec9e6903ed325011457 WHIRLPOOL cb63ffa50721f9bdd50698d61ed661c84e98b2c3afd674a12d8426ca7c0675d56e649dce4d03bd569fcbb360a93f3138256c41872043299316683ffef8ba3929
+EBUILD perl-5.28.9999.ebuild 19340 SHA256 0c27fb68375340fbc3fd8444815409da820f89569d64d3221db538dbb318c594 SHA512 e4dbeb3aafe812279eb9965182761d7f704c7f4cfbb4f1260ac515c7fe48849717302f13f021e6449d812c9c1858f939956f1a0c6b4005c691209f5247f44a79 WHIRLPOOL f1fd6b9327c219bfe1766195a7000aaaf9eb7d3da0ee7c49da1f8214d11cccca53f446318677e3531e5b85301284e347b6b3f03b3ad349660f0b1dddbb7348b0
 MISC ChangeLog 13780 SHA256 57a0f6f6bc7a816ca621af65126c42eb0fe19891e9cfe8ea0eb664607ea4749e SHA512 8bd6e0673b863e40e4f3309461049c95c261c95ffaafdf7bf9a8b801f29017994f152fa0dc5eb3f09b85be832e356a9c08ed1171f7e617a5597e6456ee9d11dd WHIRLPOOL 1bdf46f12430a2a84e66841a4b38e03bacc8f0649e38ba11d7ec23504ef254012c1dc9e1ef333b98619a6dcba6c183640f7b18080831cf37f425fd63d6810eee
 MISC ChangeLog-2014 86908 SHA256 36afb5e482f7c0faf3cb0491c694758752f81a8037fafbf69f33f82a535463dc SHA512 87a6b79f868b97ef1f1430d9616f4f47bc526add8eab73a40065f865a1097bc393001b3457cbfcf876a51cf710fd7d67183932fccdd0a658b9ae8c8cb2e30b52 WHIRLPOOL 536b71f37a08710b083d6df5ecf231ebb6debfaae56f12a5f78b46bf2c419b74eb9f53e35fda4f11c9c95a0a9089c3558b08f575f2c8137fa8fbcf4b19ed098f
 MISC ChangeLog-2015 3505 SHA256 ee4e406b267916f82010b5d51d78814d3ab074cfc720fc0a61e9fcadf45508bc SHA512 6b19ce6be009f9982f2b2d10f7afbc20d7ea46b43b33d906b4a6755df80fb95e0d4175999d8e47986b11d4346bed24b4465374fd3a783e693805df8b72142efd WHIRLPOOL 319a86c0471fcbbbaadebda3a219bc564c0134704a680c21ad0e28c1bba3cc591ffe7c4e331326accc97d1e1869481aa592c56a0b89ee9ae63be12086df172d7
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index cf6794475736..f4f6054d3728 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -347,6 +347,12 @@ src_configure() {
 	# Perl has problems compiling with -Os in your flags with glibc
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
 	# This flag makes compiling crash in interesting ways
 	filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
 		-Dsh="${EPREFIX}"/bin/sh \
 		-Dtargetsh="${EPREFIX}"/bin/sh \
 		-Uusenm \
-		-Ui_xlocale \
 		"${myconf[@]}" \
 		"${EXTRA_ECONF[@]}"
 
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index e8cc6de7891f..3dc88edc18b6 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -347,6 +347,12 @@ src_configure() {
 	# Perl has problems compiling with -Os in your flags with glibc
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
 	# This flag makes compiling crash in interesting ways
 	filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
 		-Dsh="${EPREFIX}"/bin/sh \
 		-Dtargetsh="${EPREFIX}"/bin/sh \
 		-Uusenm \
-		-Ui_xlocale \
 		"${myconf[@]}" \
 		"${EXTRA_ECONF[@]}"
 
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 610c42927718..70e967b70d3e 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -347,6 +347,12 @@ src_configure() {
 	# Perl has problems compiling with -Os in your flags with glibc
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
 	# This flag makes compiling crash in interesting ways
 	filter-flags "-malign-double"
 
@@ -511,7 +517,6 @@ src_configure() {
 		-Dsh="${EPREFIX}"/bin/sh \
 		-Dtargetsh="${EPREFIX}"/bin/sh \
 		-Uusenm \
-		-Ui_xlocale \
 		"${myconf[@]}" \
 		"${EXTRA_ECONF[@]}"