gentoo resync : 22.01.2019

4 files changed, 15 insertions, 5 deletions

diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index f4f5c8fc3f07..2787117d16c2 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -6,7 +6,7 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
-EBUILD libsodium-1.0.15-r1.ebuild 1044 BLAKE2B 1e07b5338e770271c8a0ea1833d066d88b95a61992dd5cb98da4ff5e3c897c221e6c11651871619f145bf4f55fb42b1c993fd7970470913356c8b94244a1e633 SHA512 bcf15ab7e59a53ee010fe61cf76715d46ec021b4565c51fb363513e6b9e65cedd4ed4369dad97e3c65d6e71d29ef7e1a85f7883f97c54820a1edc527ae787abc
-EBUILD libsodium-1.0.16-r2.ebuild 1195 BLAKE2B ae355b038ae057b6779d33d4f2fbc198b02c66152869c2143528a8e443b563eeb6a344d53ec83fb3e502d08bee9e8ba80eb7445e33cc76c5006374ec93b841df SHA512 58a1df0ca09c5c6275f9af6ec153146fe212a955ffe04614a8e1ddf218aa4ce054333ffce8f642e8bcff9156f2ad46c06a291fbe8d6908e790c93e509896bd81
-EBUILD libsodium-1.0.17.ebuild 1201 BLAKE2B 78187b846b6684bb38c7f37a7c9907ce1e7079208b88762af86a78d25368e0a08266c7415e1e8e322922ffbdc1f0bfe2c3db27e5f1bedf8a39ffa9d2490d7ae3 SHA512 e94631c074eb8318a94e7605abba110e0e1e9c209028af00f954c9995cd8776c23c42694e4225caea117ba6d2e70638b9cac07bdcc50a6495caf4c50bb82d723
+EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
+EBUILD libsodium-1.0.16-r2.ebuild 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
+EBUILD libsodium-1.0.17.ebuild 1306 BLAKE2B da03b755da6c2afa42c04c629d2f5f446f6b53bc1e5ad037e14451297eced8491ecb0c3741317f1784b5167aa34b6a024cd157f35b2aff0705d38b00cf7ba515 SHA512 13922c24a0abd9b75bb7716bef8f82ad46005a72c81350a90dc510f85005a34b30ea9f23df1a01caa9b4d6bb4f2a9f79de376bd875594fce00cf34e5d30a8333
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
index cbf53540a9cf..ae0419e4c365 100644
--- a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,8 @@ src_configure() {
 
 	# --disable-pie needed on x86, bug #512734
 	use x86 && myconf="${myconf} --disable-pie"
+	# --disable-ssp is needed on musl x86
+	use x86 && use elibc_musl && myconf+="${myconf} --disable-ssp"
 
 	econf \
 		$(use_enable asm) \
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index 393a0f21ab8e..fe6573407753 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,10 @@ multilib_src_configure() {
 	# --disable-pie is needed on x86, see bug #512734
 	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
 		myconf="${myconf} --disable-pie"
+		# --disable-ssp is needed on musl x86
+		if use elibc_musl; then
+			myconf+="${myconf} --disable-ssp"
+		fi
 	fi
 
 	econf \
diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild b/dev-libs/libsodium/libsodium-1.0.17.ebuild
index dcfe073f5754..ca8df8c8f25f 100644
--- a/dev-libs/libsodium/libsodium-1.0.17.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.17.ebuild
@@ -34,6 +34,10 @@ multilib_src_configure() {
 	# --disable-pie is needed on x86, see bug #512734
 	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
 		myeconfargs+=( --disable-pie )
+		# --disable-ssp is needed on musl x86
+		if use elibc_musl; then
+			myeconfargs+=( --disable-ssp )
+		fi
 	fi
 
 	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}