dev-libs/libressl: version bumps 2.3.10, 2.4,5, 2.5.1, remove older

Package-Manager: portage-2.3.3

6 files changed, 16 insertions, 114 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 0821c960a4bb..ce8d47ff1cf5 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,7 +1,5 @@
-DIST libressl-2.3.7.tar.gz 3013807 SHA256 f59f5d859ce4867cc4761a13d02024f699491e277d54a9fe76e053e5b5f70860 SHA512 5774ab7aa0e4c8f7c61c01192d6c5a782cef57022fcdc64cc61180b4f2ae483145c2e91d56eae78db27dfce04a7ca67fb63e6ce8a8b84b4bc961f65a2a108747 WHIRLPOOL e68251d15a9a2dc9d35b3a4bfd092f7e030d0ba03339f000f201bd297190538368b12324336e5437800bf3b2f481ff739027d30f3f26367ddd48937f35a8f4a3
-DIST libressl-2.3.8.tar.gz 3013999 SHA256 ae6aa4ed2c7d201310fef184310a85c88a315506f633e93fcdeaaec0d5a54fc2 SHA512 5cd99e740894afffa6803087dde4e4207e035bf6f440904fcd4439ca1f63f22bdfe367423b2e95264bef06d1a0f929526d90e623864d0f7e99250a4f825bf282 WHIRLPOOL e4afccd135d0f5cda295e9fe06d81eb0f5fcfb3ffaa18ed2d9a06e5d2fe1c196dc7912eac7e5427f6aa62564f7e6432f00154d5fc11de207da91c6c9d334a254
+DIST libressl-2.3.10.tar.gz 3015911 SHA256 2d0b5aade0c5ed31a3c194fad5f8dd71cdd218b70205342739d24a625a54c4d3 SHA512 c783a1923a03a9c7c5d77a16dd4f9c798374c50e332ee7bc94ad6d5c2e112fb3db1de987ce84b3aaf822a1f68f4385270fafd687870bc8b275cc581619cb1d1e WHIRLPOOL cbfb31375b767f74e73ff04078cd2ef0b23501900269770e9b540d9ee58714e1f87068b8c11799e62d78edc22eeb4e535c61c6db4a63f3f3b30ae90871a2269c
 DIST libressl-2.3.9.tar.gz 3014155 SHA256 a6ff13664eb13af6dba00259cfb55a306b32b7688feef520a52fc0f60b8196fc SHA512 3b0f27d419bc6f69d6fbde8f3b6e6abcda86591c0400e49e2d4327b834a3996fd7838a2cfa3a999c4e949e29f7d1ee319e26ee4c2b1a25b3fb4f07fe15345810 WHIRLPOOL 26dd4c09f114bc533aad6845bc2110d1aa400032dc20f0f496bc049e8866acb6b5157973f62fcd4047c742247aedc9f28ea2ee346ab19a07395ef27202422e44
-DIST libressl-2.4.2.tar.gz 3021644 SHA256 5f87d778e5d62822d60e38fa9621c1c5648fc559d198ba314bd9d89cbf67d9e3 SHA512 abacecb318a787f5ef9d8469638b7485fe237d4d993f410d7da8c0773ab8eff8c7da988fe965f793b268711afe599dc28f994eedeaa2aafebeb40faa30af38db WHIRLPOOL a2cdd3109dd200fa9dc4ae0f47f536b2b6d68fd2e53901d4f90a8f39e71af41010d925cd408616f8e5da56f7a8b0397ab21cccca5bfd32ac68ee9bf48ccbb99a
-DIST libressl-2.4.3.tar.gz 3014721 SHA256 bd5726f3e247e7a7d30ce69946d174b8fb92d999d22710c65f176c969812960e SHA512 db3b585ca727eb3e5c5929200c8c86e01559f0d23edcddd6715141e596a3a72a9dd1a69fafda10239def92b586fc582578ecc0bf12bdfbaf083d18e0d3fe5300 WHIRLPOOL eb38d65066e007b7dc88eb26a634c8e45045a8c8a2b5ec19e082607e894b509d1ce93297b77313b1a4f6b12146a22397881e0af78a4e1bff79bfbab55c583c71
 DIST libressl-2.4.4.tar.gz 3014463 SHA256 6fcfaf6934733ea1dcb2f6a4d459d9600e2f488793e51c2daf49b70518eebfd1 SHA512 3999e1a61d3e5f14fbce72fdb0089eaf1481fb20f8675a56b2ce8b5388cf7e1ef7d2f66d9593960b708037537053b47f87b2a7f820504213a756b21c34584fe4 WHIRLPOOL 8c3f2b78a31243f49a2e44ad2e43db6637465886652d164e290344fbe207479913a20d857514fd88cf0429131fb64ef2d31eefb178c362d779c400110e9605f1
-DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
+DIST libressl-2.4.5.tar.gz 3016462 SHA256 d300c4e358aee951af6dfd1684ef0c034758b47171544230f3ccf6ce24fe4347 SHA512 bdbd0fcb868e77e5fba26da7653fe6e7f7b5017455e1beb13e11b42b8db0742b9ca6442f0949adc91ddc1f53fb93549a6c0529795cd34db2bf887cbca2d33070 WHIRLPOOL 1caa2e18304ec86f15f73e935a586d774aaa3c4248970596a7fa869f718ef9d12f6211e2abdbee90af4e4f83dfba77b45b3529dcc1077fe71e26e3beecf38bbf
+DIST libressl-2.5.1.tar.gz 3266271 SHA256 f71ae0a824b78fb1a47ffa23c9c26e9d96c5c9b29234eacedce6b4c7740287cd SHA512 44557c7c3e6bc9c0af9ae83b26765be9707d53708a32a5a945108a49ea20503afa4197919801830d27821c069b87e0e0edd284bd1b8a85340dbc0da2c162c2f9 WHIRLPOOL e31b487e9e88f372cd22db05e54e74900181120cf8c6105f5531658e7b467722680921f3630b8943ee0ec5f5777cb76a7ddc64e4d43f166903928aaa4f98509c
diff --git a/dev-libs/libressl/libressl-2.3.7.ebuild b/dev-libs/libressl/libressl-2.3.10.ebuild
index f65fed526d33..117bdc1ab93d 100644
--- a/dev-libs/libressl/libressl-2.3.7.ebuild
+++ b/dev-libs/libressl/libressl-2.3.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib-minimal
 
@@ -33,6 +33,8 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
+
+	eapply_user
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libressl/libressl-2.3.8.ebuild b/dev-libs/libressl/libressl-2.3.8.ebuild
deleted file mode 100644
index f65fed526d33..000000000000
--- a/dev-libs/libressl/libressl-2.3.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://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/38"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm 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"
-}
-
-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.4.3.ebuild b/dev-libs/libressl/libressl-2.4.3.ebuild
deleted file mode 100644
index e6602882fd3a..000000000000
--- a/dev-libs/libressl/libressl-2.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://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/39"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm 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"
-}
-
-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.4.2.ebuild b/dev-libs/libressl/libressl-2.4.5.ebuild
index e6602882fd3a..e2df5d1bca05 100644
--- a/dev-libs/libressl/libressl-2.4.2.ebuild
+++ b/dev-libs/libressl/libressl-2.4.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib-minimal
 
@@ -33,6 +33,8 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
+
+	eapply_user
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libressl/libressl-2.5.0.ebuild b/dev-libs/libressl/libressl-2.5.1.ebuild
index 7ae4ecfacd51..2155a44e5702 100644
--- a/dev-libs/libressl/libressl-2.5.0.ebuild
+++ b/dev-libs/libressl/libressl-2.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils multilib-minimal
 
@@ -14,7 +14,7 @@ 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/39"
+SLOT="0/43"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="+asm static-libs"
 
@@ -33,6 +33,8 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
+
+	eapply_user
 }
 
 multilib_src_configure() {