Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/
Date: Sun, 30 Aug 2020 22:57:57
Message-Id: 1598828262.344f36822478d89b9f914e1d1f0933cc54c400e3.whissi@gentoo
1 commit: 344f36822478d89b9f914e1d1f0933cc54c400e3
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 22:57:42 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 22:57:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344f3682
7
8 dev-libs/nspr: drop old
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-libs/nspr/Manifest | 1 -
14 dev-libs/nspr/nspr-4.25.ebuild | 122 -----------------------------------------
15 2 files changed, 123 deletions(-)
16
17 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
18 index 751dfb75873..bb8358d1f13 100644
19 --- a/dev-libs/nspr/Manifest
20 +++ b/dev-libs/nspr/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST nspr-4.25.tar.gz 1079633 BLAKE2B 377e5ec0e60cca13f1ee988adb10870bbb6cb9e4eb61e4434152418d4f8d446741a192d7019298ec2669b8e190cacb6a1ca9c4b2838e9b14dd3590ed40facdd2 SHA512 b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562
23 DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7c71400e691dc3e882ec6d63cbf13996eb1ae1a03a294def419e1669e38fe42990c66efedce03f121087e6c SHA512 d6632cde3570ee386ee1459257eba99f91dd62fa905fd82679222c83d63c185b76d8dca0422d4349de2dfce603472ae52bc0dcced0f142acb733374c74155d3c
24 DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
25 DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
26
27 diff --git a/dev-libs/nspr/nspr-4.25.ebuild b/dev-libs/nspr/nspr-4.25.ebuild
28 deleted file mode 100644
29 index 22a70f0cfde..00000000000
30 --- a/dev-libs/nspr/nspr-4.25.ebuild
31 +++ /dev/null
32 @@ -1,122 +0,0 @@
33 -# Copyright 1999-2020 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="http://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 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
49 -IUSE="debug elibc_musl"
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 -}