Ensure we can build in parallel

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

4 files changed, 161 insertions, 12 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index b5da563221dc..f052ba9d2a28 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.152 2010/09/14 21:18:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.153 2010/10/11 15:18:26 anarchy Exp $
+
+*nspr-4.8.6-r1 (11 Oct 2010)
+
+  11 Oct 2010; Jory A. Pratt <anarchy@gentoo.org> +nspr-4.8.6-r1.ebuild,
+  +files/nspr-4.8-parallel-fixup.patch:
+  Ensure we can build in parallel
 
   14 Sep 2010; Jeroen Roovers <jer@gentoo.org> nspr-4.8.6.ebuild:
   Stable for HPPA (bug #336396).
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 872f5b78b903..725efcd50faf 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
 AUX nspr-4.6.1-config.patch 2722 RMD160 75701d5dbdd25a05a3bb43539bfa5f5ea850aabd SHA1 e8deaea05baf51eb6795db4e89ab89162d5d4632 SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842
 AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 SHA1 a5ae7b8c95204279fbcb1ac46a242448aa5a894d SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb
@@ -8,6 +5,7 @@ AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d
 AUX nspr-4.7.1-solaris.patch 516 RMD160 aaa024e1afabfae51a0060db328536e1a624ed3a SHA1 6766a9939830e8277f2342db806235ab2e30ab14 SHA256 e47a0abb5b106af38fdfab2ca8661b4a1596d48ff7ca988280728dc6b8a49447
 AUX nspr-4.7.4-solaris.patch 2011 RMD160 08060ba3885a1a659ad5a5505715ced0dd669d5f SHA1 9b0e2021e9dca56f741b505e5aa5ca56da47bbb1 SHA256 9e72078c941229e7112b4bc184e195821c9243bfb9411e9eeefcdb889866ff9f
 AUX nspr-4.8-config.patch 1429 RMD160 1988289c042f97ad8c3681b7febbbea45a3de9a6 SHA1 0055fb2f27865e3bcc6d6a9e6f79b633443295d6 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150
+AUX nspr-4.8-parallel-fixup.patch 1067 RMD160 fd7eb0558b89f319fd9f144a14cd5d76c6bd2fc7 SHA1 5134c49a58bb96182d0ead61d9f9d74d80efc43e SHA256 338f73eadbcce1a30177d90bc869b3e4909e258a38feee1e1b1797586a90edaa
 AUX nspr-4.8-pkgconfig-gentoo-2.patch 4711 RMD160 3709911449facde45d1bebc60e9e1593aa691af5 SHA1 c41c608247aa712f783a1ec8ea2943b79dee44eb SHA256 5cd96bcb47f9678d4aac95d91d975101d31f038b05bd3f5b191a262d733b8943
 AUX nspr-4.8-pkgconfig-gentoo-3.patch 4726 RMD160 c8e93e2a06b90d6e69a12dce4cfabaebf05b552b SHA1 5d4c67e7b3c0760fd8bb576b8623cbe967b01253 SHA256 f1197ff0f220425d38cae47667ea585cc999fb182cb5c13896e4449fde2d5b6d
 AUX nspr-4.8.3-aix-gcc.patch 3673 RMD160 01b03fb2be761c72dd3eb9c7e9f03bb9c3cf9efc SHA1 7919b736f4ebe12d8067ba400325487c06df3d04 SHA256 b801bc5e93c57e54a076f1b1ed85fc6c4d5d6f344e830929e0a2c4046930a17f
@@ -18,14 +16,8 @@ DIST nspr-4.8.6.tar.gz 1202257 RMD160 31de6eeecd4cc2315cfb84d02cb9730cd3c09729 S
 DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA1 ac30ec18bf0d070a9663d1a8c2d258004f3f42ad SHA256 a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe
 EBUILD nspr-4.8.4-r1.ebuild 3495 RMD160 b827ddb27dd97cda825332933c3d33a4bfbbadc9 SHA1 43d94af54c000bfeee8038e96163fba97f7afdfa SHA256 fe0b2f2ad59913f44a69d5c6d40c7a4e5c252d88bbb626d12957a1e7e38a6a31
 EBUILD nspr-4.8.4.ebuild 2720 RMD160 2e1270a25052b9e9315424485ff2cb72b7b14d94 SHA1 3f85ba131471691a541ff26d22fcd13f5f6015c8 SHA256 31603fdccbcbab4d94fa5a13862a86ae445eb52fd0e0cd4215fe245402a29edf
+EBUILD nspr-4.8.6-r1.ebuild 3551 RMD160 9773da9afd4fb892d914e265605e477ab4676d15 SHA1 93e04546a248bd4060966494f326b1965c41adc1 SHA256 636c30b26ae8eac3b2345c122875adccc747e40d131d05248ec09f18a3f4fd2b
 EBUILD nspr-4.8.6.ebuild 3483 RMD160 a3736195b5aa341e925c9fa6f09df9d0e1c75b60 SHA1 a4c153ed5f97ca7d31a55b087f2423be690a48c0 SHA256 cf1ab1d37b4af5230a773400cadf3c46b0a66bceecca1c8b746328391bfff92b
 EBUILD nspr-4.8.ebuild 2547 RMD160 a712f9f925c0bd045904a56d8b3a7ce09c44b9bb SHA1 26005a81d7cfd5ff5d571431da4452cff7cde536 SHA256 c49138f629d41b2958583b212a137908c5508228be87756217057c5c2e036e8d
-MISC ChangeLog 19870 RMD160 ff40c2c97c943178dfdf3a6e76b33499ea0d5258 SHA1 e494ca1c55a05df0a942f86c4c1d5a221de73bde SHA256 be6b02fcff52aa9a3018dd001cfa859687a864c118ed6a327abd2a02811a448c
+MISC ChangeLog 20052 RMD160 c74d93fbe9d96f89fd3c2cbfd259255d29ab0eeb SHA1 3b424acf711320f48070f66aae6add4248b3f470 SHA256 8c3904d5696f421495eacbfd8870c166429749fcafd3db4f837301d7694f07f5
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyXumIACgkQgAnW8HDreRaXmgCdHkalbdJHHnQQq9J0GTM0xLu5
-oQkAoMykBw4AOk9IfWgF0634Z2BAV0c9
-=XrQm
------END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch b/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch
new file mode 100644
index 000000000000..6564af9cbf38
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch
@@ -0,0 +1,46 @@
+--- a/mozilla/nsprpub/Makefile.in
++++ b/mozilla/nsprpub/Makefile.in
+@@ -40,18 +40,16 @@
+ 
+ MOD_DEPTH	= .
+ topsrcdir	= @top_srcdir@
+ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+ 
+ include $(MOD_DEPTH)/config/autoconf.mk
+ 
+-MAKE := $(patsubst -j%,,$(MAKE)) -j1
+-
+ DIRS = config pr lib
+ 
+ ifdef MOZILLA_CLIENT
+ # Make nsinstall use absolute symlinks by default for Mozilla OSX builds
+ # http://bugzilla.mozilla.org/show_bug.cgi?id=193164
+ ifeq ($(OS_ARCH),Darwin)
+ ifndef NSDISTMODE
+ NSDISTMODE=absolute_symlink
+--- a/mozilla/nsprpub/pr/src/Makefile.in
++++ b/mozilla/nsprpub/pr/src/Makefile.in
+@@ -384,17 +384,20 @@ endif
+ #
+ 
+ 
+ #
+ # The Client build wants the shared libraries in $(dist_bindir)
+ # so we also install them there.
+ #
+ 
+-export:: $(TARGETS)
++export::
++	$(MAKE) -C . build
++
++build:: $(TARGETS)
+ 	$(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+ 	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+ 	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
+ else
+ 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
+ endif
+
diff --git a/dev-libs/nspr/nspr-4.8.6-r1.ebuild b/dev-libs/nspr/nspr-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..c164f87f8a08
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.8.6-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.6-r1.ebuild,v 1.1 2010/10/11 15:18:26 anarchy Exp $
+
+EAPI=3
+
+inherit eutils multilib toolchain-funcs versionator
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_prepare() {
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.8-config.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch
+	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch
+	epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch
+	epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	epatch "${FILESDIR}"/${PN}-4.8-parallel-fixup.patch
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		mozilla/nsprpub/config/rules.mk
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+		*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";;
+		*32-bit*|*ppc*|*i386*|*"RISC System/6000"*) ;;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		${myconf} || die "econf failed"
+}
+
+src_compile() {
+	cd "${S}"/build
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build"
+}
+
+src_install () {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	cd "${S}"/build
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd "${ED}"/usr/$(get_libdir)
+	for file in *.a; do
+		einfo "removing static libraries as upstream has requested!"
+		rm -f ${file} || die "failed to remove static libraries."
+	done
+
+	local n=
+	# aix-soname.patch does this already
+	[[ ${CHOST} == *-aix* ]] ||
+	for file in *$(get_libname); do
+		n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION})
+		mv ${file} ${n} || die "failed to mv files around"
+		ln -s ${n} ${file} || die "failed to symlink files."
+		if [[ ${CHOST} == *-darwin* ]]; then
+			install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die
+		fi
+	done
+
+	# install nspr-config
+	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file"
+
+	# Remove stupid files in /usr/bin
+	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Please make sure you run revdep-rebuild after upgrade."
+	ewarn "This is *extremely* important to ensure your system nspr works properly."
+	ewarn
+}