commit:     90d9377cce0d677e4f43eb0ffd3c26627cc7443d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 01:14:29 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 01:14:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d9377c

net-libs/mbedtls: clean up vulnerable versions, bug #711180

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 net-libs/mbedtls/Manifest                 |   7 --
 net-libs/mbedtls/mbedtls-2.10.0.ebuild    |  94 --------------------------
 net-libs/mbedtls/mbedtls-2.12.0.ebuild    |  94 --------------------------
 net-libs/mbedtls/mbedtls-2.16.3.ebuild    |  94 --------------------------
 net-libs/mbedtls/mbedtls-2.16.4.ebuild    |  94 --------------------------
 net-libs/mbedtls/mbedtls-2.17.0.ebuild    |  94 --------------------------
 net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild | 105 ------------------------------
 7 files changed, 582 deletions(-)

diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 441dbbdb38a..ea769ddd876 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,2 @@
-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

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 1269fff75f4..00000000000
--- 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 aa88a987df3..00000000000
--- 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 13c601c526b..00000000000
--- 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 fa71e95eebe..00000000000
--- 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
deleted file mode 100644
index 13c601c526b..00000000000
--- a/net-libs/mbedtls/mbedtls-2.17.0.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.18.1-r2.ebuild 
b/net-libs/mbedtls/mbedtls-2.18.1-r2.ebuild
deleted file mode 100644
index dfb900ea4c6..00000000000
--- 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
-}

Reply via email to