7 files changed, 267 insertions, 0 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b6681d034bb4..403323765434 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libtraceevent/Manifest b/dev-libs/libtraceevent/Manifest
index ca4d7657e3f4..84ca9e6981d6 100644
--- a/dev-libs/libtraceevent/Manifest
+++ b/dev-libs/libtraceevent/Manifest
@@ -1,7 +1,9 @@
 DIST libtraceevent-1.5.2.tar.gz 135283 BLAKE2B e4202fc3c9b09d20bed375bc1833a4f49b63cf484e63ecf3cc5f1f3950a1de7607464e6c2ae194085e78978e5f480a7ae392a4cde739c3a244367eaf1000f70d SHA512 3804a84d2a4771335ba14a7383f977d641e6437f055837c2faece811b8ef931cfa9d38082bef48d96092aeae8cdcb543222a3042b2c11c41749dddbbb4813d94
 DIST libtraceevent-1.6.2.tar.gz 135857 BLAKE2B c5384d9bb8dc5977cfb412c22d9692ed757f94dcd01b6a93e8368cd3368bf2731c0c4eff764fd81b4627925e0fd370acd509710b538842708836b5d0ce777003 SHA512 8e951f66c339de2bc78c7c7f347f9283553ae62adc9e2bb96de1ed0aaadf91d59b2e93785c5030b0dd6d946488dc5e688d504eba54d674454c808c320127cfbf
 DIST libtraceevent-1.6.3.tar.gz 140072 BLAKE2B 416fa68e2604c3cc71323171b084261e38f08f630a03afda0e2ecc4860c8b08dae10b2abaa2afae54d2b4e382720b43a6616a9ab8599759de102af918eeb24fc SHA512 8064eb18dda6fdbff020759ed92e785b87d34be9ebc30cb6085785edeb8d7252cabf8d33d8738a3ec407672a3d891884d0f0b4c551fce26c76fa8eaf61b9e2f5
+DIST libtraceevent-1.7.0.tar.gz 147876 BLAKE2B 0017315845f96b6d92a9d4f6e0f2de5e130324c3142b382284838ee52db8df5892b7e9394690391cc2215a29cc685401767b0e5b64a493d8b4793b1fbb8d10a2 SHA512 ecfdadf450cfc4cc0ea878089b2f0f2bab68987609a39341c665481e0716f2ab3d3441fae72163354ab8ceebef0648d873a81ec00ce38e00066a60a2ad1673a7
 EBUILD libtraceevent-1.5.2-r1.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
 EBUILD libtraceevent-1.6.2.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
 EBUILD libtraceevent-1.6.3.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
