commit: 2f651fd8b7f3b708be5730273d9aa7469ec4e2fc Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Apr 29 14:02:34 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 29 14:02:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f651fd8
net-libs/mbedtls: remove mbedcrypto submodule in 2.22.0 https://github.com/ARMmbed/mbedtls/issues/3291 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> net-libs/mbedtls/Manifest | 1 - .../{mbedtls-2.22.0.ebuild => mbedtls-2.22.0-r1.ebuild} | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index 43bc31dac15..69b2642974f 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -1,5 +1,4 @@ DIST mbedcrypto-2.0.0.tar.gz 3001813 BLAKE2B 35a01b7cb11a94cb5ef333f5939945b40ecd0da482959980931e389ac5aec3c1c1b2f40970bbde4587454aee5957dce220593bfc31943ec3deddfa70d2386a25 SHA512 3a8fa6b7160065ef175139ba9cb4c8599be11f9d0df5fd60f9f96c425400a0a40eaa31d571ce61d4a00e3b10c1e2b81756c1ad31df6fc32777f40ade7806948a -DIST mbedcrypto-3.1.0.tar.gz 3055269 BLAKE2B 50089999c8c5c768f266894c4d0f45ce596acf3295ddd2f851be52486eef8bd9d5a12a9a5beacef9527c5bba36de90550a707c1adebd65cc853f4a55419e0bd0 SHA512 718d4193feeae9e598d068e959b6f6781d68512e59edfadbde9adb7356063a13fd3d6d9d88f94488ce6bc56faae2b55c001411df12420923a528316eaa422837 DIST mbedtls-2.16.6.tar.gz 2603563 BLAKE2B a4011bb2b7e3eca554cded05c4650fc16b48d86ae1ac7fefe29df6b29e38c1e76c880f082be83759b4dddd96f831a1238c2df41671bd9794b028402b3dd63f60 SHA512 a4c2e70c0cc6b1f1571a9f2ec27ede2620eb1937361599cab0e05b807068397d25695d5cd23931fd0f4cc051de6367c2b6c77f3507ed8b33cd492589c51eebac DIST mbedtls-2.19.1.tar.gz 1165843 BLAKE2B c8e6764b493a6ca011e74d7b297d5ae5140d7bdf17c1cfd5b9d37913d615ad3c5a6dbf71d44cbf14c938646e51bbf04cd63cc1657eb3775addb2dee3ee94c587 SHA512 07ec1cdf98e51ed35bb2940e485d7d8422e9fd440d2077d5cd4c80781d73848228386fe9064773ef8bb1a02c1bc060185b9c8310349d695926bd2c9b7cf6582b DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09 diff --git a/net-libs/mbedtls/mbedtls-2.22.0.ebuild b/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild similarity index 82% rename from net-libs/mbedtls/mbedtls-2.22.0.ebuild rename to net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild index 85b09fc8997..9124fc46bb5 100644 --- a/net-libs/mbedtls/mbedtls-2.22.0.ebuild +++ b/net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild @@ -7,14 +7,12 @@ inherit cmake-utils multilib-minimal DESCRIPTION="Cryptographic library for embedded systems" HOMEPAGE="https://tls.mbed.org/"; -CRYPTO_SUBMODULE="mbedcrypto-3.1.0" -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz - https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"; +SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.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 ~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 )" @@ -36,11 +34,6 @@ enable_mbedtls_option() { 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 @@ -48,10 +41,6 @@ src_prepare() { 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 }
