gentoo resync : 10.11.2017

4 files changed, 60 insertions, 3 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0a234ad0cdf8..305c744c2170 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -6,13 +6,15 @@ DIST libressl-2.5.5.tar.gz 3283158 SHA256 e57f5e3d5842a81fe9351b6e817fcaf0a749ca
 DIST libressl-2.6.0.tar.gz 3297288 SHA256 e48d557474571792699000c32ae97dcef34207d13ed93e4126f213d5dcbe8a53 SHA512 e195c6a2c9680cfaaca31bb6d3392fc6f725efd2a2d18b9a24d457d035a581c88630e6a066a4a4e0903e71f3ae3c30a031eb4f58281e483fdf1d877227452e9a WHIRLPOOL b9e481f9ea6c9c35438d093883f2794a3d4a3b4e34beef2df03bf32674cb0b61709381f6810f31fe31f2e4b784c90e1a263e75e5eda2f822ca77969f32a22469
 DIST libressl-2.6.1.tar.gz 3219005 SHA256 c293b3b5f1fc1d6349c019c3905355d577df32734b631d7e656503894e09127e SHA512 89f1a796c14bd479f20407254a0d787b4200b3b633f5c24e23f16751ff973ccbf3167d676ed13a5004614b5c8c3e1c73c89dce3d5b1e81890ef6ef2774df9b72 WHIRLPOOL 8623863d710bba80f5b90802f06e302960a22bc846946b4c5d2581677f59c37cf59a4d1e5fad787b8bd41b2d3d994d60c6065504cdb71a90cf5b299c2081d8cc
 DIST libressl-2.6.2.tar.gz 3229140 SHA256 b029d2492b72a9ba5b5fcd9f3d602c9fd0baa087912f2aaecc28f52f567ec478 SHA512 2896d52185b84edfb23eae73949f5a537966b42e659f00b0b2e0635e69daf546fc41e0e7b97cb52a85e73b2d27ead221a3225977f6b5ee998aefdabf0908a9e4 WHIRLPOOL 780e1b5175a8eed3ee6c5ccb98b77343a004b0dfff614e051a6cbbb315a4cd25e65a6cc99131a4f480368eadf15a7904028f84f5ab60f7f27475124c34ba325a
+DIST libressl-2.6.3.tar.gz 3228661 SHA256 aead6598263171b96970da0d881e616d0813b69b35ebdc5991f87ff2ea7f5c98 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9 WHIRLPOOL fb62059bdf66259735a3928a93f686c5a2447e7801185388d2056b8095da5aad4150ddbaa5339f6a5dc7b1967ead5518678d2cfc23d67f87c34020968dfacd0b
 EBUILD libressl-2.3.10.ebuild 1286 SHA256 c2b96a336b71b42bf9f226757d1822b03b48e664c4bf7c79f72aad17b23c21df SHA512 76484d1bb29bb2e0bef2e6c536b3083229087ebd7dc23572e747bd130e5a86aa71ea4aabdc1bccb837dc0871f9122c560fc6d7f71f0bcea85ed28030c1599836 WHIRLPOOL da2f3580bbc562e760564ab4ff347d3bc8d3a64430758883ad1358da8676e89d3dbd0b745d59c87874a1031fd52ef32fd234b6b0c3a3f99a9b869939fbfb711a
 EBUILD libressl-2.4.5.ebuild 1286 SHA256 a2710ddfd4122acc0a639d362f2f2698f1e2f9f8af3d7c2688225d97efb326aa SHA512 b623271bfd541eee7eb7dc9931f3bf32f065d6eb812070809a44367b39cf970c388481e5cf7a50395c545bd41052ea87a24e29ed8fe26fc632f460fe2685866c WHIRLPOOL c6afaa6d998826f791343cb461bdd7a8b5a4d1d871d43d741fceb55215d9164d20204521d9d1b5ec16521239243bc565016ef884a6459d1d6600e4e9059f7cc6
 EBUILD libressl-2.5.0.ebuild 1293 SHA256 38fdfe61f3de6c2112832a1caf40658526b7fc50980151d787444d0a3f210e0b SHA512 cf663c2b97f4a3ecd2084861258f382333ca471a84cd767aab5e17c69d42693d946757348ee5b6cccd24ff380d70eb49504a70dec4461afbffb943d8282fc277 WHIRLPOOL 17704602308283a48a51bafc2985f533950703784152f621a877c9410bbd103ab78a580c19e6b0f0fe12a4d40f77fbf95f4016633ab2c4777644b937ae2bf2f4
