From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B886138334 for ; Tue, 17 Dec 2019 20:46:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74B3FE087B; Tue, 17 Dec 2019 20:46:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4ABA8E087B for ; Tue, 17 Dec 2019 20:46:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ED3B34D9DE for ; Tue, 17 Dec 2019 20:46:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C91677E for ; Tue, 17 Dec 2019 20:46:33 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1576615580.92982cee2a33e6b1b7fc865d4139ae8e8754d239.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/mbedtls/Manifest net-libs/mbedtls/mbedtls-2.18.0.ebuild net-libs/mbedtls/mbedtls-2.18.1.ebuild net-libs/mbedtls/mbedtls-2.19.1.ebuild X-VCS-Directories: net-libs/mbedtls/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 92982cee2a33e6b1b7fc865d4139ae8e8754d239 X-VCS-Branch: master Date: Tue, 17 Dec 2019 20:46:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91770163-1770-4d0d-9f5e-4103294ecc60 X-Archives-Hash: 952aea1bfedbbcfd680f835651fe627e commit: 92982cee2a33e6b1b7fc865d4139ae8e8754d239 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Dec 17 20:46:20 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Dec 17 20:46:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92982cee net-libs/mbedtls: fix subslot for 2.18.1 and 2.19.1 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Anthony G. Basile gentoo.org> net-libs/mbedtls/Manifest | 1 - net-libs/mbedtls/mbedtls-2.18.0.ebuild | 100 --------------------------------- net-libs/mbedtls/mbedtls-2.18.1.ebuild | 2 +- net-libs/mbedtls/mbedtls-2.19.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 103 deletions(-) diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest index e051f1c066d..57262450ba4 100644 --- a/net-libs/mbedtls/Manifest +++ b/net-libs/mbedtls/Manifest @@ -4,6 +4,5 @@ DIST mbedtls-2.10.0.tar.gz 2190139 BLAKE2B f4e6da0bc433992a79088a86c7bad48564e5d 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.17.0.tar.gz 2738368 BLAKE2B efcf2a6c84a85afdca0205bd9e8bcf039074c5e6f40e0814f835cf26c2d13dce87bd140aa0b803eea6a683e31b79680a3ea8ba72417e7ec26f206e0b027b014a SHA512 6ab52d116cb9f755871f2fd196ec1b352dbbe59f2ecedeb5551237e4e672da77205ef0c2f80ec746ba1fd94cab1995ab1729c8adb0f29d10f3c74a67f5327493 -DIST mbedtls-2.18.0.tar.gz 2809466 BLAKE2B 38f768b97c6b3c1942c9bbf6de230c99b1d2c257a6e3eff2cb4208b670425d83541829eefefaf2bddca72c770f25d9f92f6c72773177ac3687dfdca2b323637c SHA512 f98b93c32d34107cd303a7e2dfcb6ce3072cf230400c3608aaf1e52abd31c8d759df9bf856444b6f4279c26f7d2403dfb69b1ceb89bb940652eb326efc979261 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.18.0.ebuild b/net-libs/mbedtls/mbedtls-2.18.0.ebuild deleted file mode 100644 index 92717eb3fd8..00000000000 --- a/net-libs/mbedtls/mbedtls-2.18.0.ebuild +++ /dev/null @@ -1,100 +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/" -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/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 - - # 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.18.1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1.ebuild index 92717eb3fd8..b20fab6e102 100644 --- a/net-libs/mbedtls/mbedtls-2.18.1.ebuild +++ b/net-libs/mbedtls/mbedtls-2.18.1.ebuild @@ -13,7 +13,7 @@ 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 +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 )" diff --git a/net-libs/mbedtls/mbedtls-2.19.1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1.ebuild index 71fda0649cc..8bf1997f05c 100644 --- a/net-libs/mbedtls/mbedtls-2.19.1.ebuild +++ b/net-libs/mbedtls/mbedtls-2.19.1.ebuild @@ -13,7 +13,7 @@ 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 +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 )"