Gentoo Archives: gentoo-commits

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