+EBUILD libtraceevent-1.7.0.ebuild 1132 BLAKE2B 1364ff0b1a0f3b74f34d544ddc3d7ed7cb7da7423488faf10d0149e14671da06e8f14308e77b8425d21465952218a13944a97ce232cf31a372f103e88555a802 SHA512 1a9fd1588c159524c18d7dd9d29cbe560bb393af542f941ac801b71c433891e421d93fff45d2f6e0b42949619fcf776b73bc404f0a6abad2c3b1c01c9d53d9d7
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtraceevent/libtraceevent-1.7.0.ebuild b/dev-libs/libtraceevent/libtraceevent-1.7.0.ebuild
new file mode 100644
index 000000000000..b9bb4041b4e1
--- /dev/null
+++ b/dev-libs/libtraceevent/libtraceevent-1.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace event library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	!<dev-util/trace-cmd-3.0
+"
+BDEPEND="
+	doc? ( app-text/xmlto app-text/asciidoc )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtraceevent.a" || die
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install-doc
+}
diff --git a/dev-libs/libtracefs/Manifest b/dev-libs/libtracefs/Manifest
index 7e0403accc33..30b343214d35 100644
--- a/dev-libs/libtracefs/Manifest
+++ b/dev-libs/libtracefs/Manifest
@@ -4,8 +4,10 @@ DIST libtracefs-1.3.1.tar.gz 175453 BLAKE2B d9801c9f50513a8b2d2de57f768aec69c3e4
 DIST libtracefs-1.4.2.tar.gz 178382 BLAKE2B a956423370077613417812ad18da284521e8798701d558f4e419af6c43bd8a06c489525bbab26e6bc5d5d5e8fd0e6a7322d34f976a4ea560670eb594818d07fc SHA512 4a66c3cf8050de5acc4c63996cbcfa2c014e26ad6011eb89b0cff47ffbd6343637009354edf6bb173b9fd08103012774376c33fd6f642741f7990f2d6de3ea0c
 DIST libtracefs-1.5.0.tar.gz 179569 BLAKE2B d69d4bb2c9cbf6dd971afaad280534ce8af4982ca76c7b12cb8432f56a01d622a5d58c827cfe86537e5db2a416ab1092c95309b77b766b183266e1ad22ad8d13 SHA512 5e936a788473c0eb373144231ef9ac139ae53b4685053dfed74157a9432d429f35b70290607679eae9f44fd858d2102a02c3beac35d8de35d856c3c1001644d3
 DIST libtracefs-1.6.1.tar.gz 193086 BLAKE2B 53f6740c7f06e1d618594e03ec7fbda273bbeb87bfda67acfad1e1670fd69670187c7267af1abcd1502c338499dc8d4ffe28a213b3ad17ff5a6e2b435c1c242f SHA512 9fa9b470869bdc0134cc72eb7a9e0131638c3416d24e403c7fc819d49a5e521ca8c852ece4ac87d6a744c32846a2567c44c1e3b8b329f77db2d89e57c9e36340
+DIST libtracefs-1.6.3.tar.gz 193859 BLAKE2B 89029e59590f4e25c5d39d5b638c381e966e8dee055bf7873492a6cdc8b1e1df90cad84a8db4e1abcacbc43fbb23c9fefbdb53123a409a19d07925e7a39efcdb SHA512 273d008644b5d205def79fa8c1db51f21327c02abee16dfc706cfa7ad421be111ac3280b2dd493a8be5f4d9f2fdcb471d7de17e6b3e56df7cb2f1a11b4e1bfaa
 EBUILD libtracefs-1.3.1.ebuild 1391 BLAKE2B 28d81702b711190ddfa0b62a322ab222566c1ecd7185df38e1c30a57910e976f5c7fa42aa32b322934585cdb35d9936a0736e00c5674107ee58629dada2db684 SHA512 566dbbba263d368be4c3ddcc406025bde03f92555d1717bf958a6b71d3833bffea0bb68b3dfe4b50a542108522663e4fc549473379e7447061c2ddd90ea1bbb2
 EBUILD libtracefs-1.4.2.ebuild 1387 BLAKE2B b81fac4348de3bc92044a17bca680c836902a935804d8062156962bb5f9db5125631c28c61d11afe62a6349b34365a8918c1c78f4c419ff1bb34443b6699e0b9 SHA512 f7ed18ce5665c6d37a7148ff4ce3e9ac550f448c8a5699f9c346490c1624ed0ff584943c13cab52f2a2f29929a21d58abf8248db60c6f9aa57edb8f21ebf4b75
 EBUILD libtracefs-1.5.0.ebuild 1332 BLAKE2B e04d00b575e72204012ed76e0747e7a8f4f097679bbdf4c6b567f34978348ba1b05cd3dc626e93c030f4ae8a8c283cf68ade51036d68ff8a00df9ef1fcc90bd2 SHA512 c1e5ddbf5861db37d3f760acb9b02664fff89ff9d3abec944ea9bfe28b185353018d894d1abf82a9bead0ba09e9654b4cf60d4890395ed964bbfd502bfa1c847
 EBUILD libtracefs-1.6.1.ebuild 1332 BLAKE2B e04d00b575e72204012ed76e0747e7a8f4f097679bbdf4c6b567f34978348ba1b05cd3dc626e93c030f4ae8a8c283cf68ade51036d68ff8a00df9ef1fcc90bd2 SHA512 c1e5ddbf5861db37d3f760acb9b02664fff89ff9d3abec944ea9bfe28b185353018d894d1abf82a9bead0ba09e9654b4cf60d4890395ed964bbfd502bfa1c847
