Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/
Date: Sun, 19 Sep 2021 07:12:57
Message-Id: 1632035554.93f6e77da684f70ea10256e40f88cab0d45573d9.dilfridge@gentoo
1 commit: 93f6e77da684f70ea10256e40f88cab0d45573d9
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 19 06:23:03 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 07:12:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f6e77d
7
8 net-libs/mbedtls: Remove old
9
10 Closes: https://bugs.gentoo.org/744946
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
13
14 net-libs/mbedtls/Manifest | 2 -
15 net-libs/mbedtls/mbedtls-2.16.10.ebuild | 93 ---------------------------------
16 net-libs/mbedtls/mbedtls-2.16.11.ebuild | 93 ---------------------------------
17 3 files changed, 188 deletions(-)
18
19 diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
20 index c5c8cc5ec71..fe9a5c4b33f 100644
21 --- a/net-libs/mbedtls/Manifest
22 +++ b/net-libs/mbedtls/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST mbedtls-2.16.10.tar.gz 2677333 BLAKE2B 5f94003547d5c4ba8daec8270b6e91fea1bbcc94aa7a7417018ec57b8807fbdbd057640fda24cf65171bf7dd872eb091d21e7508df28b57ddfc512736f9c6482 SHA512 13837316b04fab6bebacdd283f437b5f246df0785c866cf3d94019d040ab0edf417e0b409653f5abf98a4944345eb088010658c9de10f9e96a5624d33741898a
25 -DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
26 DIST mbedtls-2.26.0.tar.gz 4080986 BLAKE2B 549f00db4bfbba4a88de0ff76f32140d7421ad3ab58e3cdf08ec40e0a3da5dcc7a1bcb6eb1ce491ebb544dcd15eb6bc634f04e6ab0f773dc89fa44b6843542ad SHA512 959f6dd0759bfd8dcc497a0527b8b9e9975adb9fee01461e6bcc37475cf9e4eae597687e05e077dfe51d0542c81bc3b90e6d9a692353dca331e020e02d642196
27 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
28 DIST mbedtls-3.0.0.tar.gz 4163127 BLAKE2B 5d94124a251dbcc38de614319f93c6f0346de516fd944c765ab3e60d46fba8fbbdba7a6f9e00f5f0550137301b4de98795851df788e367c4fcf03abb981d3c63 SHA512 be11878d82fc93d0847718514f4887c68d7b186c54682316c4a01082583a917b81f9760bb708aab72bf37148581a8dbc9f7048faf745cd2e1cd7e5bf8c48abad
29
30 diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
31 deleted file mode 100644
32 index ce4c7c2ec07..00000000000
33 --- a/net-libs/mbedtls/mbedtls-2.16.10.ebuild
34 +++ /dev/null
35 @@ -1,93 +0,0 @@
36 -# Copyright 1999-2021 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -inherit cmake multilib-minimal
42 -
43 -DESCRIPTION="Cryptographic library for embedded systems"
44 -HOMEPAGE="https://tls.mbed.org/"
45 -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
46 -S=${WORKDIR}/${PN}-${P}
47 -
48 -LICENSE="Apache-2.0"
49 -SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
50 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
51 -IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
52 -RESTRICT="!test? ( test )"
53 -
54 -RDEPEND="
55 - programs? (
56 - dev-libs/openssl:0=
57 - )
58 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
59 -DEPEND="${RDEPEND}
60 - doc? ( app-doc/doxygen media-gfx/graphviz )
61 - test? ( dev-lang/perl )"
62 -
63 -enable_mbedtls_option() {
64 - local myopt="$@"
65 - # check that config.h syntax is the same at version bump
66 - sed -i \
67 - -e "s://#define ${myopt}:#define ${myopt}:" \
68 - include/mbedtls/config.h || die
69 -}
70 -
71 -src_prepare() {
72 - use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
73 - use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
74 - use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
75 - use threads && enable_mbedtls_option MBEDTLS_THREADING_C
76 - use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
77 -
78 - cmake_src_prepare
79 -}
80 -
81 -multilib_src_configure() {
82 - local mycmakeargs=(
83 - -DENABLE_PROGRAMS=$(multilib_native_usex programs)
84 - -DENABLE_ZLIB_SUPPORT=$(usex zlib)
85 - -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
86 - -DENABLE_TESTING=$(usex test)
87 - -DUSE_SHARED_MBEDTLS_LIBRARY=ON
88 - -DINSTALL_MBEDTLS_HEADERS=ON
89 - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
90 - )
91 -
92 - cmake_src_configure
93 -}
94 -
95 -multilib_src_compile() {
96 - cmake_src_compile
97 - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
98 -}
99 -
100 -multilib_src_test() {
101 - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
102 - cmake_src_test
103 -}
104 -
105 -multilib_src_install() {
106 - cmake_src_install
107 -}
108 -
109 -multilib_src_install_all() {
110 - use doc && HTML_DOCS=( apidoc )
111 -
112 - einstalldocs
113 -
114 - if use programs ; then
115 - # avoid file collisions with sys-apps/coreutils
116 - local p e
117 - for p in "${ED}"/usr/bin/* ; do
118 - if [[ -x "${p}" && ! -d "${p}" ]] ; then
119 - mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
120 - fi
121 - done
122 - for e in aes hash pkey ssl test ; do
123 - docinto "${e}"
124 - dodoc programs/"${e}"/*.c
125 - dodoc programs/"${e}"/*.txt
126 - done
127 - fi
128 -}
129
130 diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
131 deleted file mode 100644
132 index 3aaf46463bb..00000000000
133 --- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
134 +++ /dev/null
135 @@ -1,93 +0,0 @@
136 -# Copyright 1999-2021 Gentoo Authors
137 -# Distributed under the terms of the GNU General Public License v2
138 -
139 -EAPI=7
140 -
141 -inherit cmake multilib-minimal
142 -
143 -DESCRIPTION="Cryptographic library for embedded systems"
144 -HOMEPAGE="https://tls.mbed.org/"
145 -SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
146 -S=${WORKDIR}/${PN}-${P}
147 -
148 -LICENSE="Apache-2.0"
149 -SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
150 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
151 -IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
152 -RESTRICT="!test? ( test )"
153 -
154 -RDEPEND="
155 - programs? (
156 - dev-libs/openssl:0=
157 - )
158 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
159 -DEPEND="${RDEPEND}
160 - doc? ( app-doc/doxygen media-gfx/graphviz )
161 - test? ( dev-lang/perl )"
162 -
163 -enable_mbedtls_option() {
164 - local myopt="$@"
165 - # check that config.h syntax is the same at version bump
166 - sed -i \
167 - -e "s://#define ${myopt}:#define ${myopt}:" \
168 - include/mbedtls/config.h || die
169 -}
170 -
171 -src_prepare() {
172 - use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
173 - use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
174 - use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
175 - use threads && enable_mbedtls_option MBEDTLS_THREADING_C
176 - use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
177 -
178 - cmake_src_prepare
179 -}
180 -
181 -multilib_src_configure() {
182 - local mycmakeargs=(
183 - -DENABLE_PROGRAMS=$(multilib_native_usex programs)
184 - -DENABLE_ZLIB_SUPPORT=$(usex zlib)
185 - -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
186 - -DENABLE_TESTING=$(usex test)
187 - -DUSE_SHARED_MBEDTLS_LIBRARY=ON
188 - -DINSTALL_MBEDTLS_HEADERS=ON
189 - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
190 - )
191 -
192 - cmake_src_configure
193 -}
194 -
195 -multilib_src_compile() {
196 - cmake_src_compile
197 - use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
198 -}
199 -
200 -multilib_src_test() {
201 - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
202 - cmake_src_test
203 -}
204 -
205 -multilib_src_install() {
206 - cmake_src_install
207 -}
208 -
209 -multilib_src_install_all() {
210 - use doc && HTML_DOCS=( apidoc )
211 -
212 - einstalldocs
213 -
214 - if use programs ; then
215 - # avoid file collisions with sys-apps/coreutils
216 - local p e
217 - for p in "${ED}"/usr/bin/* ; do
218 - if [[ -x "${p}" && ! -d "${p}" ]] ; then
219 - mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
220 - fi
221 - done
222 - for e in aes hash pkey ssl test ; do
223 - docinto "${e}"
224 - dodoc programs/"${e}"/*.c
225 - dodoc programs/"${e}"/*.txt
226 - done
227 - fi
228 -}