From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1715903-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A4D531582EF
for <garchives@archives.gentoo.org>; Sat, 08 Feb 2025 08:00:34 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 8D5C0343090
for <garchives@archives.gentoo.org>; Sat, 08 Feb 2025 08:00:34 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 370C9110476;
Sat, 08 Feb 2025 08:00:23 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id 303DE110476
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Feb 2025 08:00:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D1309343060
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Feb 2025 08:00:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id F045826E6
for <gentoo-commits@lists.gentoo.org>; Sat, 08 Feb 2025 08:00:19 +0000 (UTC)
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org>
Message-ID: <1739001013.8b5cdeb5bf9610b355c869a0d8c5b05a2f69449a.juippis@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nspr/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/nspr/Manifest dev-libs/nspr/nspr-4.35-r2.ebuild
X-VCS-Directories: dev-libs/nspr/
X-VCS-Committer: juippis
X-VCS-Committer-Name: Joonas Niilola
X-VCS-Revision: 8b5cdeb5bf9610b355c869a0d8c5b05a2f69449a
X-VCS-Branch: master
Date: Sat, 08 Feb 2025 08:00:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 693d7b16-d50c-454f-abc2-3d3563b1dfab
X-Archives-Hash: ed8f60f70650a1014a21c58d2dd03537
commit: 8b5cdeb5bf9610b355c869a0d8c5b05a2f69449a
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 07:50:13 2025 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 07:50:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5cdeb5
dev-libs/nspr: drop 4.35-r2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/nspr/Manifest | 1 -
dev-libs/nspr/nspr-4.35-r2.ebuild | 178 --------------------------------------
2 files changed, 179 deletions(-)
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index c9f0651f9f88..a36c2942a3e3 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,2 +1 @@
-DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
DIST nspr-4.36.tar.gz 1036274 BLAKE2B 369d851db0f425f0c6c3cdaeb333320860b77b49b40b77cc983998de3f9128f9d987f143e9f2ce155d609fb23f3f9ed0d0abe7d74e20c59763e2b9bdd1835817 SHA512 55d21e196508ad29a179639fc8006f44b04dc2c0b5a85895e727f0a4f0ea37aeeceb936e37ac6b271b882a18e9f06d96133a60f19cee6345f8424c1c66e270ee
diff --git a/dev-libs/nspr/nspr-4.35-r2.ebuild b/dev-libs/nspr/nspr-4.35-r2.ebuild
deleted file mode 100644
index 4aafc2acbe8a..000000000000
--- a/dev-libs/nspr/nspr-4.35-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.10.6-solaris.patch
- "${FILESDIR}"/${PN}-4.23-prtime.patch
- "${FILESDIR}"/${PN}-4.7.1-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
-)
-
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-src_prepare() {
- cd "${S}"/nspr || die
-
- default
-
- if use elibc_musl; then
- eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
- eapply "${FILESDIR}"/nspr-4.35-bgo-905998-lfs64-musl.patch
- fi
-
- # 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() {
- # -Werror=strict-aliasing
- # https://bugs.gentoo.org/867634
- #
- # Testsuite-only issue. Still, this makes it challenging to test the package with LTO
- # enabled...
- append-flags -fno-strict-aliasing
- filter-lto
-
- # The build system overrides user optimization level based on a configure flag. #886987
- local my_optlvl=$(get-flag '-O*')
-
- # bgo #923802
- append-lfs-flags
-
- # 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 AS CC CXX RANLIB
- [[ ${CBUILD} != ${CHOST} ]] \
- && export CROSS_COMPILE=1 \
- || unset CROSS_COMPILE
-
- local myconf=( --libdir="${EPREFIX}/usr/$(get_libdir)" )
-
- # Optimization is disabled when debug is enabled.
- if use debug; then
- myconf+=( --enable-debug )
- else
- myconf+=( --disable-debug )
- myconf+=( --enable-optimize="${my_optlvl}" )
- fi
-
- # 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"
- # TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -fno-lto -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file -S "${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}" \
- ac_cv_path_AS="${AS}" \
- econf "${myconf[@]}"
-}
-
-multilib_src_test() {
- # https://firefox-source-docs.mozilla.org/nspr/running_nspr_tests.html
- cd "${BUILD_DIR}/pr/tests" || die
- einfo "Building tests"
- emake
-
- einfo "Running test suite"
- ../../../${P}/${PN}/pr/tests/runtests.pl | tee "${T}"/${ABI}-tests.log
-
- # Needed to check if runtests.pl itself or the tee (somehow) failed
- # (can't use die with pipes to check each component)
- [[ ${PIPESTATUS[@]} == "0 0" ]] || die "Tests failed to run!"
-
- local known_failures=(
- # network-sandbox related?
- cltsrv
- # network-sandbox related?
- gethost
- )
-
- local known_failure
- for known_failure in "${known_failures[@]}" ; do
- sed -i -e "/${known_failure}.*FAILED/d" "${T}"/${ABI}-tests.log || die
- done
-
- # But to actually check the test results, we examine the log.
- if grep -q "FAILED" "${T}"/${ABI}-tests.log ; then
- die "Test failure for ${ABI}!"
- fi
-}
-
-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
-}