1 |
commit: 2987b5aac0b50a5ec2fbafe23910ccfda0a8ac64 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 8 16:58:31 2022 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 8 17:13:14 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2987b5aa |
7 |
|
8 |
dev-libs/nspr: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
dev-libs/nspr/Manifest | 2 - |
13 |
dev-libs/nspr/nspr-4.30.ebuild | 122 ----------------------------------------- |
14 |
dev-libs/nspr/nspr-4.31.ebuild | 122 ----------------------------------------- |
15 |
3 files changed, 246 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
18 |
index df9ec508c8ec..8620aaabfba8 100644 |
19 |
--- a/dev-libs/nspr/Manifest |
20 |
+++ b/dev-libs/nspr/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e |
23 |
-DIST nspr-4.31.tar.gz 1078163 BLAKE2B f1682a85e425c7babc40f1cbff4ec5b1101e04279df89c91520992bd288185cd52f682d4924e65a4620975d339d7704e359bfd36ac32e5ffebb8527d03f13171 SHA512 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed |
24 |
DIST nspr-4.32.tar.gz 1079004 BLAKE2B fda56b2a3fbbff8542e213b20a5935376694ea171d2cd014f93a711980411afe195835996c1612376d37eac028071ce58008e1fbf7a16176141fc18aa8163a73 SHA512 da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7 |
25 |
DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e |
26 |
|
27 |
diff --git a/dev-libs/nspr/nspr-4.30.ebuild b/dev-libs/nspr/nspr-4.30.ebuild |
28 |
deleted file mode 100644 |
29 |
index d6db3c7ef9ee..000000000000 |
30 |
--- a/dev-libs/nspr/nspr-4.30.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,122 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-inherit autotools toolchain-funcs multilib-minimal |
39 |
- |
40 |
-MIN_PV="$(ver_cut 2)" |
41 |
- |
42 |
-DESCRIPTION="Netscape Portable Runtime" |
43 |
-HOMEPAGE="https://www.mozilla.org/projects/nspr/" |
44 |
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" |
49 |
-IUSE="debug" |
50 |
- |
51 |
-MULTILIB_CHOST_TOOLS=( |
52 |
- /usr/bin/nspr-config |
53 |
-) |
54 |
- |
55 |
-PATCHES=( |
56 |
- "${FILESDIR}"/${PN}-4.23-prtime.patch |
57 |
- "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
58 |
- "${FILESDIR}"/${PN}-4.10.6-solaris.patch |
59 |
- "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
60 |
- "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
61 |
- # We do not need to pass -L$libdir via nspr-config --libs |
62 |
- "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch |
63 |
-) |
64 |
- |
65 |
-src_prepare() { |
66 |
- cd "${S}"/nspr || die |
67 |
- |
68 |
- default |
69 |
- |
70 |
- use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch |
71 |
- |
72 |
- # rename configure.in to configure.ac for new autotools compatibility |
73 |
- if [[ -e "${S}"/nspr/configure.in ]] ; then |
74 |
- einfo "Renaming configure.in to configure.ac" |
75 |
- mv "${S}"/nspr/configure.{in,ac} || die |
76 |
- else |
77 |
- elog "configure.in rename logic can be removed from ebuild." |
78 |
- fi |
79 |
- |
80 |
- # We must run eautoconf to regenerate configure |
81 |
- eautoconf |
82 |
- |
83 |
- # make sure it won't find Perl out of Prefix |
84 |
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die |
85 |
- |
86 |
- # Respect LDFLAGS |
87 |
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ |
88 |
- "${S}"/nspr/config/rules.mk || die |
89 |
-} |
90 |
- |
91 |
-multilib_src_configure() { |
92 |
- # We use the standard BUILD_xxx but nspr uses HOST_xxx |
93 |
- tc-export_build_env BUILD_CC |
94 |
- export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} |
95 |
- tc-export AR CC CXX RANLIB |
96 |
- [[ ${CBUILD} != ${CHOST} ]] \ |
97 |
- && export CROSS_COMPILE=1 \ |
98 |
- || unset CROSS_COMPILE |
99 |
- |
100 |
- local myconf=( |
101 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
102 |
- $(use_enable debug) |
103 |
- $(use_enable !debug optimize) |
104 |
- ) |
105 |
- |
106 |
- # The configure has some fancy --enable-{{n,x}32,64bit} switches |
107 |
- # that trigger some code conditional to platform & arch. This really |
108 |
- # matters for the few common arches (x86, ppc) but we pass a little |
109 |
- # more of them to be future-proof. |
110 |
- |
111 |
- # use ABI first, this will work for most cases |
112 |
- case "${ABI}" in |
113 |
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; |
114 |
- n32) myconf+=( --enable-n32 );; |
115 |
- x32) myconf+=( --enable-x32 );; |
116 |
- s390x|*64) myconf+=( --enable-64bit );; |
117 |
- default) # no abi actually set, fall back to old check |
118 |
- einfo "Running a short build test to determine 64bit'ness" |
119 |
- echo > "${T}"/test.c || die |
120 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die |
121 |
- case $(file "${T}"/test.o) in |
122 |
- *32-bit*x86-64*) myconf+=( --enable-x32 );; |
123 |
- *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; |
124 |
- *32-bit*|*ppc*|*i386*) ;; |
125 |
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
126 |
- esac ;; |
127 |
- *) ;; |
128 |
- esac |
129 |
- |
130 |
- # Ancient autoconf needs help finding the right tools. |
131 |
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ |
132 |
- ac_cv_path_AR="${AR}" \ |
133 |
- econf "${myconf[@]}" |
134 |
-} |
135 |
- |
136 |
-multilib_src_install() { |
137 |
- # Their build system is royally confusing, as usual |
138 |
- MINOR_VERSION=${MIN_PV} # Used for .so version |
139 |
- emake DESTDIR="${D}" install |
140 |
- |
141 |
- einfo "removing static libraries as upstream has requested!" |
142 |
- rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." |
143 |
- |
144 |
- # install nspr-config |
145 |
- dobin config/nspr-config |
146 |
- |
147 |
- # Remove stupid files in /usr/bin |
148 |
- rm "${ED}"/usr/bin/prerr.properties || die |
149 |
- |
150 |
- # This is used only to generate prerr.c and prerr.h at build time. |
151 |
- # No other projects use it, and we don't want to depend on perl. |
152 |
- # Talked to upstream and they agreed w/punting. |
153 |
- rm "${ED}"/usr/bin/compile-et.pl || die |
154 |
-} |
155 |
|
156 |
diff --git a/dev-libs/nspr/nspr-4.31.ebuild b/dev-libs/nspr/nspr-4.31.ebuild |
157 |
deleted file mode 100644 |
158 |
index c0dd76d1aa2e..000000000000 |
159 |
--- a/dev-libs/nspr/nspr-4.31.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,122 +0,0 @@ |
162 |
-# Copyright 1999-2022 Gentoo Authors |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
- |
165 |
-EAPI=7 |
166 |
- |
167 |
-inherit autotools toolchain-funcs multilib-minimal |
168 |
- |
169 |
-MIN_PV="$(ver_cut 2)" |
170 |
- |
171 |
-DESCRIPTION="Netscape Portable Runtime" |
172 |
-HOMEPAGE="https://www.mozilla.org/projects/nspr/" |
173 |
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" |
174 |
- |
175 |
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" |
176 |
-SLOT="0" |
177 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" |
178 |
-IUSE="debug" |
179 |
- |
180 |
-MULTILIB_CHOST_TOOLS=( |
181 |
- /usr/bin/nspr-config |
182 |
-) |
183 |
- |
184 |
-PATCHES=( |
185 |
- "${FILESDIR}"/${PN}-4.23-prtime.patch |
186 |
- "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
187 |
- "${FILESDIR}"/${PN}-4.10.6-solaris.patch |
188 |
- "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
189 |
- "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
190 |
- # We do not need to pass -L$libdir via nspr-config --libs |
191 |
- "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch |
192 |
-) |
193 |
- |
194 |
-src_prepare() { |
195 |
- cd "${S}"/nspr || die |
196 |
- |
197 |
- default |
198 |
- |
199 |
- use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch |
200 |
- |
201 |
- # rename configure.in to configure.ac for new autotools compatibility |
202 |
- if [[ -e "${S}"/nspr/configure.in ]] ; then |
203 |
- einfo "Renaming configure.in to configure.ac" |
204 |
- mv "${S}"/nspr/configure.{in,ac} || die |
205 |
- else |
206 |
- elog "configure.in rename logic can be removed from ebuild." |
207 |
- fi |
208 |
- |
209 |
- # We must run eautoconf to regenerate configure |
210 |
- eautoconf |
211 |
- |
212 |
- # make sure it won't find Perl out of Prefix |
213 |
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die |
214 |
- |
215 |
- # Respect LDFLAGS |
216 |
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ |
217 |
- "${S}"/nspr/config/rules.mk || die |
218 |
-} |
219 |
- |
220 |
-multilib_src_configure() { |
221 |
- # We use the standard BUILD_xxx but nspr uses HOST_xxx |
222 |
- tc-export_build_env BUILD_CC |
223 |
- export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} |
224 |
- tc-export AR CC CXX RANLIB |
225 |
- [[ ${CBUILD} != ${CHOST} ]] \ |
226 |
- && export CROSS_COMPILE=1 \ |
227 |
- || unset CROSS_COMPILE |
228 |
- |
229 |
- local myconf=( |
230 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
231 |
- $(use_enable debug) |
232 |
- $(use_enable !debug optimize) |
233 |
- ) |
234 |
- |
235 |
- # The configure has some fancy --enable-{{n,x}32,64bit} switches |
236 |
- # that trigger some code conditional to platform & arch. This really |
237 |
- # matters for the few common arches (x86, ppc) but we pass a little |
238 |
- # more of them to be future-proof. |
239 |
- |
240 |
- # use ABI first, this will work for most cases |
241 |
- case "${ABI}" in |
242 |
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;; |
243 |
- n32) myconf+=( --enable-n32 );; |
244 |
- x32) myconf+=( --enable-x32 );; |
245 |
- s390x|*64) myconf+=( --enable-64bit );; |
246 |
- default) # no abi actually set, fall back to old check |
247 |
- einfo "Running a short build test to determine 64bit'ness" |
248 |
- echo > "${T}"/test.c || die |
249 |
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die |
250 |
- case $(file "${T}"/test.o) in |
251 |
- *32-bit*x86-64*) myconf+=( --enable-x32 );; |
252 |
- *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );; |
253 |
- *32-bit*|*ppc*|*i386*) ;; |
254 |
- *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
255 |
- esac ;; |
256 |
- *) ;; |
257 |
- esac |
258 |
- |
259 |
- # Ancient autoconf needs help finding the right tools. |
260 |
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \ |
261 |
- ac_cv_path_AR="${AR}" \ |
262 |
- econf "${myconf[@]}" |
263 |
-} |
264 |
- |
265 |
-multilib_src_install() { |
266 |
- # Their build system is royally confusing, as usual |
267 |
- MINOR_VERSION=${MIN_PV} # Used for .so version |
268 |
- emake DESTDIR="${D}" install |
269 |
- |
270 |
- einfo "removing static libraries as upstream has requested!" |
271 |
- rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries." |
272 |
- |
273 |
- # install nspr-config |
274 |
- dobin config/nspr-config |
275 |
- |
276 |
- # Remove stupid files in /usr/bin |
277 |
- rm "${ED}"/usr/bin/prerr.properties || die |
278 |
- |
279 |
- # This is used only to generate prerr.c and prerr.h at build time. |
280 |
- # No other projects use it, and we don't want to depend on perl. |
281 |
- # Talked to upstream and they agreed w/punting. |
282 |
- rm "${ED}"/usr/bin/compile-et.pl || die |
283 |
-} |