commit: 81270b56090ac2a664ada29e57a91fa80d7ebdcb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 15:51:56 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 15:51:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81270b56
Revert "net-libs/mbedtls: introduce slots"
This reverts commit 35c674833a5b1a2a465f133b259cbf704cff4419.
This should not have been pushed.
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
net-libs/mbedtls/{mbedtls-2.16.8-r1.ebuild => mbedtls-2.16.8.ebuild} | 5 ++---
net-libs/mbedtls/{mbedtls-2.24.0-r1.ebuild => mbedtls-2.24.0.ebuild} | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/net-libs/mbedtls/mbedtls-2.16.8-r1.ebuild
b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
similarity index 92%
rename from net-libs/mbedtls/mbedtls-2.16.8-r1.ebuild
rename to net-libs/mbedtls/mbedtls-2.16.8.ebuild
index 344353ea171..6114da3d948 100644
--- a/net-libs/mbedtls/mbedtls-2.16.8-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz";
S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
-SLOT="2.1/3.12.0" # ffmpeg subslot naming: SONAME tuple of
{libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of
{libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
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 )"
@@ -21,8 +21,7 @@ RDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- !net-libs/mbedtls:2.2"
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen media-gfx/graphviz )
test? ( dev-lang/perl )"
diff --git a/net-libs/mbedtls/mbedtls-2.24.0-r1.ebuild
b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
similarity index 92%
rename from net-libs/mbedtls/mbedtls-2.24.0-r1.ebuild
rename to net-libs/mbedtls/mbedtls-2.24.0.ebuild
index 31378d0cd13..c7e0dce9105 100644
--- a/net-libs/mbedtls/mbedtls-2.24.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz";
S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
-SLOT="2.2/5.13.1" # ffmpeg subslot naming: SONAME tuple of
{libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
+SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of
{libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
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 )"
@@ -21,8 +21,7 @@ RDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- !net-libs/mbedtls:2.1"
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen media-gfx/graphviz )
test? ( dev-lang/perl )"
