gentoo resync : 08.05.2018

4 files changed, 4 insertions, 60 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index c8991b1ddad5..96705e22f16f 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,7 +1,5 @@
-DIST libressl-2.6.0.tar.gz 3297288 BLAKE2B 8906227a1d125e32afafb666e67c1364d764234d6a3c389c59f820cb5d778133811cc4be06de948fe6375e36ceddd061e1736e3b0fe3511e8807f5cb9fddc978 SHA512 e195c6a2c9680cfaaca31bb6d3392fc6f725efd2a2d18b9a24d457d035a581c88630e6a066a4a4e0903e71f3ae3c30a031eb4f58281e483fdf1d877227452e9a
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
-DIST libressl-2.7.2.tar.gz 3364227 BLAKE2B 49da6903a63425ac246c574b4c842706eaff184ba4a1768f61b2007296cb915f944f80f79edbad12b1a28a5552282522aa2b037195e2f917c06cf6917f1642e6 SHA512 12d00d057d449eb4119fc2f07034ebc0f1bbcb1602c0e07ef03b50440045eafd70594ddee352946cd9409aed8aceeb6988ba1643f582566fe3498499d94ece49
-EBUILD libressl-2.6.0.ebuild 1351 BLAKE2B c50aef1bf338ac7cde282311f4ee82fcf0b7174c419fc64b632222b1efe0b59d0845d072623e7e27bde8152a0b353d9ae727322db98db9be3cba609ff4df56f7 SHA512 6f02a29826b0ff0c97c24ad11a93420e2a3638531b67ed09d8a22ab1e7869994e266da9ddf4a05fb1ec3ea4147a3648ffc270934775925bdc3f782768b5edbd9
-EBUILD libressl-2.6.4.ebuild 1353 BLAKE2B a7885671883289a1723ebe3c8d02885b30668bb1dfc37a418b5c0ca964c75a01c688279f43ba863cf28e4eacf61d0ff1946c651eacb48684efa7767026ac68ee SHA512 52257e618750254f0fc49c881c30e7058f6d82724930710e7cb19b5ab02dfba3cfa0b201058444c840e2b695de3fd85f13dddb0e9bae9b0562c9b02be3d61cc5
-EBUILD libressl-2.7.2.ebuild 1438 BLAKE2B fe80bf7a55c9fd8efb2b0948bdc9d102d0753e5211dfecde52f44198b57b5d215f9721b60638378f90b2e7180d8626e090f8bb1dcbad0441e172d0f24351d9fd SHA512 c9f3f7b674148040fce9e111ccdea869c80b67b48a6945b669306e6a39cd2b50c9ab4b409c2ee75b3ba5b4d84b2c01ff5e8a1d654d7a1d8bfe290e5f83800b7f
+DIST libressl-2.7.3.tar.gz 3364724 BLAKE2B e245cd0e3c4819e12f3f05898429c10894959d9bbe27bfca38543ec304a84abc8edda7c968eb8d25e5c589011c5482060d05bd1e5aef71c13708ec804cd05a72 SHA512 5fafff32bc4effa98c00278206f0aeca92652c6a8101b2c5da3904a5a3deead2d1e3ce979c644b8dc6060ec216eb878a5069324a0396c0b1d7b6f8169d509e9b
+EBUILD libressl-2.6.4.ebuild 1352 BLAKE2B 534573071ef72addd3c5ba00c2660e8d2b1ab09acff56d7e072c59ba4eaa3a9dc3abd859791ceb968318425d5b90d1f7b7c87f3f7933f054615173e580776f08 SHA512 605fda0d2e4935171e6b22ace0e35eeb7483c320ab64baf78737599f367843d82266fe2953526f75b9d64585d1e948e73ce94af244d996d8fedf5c59d4b7ffe4
+EBUILD libressl-2.7.3.ebuild 1358 BLAKE2B 55a2f05f0042d113c2bbf0c01831e41dc08960d34a8aebd00b15b9c866581a928d9a1ef02bf7f2fea67b3a7f6eadd9cebcfe92a52ca28707efe18fdf2e49c330 SHA512 45499b0db8205bcb7f3d7d1cd0b2aca1cc6433918af9d94016c96d5b95ce9308615571221882ba9e6d0717ca6a6ce8a6c360e5f3de0e34e0d08e922f359ee70e
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.0.ebuild b/dev-libs/libressl/libressl-2.6.0.ebuild
deleted file mode 100644
index 2613eb39b531..000000000000
--- a/dev-libs/libressl/libressl-2.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-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/43"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="+asm static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.6.4.ebuild b/dev-libs/libressl/libressl-2.6.4.ebuild
index faa38895b6c3..92e14dcaaa9a 100644
--- a/dev-libs/libressl/libressl-2.6.4.ebuild
+++ b/dev-libs/libressl/libressl-2.6.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/44"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libressl/libressl-2.7.2.ebuild b/dev-libs/libressl/libressl-2.7.3.ebuild
index c082e6648668..b9bfe8bd72d6 100644
--- a/dev-libs/libressl/libressl-2.7.2.ebuild
+++ b/dev-libs/libressl/libressl-2.7.3.ebuild
@@ -14,7 +14,6 @@ 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/45"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"