-EBUILD libressl-2.5.4.ebuild 1306 SHA256 cd517214cd6a7929e41d5d6a1a4dfafb8f9705cacfe25344621b6b6243f0cea1 SHA512 fdc5f6c7c1cd36e3c05aa8036c4d5a8071c17b7580620f47b693a5156414cadee158e077860d0e7b86528038faf45d9454853192f3c255ecb862fe488b9480ed WHIRLPOOL 921f7296a0414d458fc420f5d81ffdb036c7d4b83d340dc39cfa9daa8ae69b4eb3b69afda533aaedcd8e42fb8e7a16e41a4b91a1daf81ab713696ba1f58a193b
+EBUILD libressl-2.5.4.ebuild 1313 SHA256 9b14e0ee466bbdda2c5d2b502cfccd58a30b5a7d35d7ffc9d69f463455454634 SHA512 2f8f2b47af5aa114ecf3ace8552b679c5e5735d0320f0615dc7e4ce7eb3d63b8e3efaaf6379b3e776d363d008370f900f27e38e208e04fbc10ffe516d3ca4ebb WHIRLPOOL c941bce8ee6a3ad64a3d12e57e59e8ee59176710c44a8ed4d0523e800549be6c9157f38b00de6a968390afa159bbedbcfca2e4b8f75a4bd228e5e0119d79ba71
 EBUILD libressl-2.5.5.ebuild 1306 SHA256 cd517214cd6a7929e41d5d6a1a4dfafb8f9705cacfe25344621b6b6243f0cea1 SHA512 fdc5f6c7c1cd36e3c05aa8036c4d5a8071c17b7580620f47b693a5156414cadee158e077860d0e7b86528038faf45d9454853192f3c255ecb862fe488b9480ed WHIRLPOOL 921f7296a0414d458fc420f5d81ffdb036c7d4b83d340dc39cfa9daa8ae69b4eb3b69afda533aaedcd8e42fb8e7a16e41a4b91a1daf81ab713696ba1f58a193b
 EBUILD libressl-2.6.0.ebuild 1302 SHA256 c787b068b05070e84a6536d21ef458119bb746475e0fa511ebe68b32afcbf631 SHA512 3546873fef3a9fb5fc8c5bf4ecf97ee129d270767526a052d4872b624506f3e90b001ade330e4d95e8207e4f4ee4348c2d89e21a4e4948737d103412c4164e5c WHIRLPOOL 6e80f5335955cf4719a42567b5a04c9e923bbaf8d751f5c3a56a2886674eea267017e272367c657499d4ee39e58ef5980a554077af2f494912dc7d8833a8b517
 EBUILD libressl-2.6.1.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4
 EBUILD libressl-2.6.2.ebuild 1306 SHA256 d5b29aade2526fd046543ce98192023cc5b0018929f75d9a9eaf5edff9b4bba2 SHA512 68a9d1cafd6961009fb4e702b34cff9ef247c802cf0ee0d7a89f5d72512895edfa5edfca15acedeb22fd6cec234517f3afd84c54b6be06b4adb52985d8a0d6d5 WHIRLPOOL 23d48f878a6221633e137c6694ddb571e3bf1462ee50c489bd002ed051a7428c6880be4122d3a6ceee17f2a75af01a69b2bd25de7d4adc82e3f0a6f9dbac8dd4
