From 628981b8cb60807dcac3d90e911227c155421e83 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 4 Jul 2020 14:38:27 +0200 Subject: net-libs/mbedtls: Use ffmpeg-style subslot tuples We have to version the SONAME of all shared libraries, otherwise we might not rebuild all revdeps. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Acked-by: Anthony G. Basile Signed-off-by: David Seifert --- net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild | 94 +++++++++++++++++++++++++++++++ net-libs/mbedtls/mbedtls-2.16.7.ebuild | 94 ------------------------------- net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild | 94 +++++++++++++++++++++++++++++++ net-libs/mbedtls/mbedtls-2.23.0.ebuild | 94 ------------------------------- 4 files changed, 188 insertions(+), 188 deletions(-) create mode 100644 net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild delete mode 100644 net-libs/mbedtls/mbedtls-2.16.7.ebuild create mode 100644 net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild delete mode 100644 net-libs/mbedtls/mbedtls-2.23.0.ebuild (limited to 'net-libs/mbedtls') diff --git a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild new file mode 100644 index 000000000000..027f3697eaaa --- /dev/null +++ b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake 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/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 )" + +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_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="${EPREFIX}/usr/$(get_libdir)" + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + use doc && multilib_is_native_abi && cd "${S}" && emake apidoc +} + +multilib_src_test() { + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ + cmake_src_test +} + +multilib_src_install() { + cmake_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.7.ebuild b/net-libs/mbedtls/mbedtls-2.16.7.ebuild deleted file mode 100644 index 709a2ee290ba..000000000000 --- a/net-libs/mbedtls/mbedtls-2.16.7.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 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 ~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_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="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc -} - -multilib_src_test() { - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake_src_test -} - -multilib_src_install() { - cmake_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.23.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild new file mode 100644 index 000000000000..ce0653f4a8db --- /dev/null +++ b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake 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/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 )" + +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_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="${EPREFIX}/usr/$(get_libdir)" + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + use doc && multilib_is_native_abi && cd "${S}" && emake apidoc +} + +multilib_src_test() { + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ + cmake_src_test +} + +multilib_src_install() { + cmake_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.23.0.ebuild b/net-libs/mbedtls/mbedtls-2.23.0.ebuild deleted file mode 100644 index 0a512228e15e..000000000000 --- a/net-libs/mbedtls/mbedtls-2.23.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=7 - -inherit cmake 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/13" # slot for libmbedtls.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 )" - -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_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="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc -} - -multilib_src_test() { - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ - cmake_src_test -} - -multilib_src_install() { - cmake_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 -} -- cgit v1.2.3-65-gdbad