commit:     3f004ec2c67122130d0bca02a6e0dc1516204218
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 16:58:10 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 17:13:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f004ec2

dev-libs/nspr: Bump to version 4.33

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/nspr/Manifest         |   1 +
 dev-libs/nspr/nspr-4.33.ebuild | 122 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index ed52a5de2931..df9ec508c8ec 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,3 +1,4 @@
 DIST nspr-4.30.tar.gz 1078175 BLAKE2B 
dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011
 SHA512 
b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
 DIST nspr-4.31.tar.gz 1078163 BLAKE2B 
f1682a85e425c7babc40f1cbff4ec5b1101e04279df89c91520992bd288185cd52f682d4924e65a4620975d339d7704e359bfd36ac32e5ffebb8527d03f13171
 SHA512 
1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed
 DIST nspr-4.32.tar.gz 1079004 BLAKE2B 
fda56b2a3fbbff8542e213b20a5935376694ea171d2cd014f93a711980411afe195835996c1612376d37eac028071ce58008e1fbf7a16176141fc18aa8163a73
 SHA512 
da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7
+DIST nspr-4.33.tar.gz 1078948 BLAKE2B 
b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3
 SHA512 
8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e

diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
new file mode 100644
index 000000000000..c0dd76d1aa2e
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.33.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="https://www.mozilla.org/projects/nspr/";
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz";
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+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"
+IUSE="debug"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/nspr-config
+)
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.23-prtime.patch
+       "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+       "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+       "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+       "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+       # We do not need to pass -L$libdir via nspr-config --libs
+       "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+       cd "${S}"/nspr || die
+
+       default
+
+       use elibc_musl && eapply 
"${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+       # rename configure.in to configure.ac for new autotools compatibility
+       if [[ -e "${S}"/nspr/configure.in ]] ; then
+               einfo "Renaming configure.in to configure.ac"
+               mv "${S}"/nspr/configure.{in,ac} || die
+       else
+               elog "configure.in rename logic can be removed from ebuild."
+       fi
+
+       # We must run eautoconf to regenerate configure
+       eautoconf
+
+       # make sure it won't find Perl out of Prefix
+       sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+       # Respect LDFLAGS
+       sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+               "${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+       # We use the standard BUILD_xxx but nspr uses HOST_xxx
+       tc-export_build_env BUILD_CC
+       export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} 
HOST_LDFLAGS=${BUILD_LDFLAGS}
+       tc-export AR CC CXX RANLIB
+       [[ ${CBUILD} != ${CHOST} ]] \
+               && export CROSS_COMPILE=1 \
+               || unset CROSS_COMPILE
+
+       local myconf=(
+               --libdir="${EPREFIX}/usr/$(get_libdir)"
+               $(use_enable debug)
+               $(use_enable !debug optimize)
+       )
+
+       # The configure has some fancy --enable-{{n,x}32,64bit} switches
+       # that trigger some code conditional to platform & arch. This really
+       # matters for the few common arches (x86, ppc) but we pass a little
+       # more of them to be future-proof.
+
+       # use ABI first, this will work for most cases
+       case "${ABI}" in
+               alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+               n32) myconf+=( --enable-n32 );;
+               x32) myconf+=( --enable-x32 );;
+               s390x|*64) myconf+=( --enable-64bit );;
+               default) # no abi actually set, fall back to old check
+                       einfo "Running a short build test to determine 
64bit'ness"
+                       echo > "${T}"/test.c || die
+                       ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o 
"${T}"/test.o || die
+                       case $(file "${T}"/test.o) in
+                               *32-bit*x86-64*) myconf+=( --enable-x32 );;
+                               *64-bit*|*ppc64*|*x86_64*) myconf+=( 
--enable-64bit );;
+                               *32-bit*|*ppc*|*i386*) ;;
+                               *) die "Failed to detect whether your arch is 
64bits or 32bits, disable distcc if you're using it, please";;
+                       esac ;;
+               *) ;;
+       esac
+
+       # Ancient autoconf needs help finding the right tools.
+       LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+       ac_cv_path_AR="${AR}" \
+       econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+       # Their build system is royally confusing, as usual
+       MINOR_VERSION=${MIN_PV} # Used for .so version
+       emake DESTDIR="${D}" install
+
+       einfo "removing static libraries as upstream has requested!"
+       rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static 
libraries."
+
+       # install nspr-config
+       dobin config/nspr-config
+
+       # Remove stupid files in /usr/bin
+       rm "${ED}"/usr/bin/prerr.properties || die
+
+       # This is used only to generate prerr.c and prerr.h at build time.
+       # No other projects use it, and we don't want to depend on perl.
+       # Talked to upstream and they agreed w/punting.
+       rm "${ED}"/usr/bin/compile-et.pl || die
+}

Reply via email to