summaryrefslogtreecommitdiff
path: root/net-libs/mbedtls
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-libs/mbedtls
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-libs/mbedtls')
-rw-r--r--net-libs/mbedtls/Manifest15
-rw-r--r--net-libs/mbedtls/mbedtls-2.10.0.ebuild94
-rw-r--r--net-libs/mbedtls/mbedtls-2.12.0.ebuild94
-rw-r--r--net-libs/mbedtls/mbedtls-2.16.3.ebuild94
-rw-r--r--net-libs/mbedtls/mbedtls-2.16.4.ebuild94
-rw-r--r--net-libs/mbedtls/mbedtls-2.17.0.ebuild4
-rw-r--r--net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild105
-rw-r--r--net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild2
8 files changed, 5 insertions, 497 deletions
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 2d5fdef8cd40..097f44babf57 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,20 +1,9 @@
AUX mbedtls-2.19.1-zlib.patch 1163 BLAKE2B a5b44c2af4d9e7dd37a004063b69ae9878bf240abcd75376c14e73b01a99586e06da1ece285cbbb06905dfbeff28c173bb9d170a9a22ad1045fa20b225185df0 SHA512 cc8128b55383caddc9a3d51a22222b5da51b41bdaa0b44ad4d9a447b85b9ac96eb7aa7c9e88823e62ec51ee5567531138741f03603c563cfe99172226e61ed73
AUX mbedtls-dont-overwrite-headers.patch 2183 BLAKE2B 1353eb9c929e4d79bc1f4eecd671c9b6602917198724b42e1b43153a4751cd5a36737fd706f97e933beb857a246dc16574f4d989cc674661dd774f7df9d1c3a3 SHA512 19dec50ce70821b0c94e7bd9c50c1f8ebd7d7abc087cb91a637e5349ac938b4b07236f7fc4580e4a348ecb9de68d4b0b45cdced6e5103ce94178be710b2563a3
AUX mbedtls-un-pebcak-705038-wrong-file.patch 2766 BLAKE2B df7ef73f53f4a2b69cc8b435d21decffb580d28e75b9ec52620c305dfc395cc088cf7e4bbcaad381a3c9f8587b1678700d8df1cd65ceeef8079e4ed250ec9ec7 SHA512 376a5c7009122b60345b9edc3ce8a2f765d1c7ef11f6a398a9b9fe1c6e4a9d36d62483f036a6c77e21fc86f2900d9d3a7c477582463a80121097a56cb08a0515
-DIST mbedcrypto-1.1.0d0.tar.gz 2907562 BLAKE2B 645b8eac1c55e6217d7b309e1b9ddf856f6d565f928e04211bb5714189024bff8f445a8e6c709d6b2e700d9390521cc31d194f4a98f7f211af3ca9b7109d7549 SHA512 923f8b18eaabae56015607442e996d77ddfd68443e3d33176ba9fe1c5a53fe611af584b5d8dc2111fbda41e5396921d6be9a3a3837cd4d85671237e0932f5cc2
DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a
-DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d8eca110633960c8197becf1fb64b77e36f2bd63e241ff0a3eb86aae1b6b538de2043e1bb6626b9b18fa9951db91 SHA512 a1dcb46d3e27c93b511a0dc846b5ed6dc35992cdcf04fce6ad83f5a92440d11d60a07e0fec64f9d6c5e2f27365bdd7a557a35af4ff250b342adbde6193240a95
-DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
-DIST mbedtls-2.16.3.tar.gz 2459563 BLAKE2B 5de21b27274dae61e282114da196078be7931e823750f712145c372160204e02f36f995d2cca8589f7b8ffcb646b0b258b0d49db6a0ffa01117b8c0af9f3fa0e SHA512 3d798f7de9c33325585d5d7c8608cc16acdcf42c246d283b2fb8a29f5e419f2899342965ff297432ef2ab20c91eaee28d6ca53349f5a68b0a4fd29d6905fc64c
-DIST mbedtls-2.16.4.tar.gz 2597922 BLAKE2B 787837903e1d9a5951e3b379b17e82bb6857597c55efa913e8a6d9f9be1f26d8c8eb08e72e56855748695771aea2a6e6826b7da7d2ac4d53596584ea967c1457 SHA512 e0546f2233d4ffbf0c0f3227c1ee6185124484a740dbd2d18f02a036567e043c0a8c7b49501ce6fa1b03161d86b487f1cc16f7afafac357d3e5ebfc367cd9a33
DIST mbedtls-2.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493
-DIST mbedtls-2.18.1.tar.gz 2810688 BLAKE2B 25e8cfdb16e18049e4c89e271babe5b711634099ef89c54169e606da7aabedde1ac862ecd34dbe05e8052ea0183a7aa3b575d431305af4f8ecdd22da0f79f103 SHA512 39d1844806a0312ad97236d247e624fca15f10d7aff2336e764f214594a505f5109d6407fe6d399171086376124bc74da0c0f0b7aa9db85fa41f70143f04b95b
DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b
-EBUILD mbedtls-2.10.0.ebuild 2416 BLAKE2B 534b176815921b6702ba50c8432320a56563ebcb07cbf1a129841d115f83b71c98e0c942e57e9c84a53410823728cd7c3fe10d090e17d21260918cb297c58f2c SHA512 3950efb017bb0423b3860888fb028db24bc1422b78b8c16b9c2bc5c3af3fb1a66c75c43c902578f779838893baf79cab513e9cd4de7d885e31a3a2abf06665e3
-EBUILD mbedtls-2.12.0.ebuild 2444 BLAKE2B 9de15ee64d5b6eb1b115c0a401a5141361a5f6c7f4375d40901a7a6358bed7776b8605e5bc9585d5cf4957f4e140a7b2c99f1f2fecf6c68a1a1a4125a2c2ad86 SHA512 05d35d1bbc857d0928a03b6083d68e1d798f5bcd317ed5ed1ac76547b0d09716accbd192288fd480de4fbab49c0a715fb8eff7e320ca910f641b043e673e2416
-EBUILD mbedtls-2.16.3.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
-EBUILD mbedtls-2.16.4.ebuild 2453 BLAKE2B 15cf4dc369f789a3cb945b194c448e5ae85a9b529f38d7453f8b4d117c6a92ca1af7c04740b28c7f291885943250f527720447a439fcdb06b0eff2f763383e3b SHA512 ff4b622b5b2d071ac3f67a44565a6255e4c4d85a254f19e2ec5f2333063f187372b04440af9924fa3e66e55df7540eaf6990c22237932a1f600177faf49de14f
-EBUILD mbedtls-2.17.0.ebuild 2453 BLAKE2B ec479c9bfd5f505af48b1e4721e8750ff27a2c2688553ee95bfbde387db9e8fe88444ac7a4ac7a4a0c94f655d733889d19aa2d7542615399f87f8fbcd1c4d8ac SHA512 fa0832b7ff8501f8dd9e012d717d8de23a3921d8dc7834884fce5d3b2c8d68b7f144a3c89031fdc6edabeda6b21068803f4b07f8727e09ca5636c21538c3108f
-EBUILD mbedtls-2.18.1-r2.ebuild 2800 BLAKE2B 8db411d90f17c45c25724daf1632c849f759b4aa7dffb5527eaa9d39f22a7d477a6a263bec9e18082d7df80f100864596015f4f8b34a59983be913cf12797d9f SHA512 fb6e726875ac330dc6fb54d587c39c43ca5da6bbe7e07dcab549b8cf1cfac83068f2acdc9cc1837180226842f27a69e5c1fb7880c355b7e9577fcddd42bb80d8
-EBUILD mbedtls-2.19.1-r2.ebuild 2845 BLAKE2B 9efc07936fbf097d8b1424b0f40be2f335ab367a83940a5d29e0b84ead90ead7acc2bfd4b82415a1c6bc74ac69d5172e86ada9cca312b956b306ab136f3e9654 SHA512 14529f237086d9e3a837beb2287fa13213fbf67db3b641de2f1e483361ce482dd3f31ba9ba2502b40308f4562ec079e2987b21a3b512cd856a0cfe362dd13dd0
+EBUILD mbedtls-2.17.0.ebuild 2449 BLAKE2B f9d80604358d3bf39fadc6f112c8aa82e9b879a917f059b27d912f705316cfd9bc45c936ab8926ab19509fa397848e824883eebe993d4ecd550e48a539170ba3 SHA512 128290aaa41701422296ef214b0a21f295d5207b5ce562de7e9c3603eeb6e0595993bd9545c9cfefeb2f64ed351fa30497bcfbfd55916a40253fda8b597b65d9
+EBUILD mbedtls-2.19.1-r2.ebuild 2835 BLAKE2B 239727e104e5c40ee3e958a7ca9c908800b32b4b6e0e46914c7a3e15105f92bad560ebc39bccc349ce2fd7be6fab6c91767d8d9a6b7e0ebd2a15b6616a93a753 SHA512 d63cd1e267786b5c6c7c4187078ecccb1403ee553f231c509035d9139104076f6d6f038f029e6cf798e8ca9881f4df000a572525a0f55349425a95eb0396c3b8
MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
deleted file mode 100644
index 1269fff75f46..000000000000
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- use doc && HTML_DOCS=( apidoc )
-
- einstalldocs
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
deleted file mode 100644
index aa88a987df3b..000000000000
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/11" # slot for libmbedtls.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- use doc && HTML_DOCS=( apidoc )
-
- einstalldocs
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.3.ebuild b/net-libs/mbedtls/mbedtls-2.16.3.ebuild
deleted file mode 100644
index 13c601c526bb..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- use doc && HTML_DOCS=( apidoc )
-
- einstalldocs
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.4.ebuild b/net-libs/mbedtls/mbedtls-2.16.4.ebuild
deleted file mode 100644
index fa71e95eebe0..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- use doc && HTML_DOCS=( apidoc )
-
- einstalldocs
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.17.0.ebuild b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
index 13c601c526bb..ffb19c04d7a4 100644
--- a/net-libs/mbedtls/mbedtls-2.17.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/12" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
deleted file mode 100644
index dfb900ea4c69..000000000000
--- a/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-CRYPTO_SUBMODULE="mbedcrypto-1.1.0d0"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
- https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- programs? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen media-gfx/graphviz )
- test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
- local myopt="$@"
- # check that config.h syntax is the same at version bump
- sed -i \
- -e "s://#define ${myopt}:#define ${myopt}:" \
- include/mbedtls/config.h || die
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-dont-overwrite-headers.patch
- "${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch
-)
-
-src_prepare() {
- use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
- use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
- use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_C
- use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
- # pretend to be git submodule
- rmdir "${S}"/crypto
- mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DENABLE_PROGRAMS=$(multilib_native_usex programs)
- -DENABLE_ZLIB_SUPPORT=$(usex zlib)
- -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
- -DENABLE_TESTING=$(usex test)
- -DUSE_SHARED_MBEDTLS_LIBRARY=ON
- -DINSTALL_MBEDTLS_HEADERS=ON
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
- cmake-utils_src_test
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
-
-multilib_src_install_all() {
- use doc && HTML_DOCS=( apidoc )
-
- einstalldocs
-
- if use programs ; then
- # avoid file collisions with sys-apps/coreutils
- local p e
- for p in "${ED}"/usr/bin/* ; do
- if [[ -x "${p}" && ! -d "${p}" ]] ; then
- mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
- fi
- done
- for e in aes hash pkey ssl test ; do
- docinto "${e}"
- dodoc programs/"${e}"/*.c
- dodoc programs/"${e}"/*.txt
- done
- fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
index 55ffc2164a72..6e33b2b74111 100644
--- a/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/13" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"