1 |
commit: 1f6b996306d92586ae2fca5a614bf39467b92e65 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 09:18:02 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 18:23:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6b9963 |
7 |
|
8 |
dev-util/pkgconfig: Drop 0.28-r2, 0.28-r3 and 0.29.1 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-util/pkgconfig/Manifest | 2 - |
14 |
dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch | 281 --------------------- |
15 |
...g-0.28-strip_system_library_dirs_reliably.patch | 30 --- |
16 |
dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild | 95 ------- |
17 |
dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild | 105 -------- |
18 |
dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 117 --------- |
19 |
6 files changed, 630 deletions(-) |
20 |
|
21 |
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest |
22 |
index 5788eb45abc..cd45508224c 100644 |
23 |
--- a/dev-util/pkgconfig/Manifest |
24 |
+++ b/dev-util/pkgconfig/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
27 |
-DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 |
28 |
DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 |
29 |
|
30 |
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch |
31 |
deleted file mode 100644 |
32 |
index 9515f4f650a..00000000000 |
33 |
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch |
34 |
+++ /dev/null |
35 |
@@ -1,281 +0,0 @@ |
36 |
-From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001 |
37 |
-From: Peter Jones <pjones@××××××.com> |
38 |
-Date: Wed, 15 Apr 2015 12:25:29 -0400 |
39 |
-Subject: [PATCH] Enable large file support |
40 |
- |
41 |
-https://bugs.freedesktop.org/show_bug.cgi?id=90078 |
42 |
- |
43 |
-Signed-off-by: Peter Jones <pjones@××××××.com> |
44 |
- |
45 |
-[Alexandre Rostovtsev <tetromino@g.o>: expand out configure, |
46 |
- config.h.in modifications.] |
47 |
---- |
48 |
- configure.ac | 3 + |
49 |
- config.h.in | 11 ++++ |
50 |
- configure | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
51 |
- 3 files changed, 217 insertions(+) |
52 |
- |
53 |
-diff --git a/configure.ac b/configure.ac |
54 |
-index 2b33371..1a321e1 100644 |
55 |
---- a/configure.ac |
56 |
-+++ b/configure.ac |
57 |
-@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1 |
58 |
- dnl to make |
59 |
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
60 |
- |
61 |
-+dnl Enable large file support |
62 |
-+AC_SYS_LARGEFILE |
63 |
-+ |
64 |
- dnl Check for programs |
65 |
- AC_PROG_CC |
66 |
- AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp]) |
67 |
-diff --git a/config.h.in b/config.h.in |
68 |
-index 0aac8f3..fdae454 100644 |
69 |
---- a/config.h.in |
70 |
-+++ b/config.h.in |
71 |
-@@ -72,3 +72,14 @@ |
72 |
- |
73 |
- /* Version number of package */ |
74 |
- #undef VERSION |
75 |
-+ |
76 |
-+/* Enable large inode numbers on Mac OS X 10.5. */ |
77 |
-+#ifndef _DARWIN_USE_64_BIT_INODE |
78 |
-+# define _DARWIN_USE_64_BIT_INODE 1 |
79 |
-+#endif |
80 |
-+ |
81 |
-+/* Number of bits in a file offset, on hosts where this is settable. */ |
82 |
-+#undef _FILE_OFFSET_BITS |
83 |
-+ |
84 |
-+/* Define for large files, on AIX-style hosts. */ |
85 |
-+#undef _LARGE_FILES |
86 |
-diff --git a/configure b/configure |
87 |
-index 160ecab..f897e22 100755 |
88 |
---- a/configure |
89 |
-+++ b/configure |
90 |
-@@ -783,6 +783,7 @@ with_gnu_ld |
91 |
- with_sysroot |
92 |
- enable_libtool_lock |
93 |
- enable_silent_rules |
94 |
-+enable_largefile |
95 |
- with_pc_path |
96 |
- with_system_include_path |
97 |
- with_system_library_path |
98 |
-@@ -1435,6 +1436,7 @@ Optional Features: |
99 |
- --disable-libtool-lock avoid locking (might break parallel builds) |
100 |
- --enable-silent-rules less verbose build output (undo: "make V=1") |
101 |
- --disable-silent-rules verbose build output (undo: "make V=0") |
102 |
-+ --disable-largefile omit support for large files |
103 |
- --enable-indirect-deps list both direct and indirect dependencies. |
104 |
- --disable-indirect-deps only list direct dependencies. |
105 |
- default=auto |
106 |
-@@ -11389,6 +11391,207 @@ fi |
107 |
- AM_BACKSLASH='\' |
108 |
- |
109 |
- |
110 |
-+# Check whether --enable-largefile was given. |
111 |
-+if test "${enable_largefile+set}" = set; then : |
112 |
-+ enableval=$enable_largefile; |
113 |
-+fi |
114 |
-+ |
115 |
-+if test "$enable_largefile" != no; then |
116 |
-+ |
117 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 |
118 |
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; } |
119 |
-+if ${ac_cv_sys_largefile_CC+:} false; then : |
120 |
-+ $as_echo_n "(cached) " >&6 |
121 |
-+else |
122 |
-+ ac_cv_sys_largefile_CC=no |
123 |
-+ if test "$GCC" != yes; then |
124 |
-+ ac_save_CC=$CC |
125 |
-+ while :; do |
126 |
-+ # IRIX 6.2 and later do not support large files by default, |
127 |
-+ # so use the C compiler's -n32 option if that helps. |
128 |
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
129 |
-+/* end confdefs.h. */ |
130 |
-+#include <sys/types.h> |
131 |
-+ /* Check that off_t can represent 2**63 - 1 correctly. |
132 |
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807, |
133 |
-+ since some C++ compilers masquerading as C compilers |
134 |
-+ incorrectly reject 9223372036854775807. */ |
135 |
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
136 |
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
137 |
-+ && LARGE_OFF_T % 2147483647 == 1) |
138 |
-+ ? 1 : -1]; |
139 |
-+int |
140 |
-+main () |
141 |
-+{ |
142 |
-+ |
143 |
-+ ; |
144 |
-+ return 0; |
145 |
-+} |
146 |
-+_ACEOF |
147 |
-+ if ac_fn_c_try_compile "$LINENO"; then : |
148 |
-+ break |
149 |
-+fi |
150 |
-+rm -f core conftest.err conftest.$ac_objext |
151 |
-+ CC="$CC -n32" |
152 |
-+ if ac_fn_c_try_compile "$LINENO"; then : |
153 |
-+ ac_cv_sys_largefile_CC=' -n32'; break |
154 |
-+fi |
155 |
-+rm -f core conftest.err conftest.$ac_objext |
156 |
-+ break |
157 |
-+ done |
158 |
-+ CC=$ac_save_CC |
159 |
-+ rm -f conftest.$ac_ext |
160 |
-+ fi |
161 |
-+fi |
162 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 |
163 |
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; } |
164 |
-+ if test "$ac_cv_sys_largefile_CC" != no; then |
165 |
-+ CC=$CC$ac_cv_sys_largefile_CC |
166 |
-+ fi |
167 |
-+ |
168 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 |
169 |
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } |
170 |
-+if ${ac_cv_sys_file_offset_bits+:} false; then : |
171 |
-+ $as_echo_n "(cached) " >&6 |
172 |
-+else |
173 |
-+ while :; do |
174 |
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
175 |
-+/* end confdefs.h. */ |
176 |
-+#include <sys/types.h> |
177 |
-+ /* Check that off_t can represent 2**63 - 1 correctly. |
178 |
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807, |
179 |
-+ since some C++ compilers masquerading as C compilers |
180 |
-+ incorrectly reject 9223372036854775807. */ |
181 |
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
182 |
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
183 |
-+ && LARGE_OFF_T % 2147483647 == 1) |
184 |
-+ ? 1 : -1]; |
185 |
-+int |
186 |
-+main () |
187 |
-+{ |
188 |
-+ |
189 |
-+ ; |
190 |
-+ return 0; |
191 |
-+} |
192 |
-+_ACEOF |
193 |
-+if ac_fn_c_try_compile "$LINENO"; then : |
194 |
-+ ac_cv_sys_file_offset_bits=no; break |
195 |
-+fi |
196 |
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
197 |
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
198 |
-+/* end confdefs.h. */ |
199 |
-+#define _FILE_OFFSET_BITS 64 |
200 |
-+#include <sys/types.h> |
201 |
-+ /* Check that off_t can represent 2**63 - 1 correctly. |
202 |
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807, |
203 |
-+ since some C++ compilers masquerading as C compilers |
204 |
-+ incorrectly reject 9223372036854775807. */ |
205 |
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
206 |
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
207 |
-+ && LARGE_OFF_T % 2147483647 == 1) |
208 |
-+ ? 1 : -1]; |
209 |
-+int |
210 |
-+main () |
211 |
-+{ |
212 |
-+ |
213 |
-+ ; |
214 |
-+ return 0; |
215 |
-+} |
216 |
-+_ACEOF |
217 |
-+if ac_fn_c_try_compile "$LINENO"; then : |
218 |
-+ ac_cv_sys_file_offset_bits=64; break |
219 |
-+fi |
220 |
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
221 |
-+ ac_cv_sys_file_offset_bits=unknown |
222 |
-+ break |
223 |
-+done |
224 |
-+fi |
225 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 |
226 |
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; } |
227 |
-+case $ac_cv_sys_file_offset_bits in #( |
228 |
-+ no | unknown) ;; |
229 |
-+ *) |
230 |
-+cat >>confdefs.h <<_ACEOF |
231 |
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits |
232 |
-+_ACEOF |
233 |
-+;; |
234 |
-+esac |
235 |
-+rm -rf conftest* |
236 |
-+ if test $ac_cv_sys_file_offset_bits = unknown; then |
237 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 |
238 |
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } |
239 |
-+if ${ac_cv_sys_large_files+:} false; then : |
240 |
-+ $as_echo_n "(cached) " >&6 |
241 |
-+else |
242 |
-+ while :; do |
243 |
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
244 |
-+/* end confdefs.h. */ |
245 |
-+#include <sys/types.h> |
246 |
-+ /* Check that off_t can represent 2**63 - 1 correctly. |
247 |
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807, |
248 |
-+ since some C++ compilers masquerading as C compilers |
249 |
-+ incorrectly reject 9223372036854775807. */ |
250 |
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
251 |
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
252 |
-+ && LARGE_OFF_T % 2147483647 == 1) |
253 |
-+ ? 1 : -1]; |
254 |
-+int |
255 |
-+main () |
256 |
-+{ |
257 |
-+ |
258 |
-+ ; |
259 |
-+ return 0; |
260 |
-+} |
261 |
-+_ACEOF |
262 |
-+if ac_fn_c_try_compile "$LINENO"; then : |
263 |
-+ ac_cv_sys_large_files=no; break |
264 |
-+fi |
265 |
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
266 |
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
267 |
-+/* end confdefs.h. */ |
268 |
-+#define _LARGE_FILES 1 |
269 |
-+#include <sys/types.h> |
270 |
-+ /* Check that off_t can represent 2**63 - 1 correctly. |
271 |
-+ We can't simply define LARGE_OFF_T to be 9223372036854775807, |
272 |
-+ since some C++ compilers masquerading as C compilers |
273 |
-+ incorrectly reject 9223372036854775807. */ |
274 |
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) |
275 |
-+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 |
276 |
-+ && LARGE_OFF_T % 2147483647 == 1) |
277 |
-+ ? 1 : -1]; |
278 |
-+int |
279 |
-+main () |
280 |
-+{ |
281 |
-+ |
282 |
-+ ; |
283 |
-+ return 0; |
284 |
-+} |
285 |
-+_ACEOF |
286 |
-+if ac_fn_c_try_compile "$LINENO"; then : |
287 |
-+ ac_cv_sys_large_files=1; break |
288 |
-+fi |
289 |
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
290 |
-+ ac_cv_sys_large_files=unknown |
291 |
-+ break |
292 |
-+done |
293 |
-+fi |
294 |
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 |
295 |
-+$as_echo "$ac_cv_sys_large_files" >&6; } |
296 |
-+case $ac_cv_sys_large_files in #( |
297 |
-+ no | unknown) ;; |
298 |
-+ *) |
299 |
-+cat >>confdefs.h <<_ACEOF |
300 |
-+#define _LARGE_FILES $ac_cv_sys_large_files |
301 |
-+_ACEOF |
302 |
-+;; |
303 |
-+esac |
304 |
-+rm -rf conftest* |
305 |
-+ fi |
306 |
-+ |
307 |
-+ |
308 |
-+fi |
309 |
-+ |
310 |
-+ |
311 |
- ac_ext=c |
312 |
- ac_cpp='$CPP $CPPFLAGS' |
313 |
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
314 |
--- |
315 |
-2.4.2 |
316 |
- |
317 |
|
318 |
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch |
319 |
deleted file mode 100644 |
320 |
index e1a2bb534a3..00000000000 |
321 |
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch |
322 |
+++ /dev/null |
323 |
@@ -1,30 +0,0 @@ |
324 |
-http://bugs.gentoo.org/512336 |
325 |
-http://bugs.freedesktop.org/show_bug.cgi?id=78077 |
326 |
- |
327 |
-From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001 |
328 |
-From: Andrew Oakley <aoakley@××××××.com> |
329 |
-Date: Tue, 29 Apr 2014 13:14:35 +0100 |
330 |
-Subject: [PATCH 1/1] Strip system library directories reliably |
331 |
- |
332 |
-This loop was changed from a while loop to a for loop in commit |
333 |
-9bf6277b, but the iterator is now advanced twice each time round the |
334 |
-loop. |
335 |
---- |
336 |
- pkg.c | 1 - |
337 |
- 1 file changed, 1 deletion(-) |
338 |
- |
339 |
-diff --git a/pkg.c b/pkg.c |
340 |
-index 3697fec..c847c95 100644 |
341 |
---- a/pkg.c |
342 |
-+++ b/pkg.c |
343 |
-@@ -917,7 +917,6 @@ verify_package (Package *pkg) |
344 |
- } |
345 |
- system_dir_iter = system_dir_iter->next; |
346 |
- } |
347 |
-- iter = iter->next; |
348 |
- } |
349 |
- g_list_free (system_directories); |
350 |
- |
351 |
--- |
352 |
-1.8.3.2 |
353 |
- |
354 |
|
355 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
356 |
deleted file mode 100644 |
357 |
index b6eb4fb0431..00000000000 |
358 |
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild |
359 |
+++ /dev/null |
360 |
@@ -1,95 +0,0 @@ |
361 |
-# Copyright 1999-2021 Gentoo Authors |
362 |
-# Distributed under the terms of the GNU General Public License v2 |
363 |
- |
364 |
-EAPI=5 |
365 |
- |
366 |
-inherit epatch flag-o-matic libtool multilib multilib-minimal |
367 |
- |
368 |
-MY_P=pkg-config-${PV} |
369 |
- |
370 |
-if [[ ${PV} == *9999* ]]; then |
371 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" |
372 |
- inherit autotools git-2 |
373 |
-else |
374 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
375 |
- SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
376 |
-fi |
377 |
- |
378 |
-DESCRIPTION="Package config system that manages compile/link flags" |
379 |
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" |
380 |
- |
381 |
-LICENSE="GPL-2" |
382 |
-SLOT="0" |
383 |
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
384 |
- |
385 |
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
386 |
- !dev-util/pkgconf[pkg-config] |
387 |
- !dev-util/pkg-config-lite |
388 |
- !dev-util/pkgconfig-openbsd[pkg-config]" |
389 |
-DEPEND="${RDEPEND}" |
390 |
- |
391 |
-S=${WORKDIR}/${MY_P} |
392 |
- |
393 |
-DOCS=( AUTHORS NEWS README ) |
394 |
- |
395 |
-src_prepare() { |
396 |
- epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch |
397 |
- |
398 |
- sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 |
399 |
- |
400 |
- epatch_user |
401 |
- |
402 |
- if [[ ${PV} == *9999* ]]; then |
403 |
- eautoreconf |
404 |
- else |
405 |
- elibtoolize |
406 |
- fi |
407 |
-} |
408 |
- |
409 |
-multilib_src_configure() { |
410 |
- local myconf |
411 |
- |
412 |
- if use internal-glib; then |
413 |
- myconf+=' --with-internal-glib' |
414 |
- # non-glibc platforms use GNU libiconv, but configure needs to |
415 |
- # know about that not to get confused when it finds something |
416 |
- # outside the prefix too |
417 |
- if use prefix && use !elibc_glibc ; then |
418 |
- myconf+=" --with-libiconv=gnu" |
419 |
- # add the libdir for libtool, otherwise it'll make love with system |
420 |
- # installed libiconv |
421 |
- append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
422 |
- fi |
423 |
- else |
424 |
- if ! has_version --host-root dev-util/pkgconfig; then |
425 |
- export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
426 |
- export GLIB_LIBS="-lglib-2.0" |
427 |
- fi |
428 |
- fi |
429 |
- |
430 |
- use ppc64 && use hardened && replace-flags -O[2-3] -O1 |
431 |
- |
432 |
- # Force using all the requirements when linking, so that needed -pthread |
433 |
- # lines are inherited between libraries |
434 |
- use elibc_FreeBSD && myconf+=' --enable-indirect-deps' |
435 |
- |
436 |
- [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' |
437 |
- |
438 |
- ECONF_SOURCE=${S} \ |
439 |
- econf \ |
440 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
441 |
- --with-system-include-path="${EPREFIX}"/usr/include \ |
442 |
- --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ |
443 |
- ${myconf} |
444 |
-} |
445 |
- |
446 |
-multilib_src_install() { |
447 |
- emake DESTDIR="${D}" install |
448 |
- |
449 |
- if use prefix; then |
450 |
- # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to |
451 |
- # simplify cross-prefix builds |
452 |
- echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} |
453 |
- doenvd "${T}"/99${PN} |
454 |
- fi |
455 |
-} |
456 |
|
457 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild |
458 |
deleted file mode 100644 |
459 |
index abe357081ec..00000000000 |
460 |
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild |
461 |
+++ /dev/null |
462 |
@@ -1,105 +0,0 @@ |
463 |
-# Copyright 1999-2021 Gentoo Authors |
464 |
-# Distributed under the terms of the GNU General Public License v2 |
465 |
- |
466 |
-EAPI=5 |
467 |
- |
468 |
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 |
469 |
-inherit epatch flag-o-matic libtool multilib multilib-minimal |
470 |
- |
471 |
-MY_P=pkg-config-${PV} |
472 |
- |
473 |
-if [[ ${PV} == *9999* ]]; then |
474 |
- # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER |
475 |
- # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 |
476 |
- WANT_AUTOMAKE=1.12 |
477 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" |
478 |
- EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} |
479 |
- inherit autotools git-r3 |
480 |
-else |
481 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
482 |
- SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
483 |
-fi |
484 |
- |
485 |
-DESCRIPTION="Package config system that manages compile/link flags" |
486 |
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" |
487 |
- |
488 |
-LICENSE="GPL-2" |
489 |
-SLOT="0" |
490 |
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
491 |
- |
492 |
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
493 |
- !dev-util/pkgconf[pkg-config] |
494 |
- !dev-util/pkg-config-lite |
495 |
- !dev-util/pkgconfig-openbsd[pkg-config]" |
496 |
-DEPEND="${RDEPEND}" |
497 |
- |
498 |
-S=${WORKDIR}/${MY_P} |
499 |
- |
500 |
-DOCS=( AUTHORS NEWS README ) |
501 |
- |
502 |
-src_prepare() { |
503 |
- epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch |
504 |
- |
505 |
- sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 |
506 |
- |
507 |
- # Large file support, fixed in upstream git; bug #550508 |
508 |
- epatch "${FILESDIR}"/${P}-lfs.patch |
509 |
- # lfs patch touches config.h.in; need this hack to prevent autoreconf and automake |
510 |
- touch aclocal.m4 config.h.in Makefile.in |
511 |
- |
512 |
- epatch_user |
513 |
- |
514 |
- if [[ ${PV} == *9999* ]]; then |
515 |
- eautoreconf |
516 |
- else |
517 |
- elibtoolize |
518 |
- fi |
519 |
-} |
520 |
- |
521 |
-multilib_src_configure() { |
522 |
- local myconf |
523 |
- |
524 |
- if use internal-glib; then |
525 |
- myconf+=' --with-internal-glib' |
526 |
- # non-glibc platforms use GNU libiconv, but configure needs to |
527 |
- # know about that not to get confused when it finds something |
528 |
- # outside the prefix too |
529 |
- if use prefix && use !elibc_glibc ; then |
530 |
- myconf+=" --with-libiconv=gnu" |
531 |
- # add the libdir for libtool, otherwise it'll make love with system |
532 |
- # installed libiconv |
533 |
- append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
534 |
- fi |
535 |
- else |
536 |
- if ! has_version --host-root dev-util/pkgconfig; then |
537 |
- export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
538 |
- export GLIB_LIBS="-lglib-2.0" |
539 |
- fi |
540 |
- fi |
541 |
- |
542 |
- use ppc64 && use hardened && replace-flags -O[2-3] -O1 |
543 |
- |
544 |
- # Force using all the requirements when linking, so that needed -pthread |
545 |
- # lines are inherited between libraries |
546 |
- use elibc_FreeBSD && myconf+=' --enable-indirect-deps' |
547 |
- |
548 |
- [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' |
549 |
- |
550 |
- ECONF_SOURCE=${S} \ |
551 |
- econf \ |
552 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
553 |
- --with-system-include-path="${EPREFIX}"/usr/include \ |
554 |
- --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ |
555 |
- ${myconf} |
556 |
-} |
557 |
- |
558 |
-multilib_src_install() { |
559 |
- emake DESTDIR="${D}" install |
560 |
- |
561 |
- if use prefix; then |
562 |
- # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to |
563 |
- # simplify cross-prefix builds |
564 |
- echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} |
565 |
- doenvd "${T}"/99${PN} |
566 |
- fi |
567 |
-} |
568 |
|
569 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild |
570 |
deleted file mode 100644 |
571 |
index d2554a4effd..00000000000 |
572 |
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild |
573 |
+++ /dev/null |
574 |
@@ -1,117 +0,0 @@ |
575 |
-# Copyright 1999-2021 Gentoo Authors |
576 |
-# Distributed under the terms of the GNU General Public License v2 |
577 |
- |
578 |
-EAPI=6 |
579 |
- |
580 |
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 |
581 |
-inherit eutils flag-o-matic libtool multilib multilib-minimal |
582 |
- |
583 |
-MY_P=pkg-config-${PV} |
584 |
- |
585 |
-if [[ ${PV} == *9999* ]]; then |
586 |
- # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER |
587 |
- # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 |
588 |
- WANT_AUTOMAKE=1.12 |
589 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" |
590 |
- EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} |
591 |
- inherit autotools git-r3 |
592 |
-else |
593 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
594 |
- SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
595 |
-fi |
596 |
- |
597 |
-DESCRIPTION="Package config system that manages compile/link flags" |
598 |
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" |
599 |
- |
600 |
-LICENSE="GPL-2" |
601 |
-SLOT="0" |
602 |
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" |
603 |
- |
604 |
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
605 |
- !dev-util/pkgconf[pkg-config] |
606 |
- !dev-util/pkg-config-lite |
607 |
- !dev-util/pkgconfig-openbsd[pkg-config] |
608 |
- virtual/libintl" |
609 |
-DEPEND="${RDEPEND}" |
610 |
- |
611 |
-S=${WORKDIR}/${MY_P} |
612 |
- |
613 |
-DOCS=( AUTHORS NEWS README ) |
614 |
- |
615 |
-src_prepare() { |
616 |
- sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 |
617 |
- |
618 |
- eapply_user |
619 |
- |
620 |
- if [[ ${PV} == *9999* ]]; then |
621 |
- eautoreconf |
622 |
- else |
623 |
- elibtoolize |
624 |
- fi |
625 |
- |
626 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
627 |
- # fix standards conflicts |
628 |
- sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ |
629 |
- glib/configure || die |
630 |
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ |
631 |
- glib/glib/giounix.c || die |
632 |
- fi |
633 |
-} |
634 |
- |
635 |
-multilib_src_configure() { |
636 |
- local myconf |
637 |
- |
638 |
- if use internal-glib; then |
639 |
- myconf+=' --with-internal-glib' |
640 |
- # non-glibc platforms use GNU libiconv, but configure needs to |
641 |
- # know about that not to get confused when it finds something |
642 |
- # outside the prefix too |
643 |
- if use prefix && use !elibc_glibc ; then |
644 |
- myconf+=" --with-libiconv=gnu" |
645 |
- # add the libdir for libtool, otherwise it'll make love with system |
646 |
- # installed libiconv |
647 |
- append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
648 |
- # the glib objects reference symbols from these frameworks, |
649 |
- # not good, esp. since Carbon should be deprecated |
650 |
- [[ ${CHOST} == *-darwin* ]] && \ |
651 |
- append-ldflags -framework CoreFoundation -framework Carbon |
652 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
653 |
- # required due to __EXTENSIONS__ |
654 |
- append-cppflags -DENABLE_NLS |
655 |
- # similar to Darwin |
656 |
- append-ldflags -lintl |
657 |
- fi |
658 |
- fi |
659 |
- else |
660 |
- if ! has_version --host-root dev-util/pkgconfig; then |
661 |
- export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
662 |
- export GLIB_LIBS="-lglib-2.0" |
663 |
- fi |
664 |
- fi |
665 |
- |
666 |
- use ppc64 && use hardened && replace-flags -O[2-3] -O1 |
667 |
- |
668 |
- # Force using all the requirements when linking, so that needed -pthread |
669 |
- # lines are inherited between libraries |
670 |
- use elibc_FreeBSD && myconf+=' --enable-indirect-deps' |
671 |
- |
672 |
- [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' |
673 |
- |
674 |
- ECONF_SOURCE=${S} \ |
675 |
- econf \ |
676 |
- --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ |
677 |
- --with-system-include-path="${EPREFIX}"/usr/include \ |
678 |
- --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ |
679 |
- ${myconf} |
680 |
-} |
681 |
- |
682 |
-multilib_src_install() { |
683 |
- emake DESTDIR="${D}" install |
684 |
- |
685 |
- if use prefix; then |
686 |
- # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to |
687 |
- # simplify cross-prefix builds |
688 |
- echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} |
689 |
- doenvd "${T}"/99${PN} |
690 |
- fi |
691 |
-} |