gentoo resync : 14.05.2020

2 files changed, 65 insertions, 0 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 940b534cd77f..6be96126f256 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -9,6 +9,7 @@ DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bf
 DIST libressl-3.0.1.tar.gz 3668819 BLAKE2B 0e0e9db5018f7fd6c5d3f15dd911e375ae51885321fda2a6bef8f56620ca9d8b63d587f5acdf78afafabdd7ee1243c79bdf9b68a890dfc5f76fa45bbaf060563 SHA512 d2d665734d8aab2b998769492cbb1e7fddead52430ef503650c14786196241a6d1137f47b33ddf2037cc1ff13c240283f591dce83ec0da475619679a051d725f
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.0.tar.gz 3758950 BLAKE2B 0ea1caa80ab54a5346f239dd1205f7fea56cf1a8a541766068c002647144ca6df0e32ff1bb451ebe42100eb27d08ce9afd4a13c2b2c5bab4ffcbcbeae7e4c94d SHA512 365ccf01d4802af048b2a03b6994b17cf051185fa4a0940ae72bd3ec3927467486501d334d2fa7904b07d9364093a97e1b90bb67d3bd8bb1d807643c20a0c677
+DIST libressl-3.1.1.tar.gz 3765769 BLAKE2B 8524a4d83e05b0f2992df8e3797cbf43220a8619431f4737887db2fa35419a925907691ac1aec5b3cc1660179d4ac5e44714540ae591c5aa4957db1f26068a7e SHA512 353a5c95bb0c160b698b95b91d6857ddb63a75b0685a233ed2515f46ad8369d40857aa1ff8407aa9bc78a5c3c29c25376e7a55a3c96fce40840633411944fb1d
 EBUILD libressl-2.6.5.ebuild 1478 BLAKE2B 44e283811242efc54261ad1ab9a6241e3dba2217093b3226084fd143fa9ae30a127833a774cd725608690c720b97fed3e2c00ae92ac109295b485e6e63fd8564 SHA512 ea00fe358ce009a9e916897ffaf949c3c709455f5f69c5517845f2413a5e7559f2e1c717a941ef43e1776f334123cddcc730537428c63e38c7edf7e4fe3a972d
 EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
 EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea53545b5a4dd3c58a8ecbf962a9ab1a8aa6f82868994beef87c6940ac3b5b6999083b20b5641a337d85f11867e4 SHA512 220f19943bb1a1d2951f680128f87d4dd31d8bdbbe7279e87f6e629af326f9117c1a2ea56c5d2ef4b8c803fe1d88f62b11cf62e3ff4ea342ab912d2e1f4735aa
@@ -17,4 +18,5 @@ EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac4
 EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.0.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
+EBUILD libressl-3.1.1.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.1.1.ebuild b/dev-libs/libressl/libressl-3.1.1.ebuild
new file mode 100644
index 000000000000..48642f97b49f
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+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/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( 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"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+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
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}