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: Mon, 03 Sep 2018 09:42:26
Message-Id: 1535967730.b982d7cc8fd20a3a1bb951a29a9115a0fff7a23d.polynomial-c@gentoo
1 commit: b982d7cc8fd20a3a1bb951a29a9115a0fff7a23d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 3 08:36:57 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 3 09:42:10 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b982d7cc
7
8 dev-libs/nspr: Removed old.
9
10 Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12 dev-libs/nspr/Manifest | 1 -
13 dev-libs/nspr/nspr-4.18.ebuild | 118 -----------------------------------------
14 2 files changed, 119 deletions(-)
15
16 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
17 index 747ea25c777..be14ae2b613 100644
18 --- a/dev-libs/nspr/Manifest
19 +++ b/dev-libs/nspr/Manifest
20 @@ -1,4 +1,3 @@
21 DIST nspr-4.13.1.tar.gz 1136646 BLAKE2B 68a756f16f3bed7b75e26ce67b8216b06a61c71f669f29970ff6caec624d39a98496f22e643478b20d1bf2b3e753dd4a98aa5fc685929cbece365dda7302a6d0 SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
22 -DIST nspr-4.18.tar.gz 1139663 BLAKE2B 96c74e0b04f26ddb20e807912804c5be6f0fb19fef18da6e1827ef09a28142a1db747332ac3574c3759b34912d0ead26993c0208651d0e4d7800e23fd30ded39 SHA512 4ee9eb561f9c09f78681f8d262ffc3b3ec3395e181ce7b7c5d6c565885283180e5989b142d64799f9392ddf28bdc6a38d3ed6ca079fa107691fd5c758d4f7078
23 DIST nspr-4.19.tar.gz 1139967 BLAKE2B a8358249647a3d0e073f00febc475199d6479e2a34bb8255268fde90f0d3064ccc4b03e012231700ed6d75cd44669b6ea8afa5e760bad1d73682cd9eac1f8432 SHA512 45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844
24 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
25
26 diff --git a/dev-libs/nspr/nspr-4.18.ebuild b/dev-libs/nspr/nspr-4.18.ebuild
27 deleted file mode 100644
28 index 44af9aaaf0c..00000000000
29 --- a/dev-libs/nspr/nspr-4.18.ebuild
30 +++ /dev/null
31 @@ -1,118 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
38 -
39 -MIN_PV="$(get_version_component_range 2)"
40 -
41 -DESCRIPTION="Netscape Portable Runtime"
42 -HOMEPAGE="http://www.mozilla.org/projects/nspr/"
43 -SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
44 -
45 -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
46 -SLOT="0"
47 -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"
48 -IUSE="debug"
49 -
50 -MULTILIB_CHOST_TOOLS=(
51 - /usr/bin/nspr-config
52 -)
53 -
54 -PATCHES=(
55 - "${FILESDIR}"/${PN}-4.7.0-prtime.patch
56 - "${FILESDIR}"/${PN}-4.7.1-solaris.patch
57 - "${FILESDIR}"/${PN}-4.10.6-solaris.patch
58 - "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
59 - "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
60 - # We do not need to pass -L$libdir via nspr-config --libs
61 - "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
62 -)
63 -
64 -src_prepare() {
65 - cd "${S}"/nspr || die
66 -
67 - default
68 -
69 - # rename configure.in to configure.ac for new autotools compatibility
70 - if [[ -e "${S}"/nspr/configure.in ]] ; then
71 - einfo "Renaming configure.in to configure.ac"
72 - mv "${S}"/nspr/configure.{in,ac} || die
73 - fi
74 -
75 - # We must run eautoconf to regenerate configure
76 - eautoconf
77 -
78 - # make sure it won't find Perl out of Prefix
79 - sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
80 -
81 - # Respect LDFLAGS
82 - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
83 - "${S}"/nspr/config/rules.mk || die
84 -}
85 -
86 -multilib_src_configure() {
87 - # We use the standard BUILD_xxx but nspr uses HOST_xxx
88 - tc-export_build_env BUILD_CC
89 - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
90 - tc-export AR CC CXX RANLIB
91 - [[ ${CBUILD} != ${CHOST} ]] \
92 - && export CROSS_COMPILE=1 \
93 - || unset CROSS_COMPILE
94 -
95 - local myconf=(
96 - --libdir="${EPREFIX}/usr/$(get_libdir)"
97 - $(use_enable debug)
98 - $(use_enable !debug optimize)
99 - )
100 -
101 - # The configure has some fancy --enable-{{n,x}32,64bit} switches
102 - # that trigger some code conditional to platform & arch. This really
103 - # matters for the few common arches (x86, ppc) but we pass a little
104 - # more of them to be future-proof.
105 -
106 - # use ABI first, this will work for most cases
107 - case "${ABI}" in
108 - alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
109 - n32) myconf+=( --enable-n32 );;
110 - x32) myconf+=( --enable-x32 );;
111 - s390x|*64) myconf+=( --enable-64bit );;
112 - default) # no abi actually set, fall back to old check
113 - einfo "Running a short build test to determine 64bit'ness"
114 - echo > "${T}"/test.c || die
115 - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
116 - case $(file "${T}"/test.o) in
117 - *32-bit*x86-64*) myconf+=( --enable-x32 );;
118 - *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
119 - *32-bit*|*ppc*|*i386*) ;;
120 - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
121 - esac ;;
122 - *) ;;
123 - esac
124 -
125 - # Ancient autoconf needs help finding the right tools.
126 - LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
127 - ac_cv_path_AR="${AR}" \
128 - econf "${myconf[@]}"
129 -}
130 -
131 -multilib_src_install() {
132 - # Their build system is royally confusing, as usual
133 - MINOR_VERSION=${MIN_PV} # Used for .so version
134 - emake DESTDIR="${D}" install
135 -
136 - einfo "removing static libraries as upstream has requested!"
137 - rm "${ED%/}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
138 -
139 - # install nspr-config
140 - dobin config/nspr-config
141 -
142 - # Remove stupid files in /usr/bin
143 - rm "${ED%/}"/usr/bin/prerr.properties || die
144 -
145 - # This is used only to generate prerr.c and prerr.h at build time.
146 - # No other projects use it, and we don't want to depend on perl.
147 - # Talked to upstream and they agreed w/punting.
148 - rm "${ED%/}"/usr/bin/compile-et.pl || die
149 -}