1 |
commit: 5d3ad15bfc6ea6786d24227d5b1c29bf12f2a152 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 18 10:02:03 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 18 10:04:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3ad15b |
7 |
|
8 |
sys-libs/libxcrypt: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
sys-libs/libxcrypt/Manifest | 2 - |
14 |
sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild | 164 ----------------------------- |
15 |
sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild | 163 ---------------------------- |
16 |
3 files changed, 329 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest |
19 |
index 84d30506186..39a2976e174 100644 |
20 |
--- a/sys-libs/libxcrypt/Manifest |
21 |
+++ b/sys-libs/libxcrypt/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST libxcrypt-4.4.16.tar.gz 480694 BLAKE2B 0e93c2ff45a8148f82a80a67fb732a3ef42e87505d19258023f91d3352a382483204e77e2704e7a0de15f4f1e38a326d0867506a5580faf8c81857270588a4a3 SHA512 e1d3b1262c6be7c6c8847b8c4eb8191d9e5e482798be6f1186876c72f3d8c737124378ec45a38aa464f556e10a557b96f855bd371f03c3611eada27904bf6781 |
24 |
DIST libxcrypt-4.4.17.tar.gz 519096 BLAKE2B 12cbe3d1f235baddd8d2ec8159f2a7514e75c2f91cf0db18ef909ec11c38ac19efebecec647a90cafb27c7ebc7e940da448ca8f3edd1c49e5cb9cc4407d5198c SHA512 94aaba6ccf9b6d1a32f9a571ee32261cecd393d5b8d8c6f18d740dc7bb29ac0fbd381124e7f0d84882559bb634208c08151b3dc05c9138fa0a229c4ba20fb6f7 |
25 |
-DIST libxcrypt-4.4.19.tar.gz 534269 BLAKE2B 22c27fe2bfe32a7752f7be495a072c774a5a9ab9a7616fb80ff05afae4d9ff1ecfd1a04b4bd7c850df46f60aa5850225684464cf65d2a145302f128285ac8a9b SHA512 f5bd2598b5d0de47f3d805bbd4a045439e456d361a39e8725c40e2e1f32cf392bdc20b51840528f53cec052dff98be1a009fcd70b92e288584bedf06ef94b816 |
26 |
DIST libxcrypt-4.4.20.tar.gz 534367 BLAKE2B 9174bd342dc13db8fd724a13e3fbd222a0f5e2d058be2d7f511816e137fa61bd73d4b9482c85d81f27404d0e650be59c45f25d70ec3c506730d2422da4e97417 SHA512 66b1966003427728f96d5a83f75930a4b82d31133392bede3975cf9a1e1423d0312e73da598e40d0e3507f26fac5222cc92d7a5593f2b737d8557a5d4bf2461e |
27 |
|
28 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild |
29 |
deleted file mode 100644 |
30 |
index 5bbe2a45ae2..00000000000 |
31 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.16.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,164 +0,0 @@ |
34 |
-# Copyright 2004-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
-PYTHON_COMPAT=( python3_{7,8} ) |
39 |
-inherit autotools multibuild python-any-r1 multilib-minimal |
40 |
- |
41 |
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others" |
42 |
-SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
-HOMEPAGE="https://github.com/besser82/libxcrypt" |
44 |
- |
45 |
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2" |
46 |
-SLOT="0/1" |
47 |
-KEYWORDS="amd64 x86" |
48 |
-IUSE="+compat split-usr +static-libs system test" |
49 |
- |
50 |
-DEPEND="system? ( |
51 |
- elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) |
52 |
- !sys-libs/musl |
53 |
- )" |
54 |
-RDEPEND="${DEPEND}" |
55 |
-BDEPEND="sys-apps/findutils |
56 |
- test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )" |
57 |
- |
58 |
-RESTRICT="!test? ( test )" |
59 |
- |
60 |
-REQUIRED_USE="split-usr? ( system )" |
61 |
- |
62 |
-PATCHES=( |
63 |
- "${FILESDIR}/libxcrypt-4.4.12-pythonver.patch" |
64 |
- "${FILESDIR}/libxcrypt-4.4.12-multibuild.patch" |
65 |
-) |
66 |
- |
67 |
-python_check_deps() { |
68 |
- has_version -b "dev-python/passlib[${PYTHON_USEDEP}]" |
69 |
-} |
70 |
- |
71 |
-pkg_setup() { |
72 |
- MULTIBUILD_VARIANTS=( |
73 |
- $(usex compat 'xcrypt_compat' '') |
74 |
- xcrypt_nocompat |
75 |
- ) |
76 |
- |
77 |
- use test && python-any-r1_pkg_setup |
78 |
-} |
79 |
- |
80 |
-src_prepare() { |
81 |
- default |
82 |
- eautoreconf |
83 |
-} |
84 |
- |
85 |
-src_configure() { |
86 |
- multibuild_foreach_variant multilib-minimal_src_configure |
87 |
-} |
88 |
- |
89 |
-get_xclibdir() { |
90 |
- printf -- "%s/%s/%s\n" \ |
91 |
- "$(usex split-usr '' '/usr')" \ |
92 |
- "$(get_libdir)" \ |
93 |
- "$(usex system '' 'xcrypt')" |
94 |
-} |
95 |
- |
96 |
-multilib_src_configure() { |
97 |
- local -a myconf=( |
98 |
- --disable-werror |
99 |
- --libdir=$(get_xclibdir) |
100 |
- --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig |
101 |
- --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')" |
102 |
- ) |
103 |
- |
104 |
- case "${MULTIBUILD_ID}" in |
105 |
- xcrypt_compat-*) |
106 |
- myconf+=( |
107 |
- --disable-static |
108 |
- --disable-xcrypt-compat-files |
109 |
- --enable-obsolete-api=yes |
110 |
- ) |
111 |
- ;; |
112 |
- xcrypt_nocompat-*) |
113 |
- myconf+=( |
114 |
- --enable-obsolete-api=no |
115 |
- $(use_enable static-libs static) |
116 |
- ) |
117 |
- ;; |
118 |
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
119 |
- esac |
120 |
- |
121 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
122 |
-} |
123 |
- |
124 |
-src_compile() { |
125 |
- multibuild_foreach_variant multilib-minimal_src_compile |
126 |
-} |
127 |
- |
128 |
-multilib_src_test() { |
129 |
- emake check |
130 |
-} |
131 |
- |
132 |
-src_test() { |
133 |
- multibuild_foreach_variant multilib-minimal_src_test |
134 |
-} |
135 |
- |
136 |
-src_install() { |
137 |
- multibuild_foreach_variant multilib-minimal_src_install |
138 |
- |
139 |
- ( |
140 |
- shopt -s failglob || die "failglob failed" |
141 |
- |
142 |
- # Make sure our man pages do not collide with glibc or man-pages. |
143 |
- for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do |
144 |
- mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \ |
145 |
- || die "mv failed" |
146 |
- done |
147 |
- ) || die "failglob error" |
148 |
- |
149 |
- # remove useless stuff from installation |
150 |
- find "${D}"/usr/share/doc/${PF} -type l -delete || die |
151 |
- find "${D}" -name '*.la' -delete || die |
152 |
-} |
153 |
- |
154 |
-multilib_src_install() { |
155 |
- emake DESTDIR="${D}" install |
156 |
- |
157 |
- # don't install the libcrypt.so symlink for the "compat" version |
158 |
- case "${MULTIBUILD_ID}" in |
159 |
- xcrypt_compat-*) |
160 |
- rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ |
161 |
- || die "failed to remove extra compat libraries" |
162 |
- ;; |
163 |
- xcrypt_nocompat-*) |
164 |
- if use split-usr; then |
165 |
- ( |
166 |
- if use static-libs; then |
167 |
- # .a files are installed to /$(get_libdir) by default |
168 |
- # move static libraries to /usr prefix or portage will abort |
169 |
- shopt -s nullglob || die "failglob failed" |
170 |
- static_libs=( "${ED}"/$(get_xclibdir)/*.a ) |
171 |
- |
172 |
- if [[ -n ${static_libs[*]} ]]; then |
173 |
- dodir "/usr/$(get_xclibdir)" |
174 |
- mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \ |
175 |
- || die "moving static libs failed" |
176 |
- fi |
177 |
- fi |
178 |
- |
179 |
- if use system; then |
180 |
- # Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir) |
181 |
- # to allow linker to correctly find shared libraries. |
182 |
- shopt -s failglob || die "failglob failed" |
183 |
- |
184 |
- for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do |
185 |
- lib_file_basename="$(basename "${lib_file}")" |
186 |
- lib_file_target="$(basename "$(readlink -f "${lib_file}")")" |
187 |
- dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}" |
188 |
- done |
189 |
- |
190 |
- rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed" |
191 |
- fi |
192 |
- ) |
193 |
- fi |
194 |
- ;; |
195 |
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
196 |
- esac |
197 |
-} |
198 |
|
199 |
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild |
200 |
deleted file mode 100644 |
201 |
index 6284f32749c..00000000000 |
202 |
--- a/sys-libs/libxcrypt/libxcrypt-4.4.19.ebuild |
203 |
+++ /dev/null |
204 |
@@ -1,163 +0,0 @@ |
205 |
-# Copyright 2004-2021 Gentoo Authors |
206 |
-# Distributed under the terms of the GNU General Public License v2 |
207 |
- |
208 |
-EAPI=7 |
209 |
-PYTHON_COMPAT=( python3_{7..9} ) |
210 |
-inherit autotools multibuild python-any-r1 multilib-minimal |
211 |
- |
212 |
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others" |
213 |
-SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
214 |
-HOMEPAGE="https://github.com/besser82/libxcrypt" |
215 |
- |
216 |
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2" |
217 |
-SLOT="0/1" |
218 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
219 |
-IUSE="+compat split-usr +static-libs system test" |
220 |
- |
221 |
-DEPEND="system? ( |
222 |
- elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) |
223 |
- !sys-libs/musl |
224 |
- )" |
225 |
-RDEPEND="${DEPEND}" |
226 |
-BDEPEND="sys-apps/findutils |
227 |
- test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )" |
228 |
- |
229 |
-RESTRICT="!test? ( test )" |
230 |
- |
231 |
-REQUIRED_USE="split-usr? ( system )" |
232 |
- |
233 |
-PATCHES=( |
234 |
- "${FILESDIR}/libxcrypt-4.4.19-multibuild.patch" |
235 |
-) |
236 |
- |
237 |
-python_check_deps() { |
238 |
- has_version -b "dev-python/passlib[${PYTHON_USEDEP}]" |
239 |
-} |
240 |
- |
241 |
-pkg_setup() { |
242 |
- MULTIBUILD_VARIANTS=( |
243 |
- $(usex compat 'xcrypt_compat' '') |
244 |
- xcrypt_nocompat |
245 |
- ) |
246 |
- |
247 |
- use test && python-any-r1_pkg_setup |
248 |
-} |
249 |
- |
250 |
-src_prepare() { |
251 |
- default |
252 |
- eautoreconf |
253 |
-} |
254 |
- |
255 |
-src_configure() { |
256 |
- multibuild_foreach_variant multilib-minimal_src_configure |
257 |
-} |
258 |
- |
259 |
-get_xclibdir() { |
260 |
- printf -- "%s/%s/%s\n" \ |
261 |
- "$(usex split-usr '' '/usr')" \ |
262 |
- "$(get_libdir)" \ |
263 |
- "$(usex system '' 'xcrypt')" |
264 |
-} |
265 |
- |
266 |
-multilib_src_configure() { |
267 |
- local -a myconf=( |
268 |
- --disable-werror |
269 |
- --libdir=$(get_xclibdir) |
270 |
- --with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig |
271 |
- --includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')" |
272 |
- ) |
273 |
- |
274 |
- case "${MULTIBUILD_ID}" in |
275 |
- xcrypt_compat-*) |
276 |
- myconf+=( |
277 |
- --disable-static |
278 |
- --disable-xcrypt-compat-files |
279 |
- --enable-obsolete-api=yes |
280 |
- ) |
281 |
- ;; |
282 |
- xcrypt_nocompat-*) |
283 |
- myconf+=( |
284 |
- --enable-obsolete-api=no |
285 |
- $(use_enable static-libs static) |
286 |
- ) |
287 |
- ;; |
288 |
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
289 |
- esac |
290 |
- |
291 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
292 |
-} |
293 |
- |
294 |
-src_compile() { |
295 |
- multibuild_foreach_variant multilib-minimal_src_compile |
296 |
-} |
297 |
- |
298 |
-multilib_src_test() { |
299 |
- emake check |
300 |
-} |
301 |
- |
302 |
-src_test() { |
303 |
- multibuild_foreach_variant multilib-minimal_src_test |
304 |
-} |
305 |
- |
306 |
-src_install() { |
307 |
- multibuild_foreach_variant multilib-minimal_src_install |
308 |
- |
309 |
- ( |
310 |
- shopt -s failglob || die "failglob failed" |
311 |
- |
312 |
- # Make sure our man pages do not collide with glibc or man-pages. |
313 |
- for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do |
314 |
- mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \ |
315 |
- || die "mv failed" |
316 |
- done |
317 |
- ) || die "failglob error" |
318 |
- |
319 |
- # remove useless stuff from installation |
320 |
- find "${D}"/usr/share/doc/${PF} -type l -delete || die |
321 |
- find "${D}" -name '*.la' -delete || die |
322 |
-} |
323 |
- |
324 |
-multilib_src_install() { |
325 |
- emake DESTDIR="${D}" install |
326 |
- |
327 |
- # don't install the libcrypt.so symlink for the "compat" version |
328 |
- case "${MULTIBUILD_ID}" in |
329 |
- xcrypt_compat-*) |
330 |
- rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \ |
331 |
- || die "failed to remove extra compat libraries" |
332 |
- ;; |
333 |
- xcrypt_nocompat-*) |
334 |
- if use split-usr; then |
335 |
- ( |
336 |
- if use static-libs; then |
337 |
- # .a files are installed to /$(get_libdir) by default |
338 |
- # move static libraries to /usr prefix or portage will abort |
339 |
- shopt -s nullglob || die "failglob failed" |
340 |
- static_libs=( "${ED}"/$(get_xclibdir)/*.a ) |
341 |
- |
342 |
- if [[ -n ${static_libs[*]} ]]; then |
343 |
- dodir "/usr/$(get_xclibdir)" |
344 |
- mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \ |
345 |
- || die "moving static libs failed" |
346 |
- fi |
347 |
- fi |
348 |
- |
349 |
- if use system; then |
350 |
- # Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir) |
351 |
- # to allow linker to correctly find shared libraries. |
352 |
- shopt -s failglob || die "failglob failed" |
353 |
- |
354 |
- for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do |
355 |
- lib_file_basename="$(basename "${lib_file}")" |
356 |
- lib_file_target="$(basename "$(readlink -f "${lib_file}")")" |
357 |
- dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}" |
358 |
- done |
359 |
- |
360 |
- rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed" |
361 |
- fi |
362 |
- ) |
363 |
- fi |
364 |
- ;; |
365 |
- *) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";; |
366 |
- esac |
367 |
-} |