+EBUILD libressl-2.6.3.ebuild 1377 SHA256 c66c90b6a74e75b6d0e7b2506326938c939dd8effebc677924ce7486f0d2d9dd SHA512 ce509e74001458d7f1b59e4769da2c29d27ff06001ee754f3f8bcd0d0e025dbd27318a72e7e5b610456f627f6706114e6ceed6675109241cbec891763c344c30 WHIRLPOOL 6669b2c49134305694adadd825e74081180f06b620b37db8d6c637a9b3092c9bf1b38090750365fd78a174b2f5b945b68f1aed29a34a870745d84e4a890f155d
 MISC ChangeLog 6269 SHA256 054b8922c785b18cd0daa0a4b6558c0fc7cb1038607ff93025d8325d57b4975a SHA512 4e5e249d7081aa5ce74c0190f6f656196ead36ff3bd1d45bc2717801f691b1d5de456f37a825b59a3f07d3310315fbbdbee1316b099fbd22c17663476eac19f2 WHIRLPOOL ccabaac1a877cba13a4c44df7c6277c3730cff63f5cf256b41e7f7a17210902f9e6ce211d2d7cee709cbfda1703101546db832d5919ef7c123325372400a0ee6
-MISC metadata.xml 986 SHA256 7ae348d550d88fb3adc70de87d9963e378107a62d9b2bee243c2ba209a537724 SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe WHIRLPOOL 204fe8fa33c937c85edaaeed1e995d92489452c93231d1e5fc44b79a620d86c5b79be10245487bad31a35d4bb09458bf7cf3ce55d0b486d092ff7a36abac67de
+MISC metadata.xml 1051 SHA256 92477deb25376da7267b638c5488e99ab8c99da3cc9174dbbfc4698b8cfbde13 SHA512 781e76c37667200d669dcc9057d59a41014916a0e9917595ffe70e5e379a35f86290c547fb63c3f7f8596a3901f602948739874bd1c137e5f9f9b498db4218fe WHIRLPOOL 61c4d264ded6c5d18a0baf16982693da1cc9e61d4769720800f5fc6fceeafac7ab9d105b6f05b3b3416ee07808cc78910b84f4913412b8850ceb0305d10cedbc
diff --git a/dev-libs/libressl/libressl-2.5.4.ebuild b/dev-libs/libressl/libressl-2.5.4.ebuild
index d87e79cad652..c3786d800a14 100644
--- a/dev-libs/libressl/libressl-2.5.4.ebuild
+++ b/dev-libs/libressl/libressl-2.5.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/43"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm static-libs"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-2.6.3.ebuild b/dev-libs/libressl/libressl-2.6.3.ebuild
new file mode 100644
index 000000000000..6372f13faa6a
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.6.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/44"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm nc static-libs"
+
+RDEPEND="
+	!dev-libs/openssl:0
+	nc? ( !net-analyzer/openbsd-netcat )"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	# Correct hardcoded paths to use ca-certificates instead of cert.pem
+	find "${S}"/{apps,crypto,tls} -type f -exec \
+		sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ASM=$(usex asm)
+		-DENABLE_NC=$(usex nc)
+		-DOPENSSLDIR="${EPREFIX}"/etc/ssl
+		-DUSE_SHARED=1
+	)
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Delete cert.pem
+	rm "${ED}"/etc/ssl/cert.pem || die
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -exec rm -f {} + || die
+	fi
+}
diff --git a/dev-libs/libressl/metadata.xml b/dev-libs/libressl/metadata.xml
index a7201a6f607c..9a56130ae30a 100644
--- a/dev-libs/libressl/metadata.xml
+++ b/dev-libs/libressl/metadata.xml
@@ -11,6 +11,7 @@
 	</longdescription>
 	<use>
 		<flag name="asm">Enables assembly</flag>
+		<flag name="nc">Installs the libtls-based netcat binary</flag>
 	</use>
 	<upstream>
 		<changelog>http://www.libressl.org/releases.html</changelog>