+EBUILD libtracefs-1.6.3.ebuild 1332 BLAKE2B e04d00b575e72204012ed76e0747e7a8f4f097679bbdf4c6b567f34978348ba1b05cd3dc626e93c030f4ae8a8c283cf68ade51036d68ff8a00df9ef1fcc90bd2 SHA512 c1e5ddbf5861db37d3f760acb9b02664fff89ff9d3abec944ea9bfe28b185353018d894d1abf82a9bead0ba09e9654b4cf60d4890395ed964bbfd502bfa1c847
 MISC metadata.xml 363 BLAKE2B e7330c25a8a87a9811793ee730e7822000fdf1cbdda003302e5d542118204d905583a4acd07a5f37a15952bbe6265ff606d44978db823905c724b5f142d5d2ae SHA512 7be0cfa3fd15ef0cfc0647c73d69a7efc5f00d8b7f9d85c6092326d638132e7f989b855fe5f3bd9ab770e860e7858f8d462f8727b9ddeee64a0c44f7e66acf9c
diff --git a/dev-libs/libtracefs/libtracefs-1.6.3.ebuild b/dev-libs/libtracefs/libtracefs-1.6.3.ebuild
new file mode 100644
index 000000000000..440403770349
--- /dev/null
+++ b/dev-libs/libtracefs/libtracefs-1.6.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux kernel trace file system library"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+RDEPEND="
+	>=dev-libs/libtraceevent-1.3.0
+"
+DEPEND="${RDEPEND}"
+# source-highlight is needed, see bug https://bugs.gentoo.org/865469
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/xmlto app-text/asciidoc dev-util/source-highlight )
+"
+
+src_configure() {
+	EMAKE_FLAGS=(
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}"
+	use doc && emake doc
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install
+	# can't prevent installation of the static lib with parameters
+	rm "${ED}/usr/$(get_libdir)/libtracefs.a" || die
+	# install-doc is wrong target, see https://bugs.gentoo.org/865465
+	use doc && emake "${EMAKE_FLAGS[@]}" DESTDIR="${ED}" install_doc
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 9511e3660651..8383dc4675bf 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,5 +6,6 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
+EBUILD nspr-4.35-r1.ebuild 4983 BLAKE2B 34749ecd57bab8f24c830a4c786676633beca191b15173fd3fec95e0b29bbcbfa79e59ae278ba90f99aa23345e430c37e05403a2fdf231524929be402894ae02 SHA512 fb9e91132f55133935c18903ad7b6127b60fe521ba8f81b79a88eaf8bee3b7d108cb6d24b28d6180b9cf60696771332bfddd67f044ca548ab060b91ed20d5f0a
 EBUILD nspr-4.35.ebuild 4822 BLAKE2B 7863462df59006ed06bc41a867178cbe217a36ba029ebbc1441e08e40614c9e7228d24caddeb096d5a679cd150243eba47a1268e06189cc5361c1c0f0799972e SHA512 386e6440fde6ea1607e9a2d6a024f0d8a5fec6160c90de4e7fb5f4db5aa53b9f7750e30aebf0098161b99da31b8ec14e3a2f4d4433d144a3dec6d42b50bf9b3a
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild b/dev-libs/nspr/nspr-4.35-r1.ebuild
new file mode 100644
index 000000000000..f12eb3a54277
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.35-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 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 ~ia64 ~loong ~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
+)
+
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+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() {
+	# The build system overrides user optimization level based on a configure flag. #886987
+	local my_optlvl=$(get-flag '-O*')
+
+	# 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)"
+		$(use_enable debug)
+		$(use_enable !debug optimize="${my_optlvl}")
+	)
+
+	# 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}" \
+	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
+}