Drop lib name shuffling since we no longer change the SONAME. Upstream can deal with this long term (moz bug 452873).

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 117 insertions, 9 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 1e67056354b8..10d4e3202f3c 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.227 2013/03/12 01:53:37 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.228 2013/03/12 15:16:23 vapier Exp $
+
+*nspr-4.9.5-r2 (12 Mar 2013)
+
+  12 Mar 2013; Mike Frysinger <vapier@gentoo.org> +nspr-4.9.5-r2.ebuild:
+  Drop lib name shuffling since we no longer change the SONAME.  Upstream can
+  deal with this long term (moz bug 452873).
 
 *nspr-4.9.5-r1 (12 Mar 2013)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 692ad4b23f7a..fc3e1d29d82c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -31,18 +31,25 @@ EBUILD nspr-4.9.2-r1.ebuild 3760 SHA256 2086bb41ae781d78f379422db45ce4c6ac55648c
 EBUILD nspr-4.9.2.ebuild 3656 SHA256 21e578c935decb6a905d31e081bb7c3a1c520efe9b6436c3fb35cbf572827964 SHA512 5239547b08317f41741011d6ecbf64f381abc6fccf32073464dbaf03201925ca2b6ec1ec1ad2ffcb9f96a4e3a91e435b8cb322a93dd3c137b845629c8d78ceca WHIRLPOOL 4581834ce55ff0c7e8f980b71fa09ba63c2e956b1b55c2666e0d40a56c42f0f3ebacdb199c749939da64c0600e95d2cca8d70c180f1889163337e0ed7c02c788
 EBUILD nspr-4.9.4.ebuild 3636 SHA256 93762a1b9d8b9cbc4a3a4fd441f2cbb750a0e4c92aea720325105e962c362a54 SHA512 e177ff28c9a639ad48e5a5263ccbce32276b3c5105fb1e002fbf12506aaa15266f7d5a68fb60affe784d121485504816b0e3c3c618128a41815ff4e318464ad9 WHIRLPOOL 69c78de7c4e7ebbad7e0ee805a118801728d53ef5e5a91d306b319a9eccabeca76953d6c74f502ea9ee497251d7485966624fbba8bcfeba01d38d23f558f85ec
 EBUILD nspr-4.9.5-r1.ebuild 3667 SHA256 ad102daf5540111460c8e1dcad6416dff0a5b2b3db7815edbeb76747e5a7f3c9 SHA512 b5e489e3337769f54d6c8e5236c0b33dba3db871bc5f87d81d6c5155a78e944a1966d5149138d739fb9cbc07815486b53653bc81dadfd7a2145ea29e826ee57d WHIRLPOOL 1f33794ae35ddf41f66fb056ce7061f4624d8261eed81135b1bd6a6d06847351c1d9d9f6a50e2bc4b896a5b5d0700bffbe4bfbbd29ef6e762ce4ee9aa731c655
+EBUILD nspr-4.9.5-r2.ebuild 3190 SHA256 476027fdc4d6bae0670a74586f9a65c37c0617d5f73a0cd97741dc285d6400af SHA512 63a84cf02f91af2a4b867a092e0fe53cd6cd26d936adfedb372af22828c4ae30b87d83a9dd9c6904f7772fa8713712aa4d689f98999c271da35642870839a38d WHIRLPOOL fc531c7e1cce566cfeba76e9673cbdb23c759003ea20b81a8976fcfd83d754e90003caef4754b8cb542db9cdaf38d95e74026c4fab22167ed547d6e7c08e68e4
 EBUILD nspr-4.9.5.ebuild 3635 SHA256 ad14ccd5616ba02ed052129d9ce8d17fa9cff18ed5ff9a63211baaf7696c3d6f SHA512 8eb4b7a330de5ec19303a67c3a4cde21e4a593321d729d4470f1705049081f0e2ef9df49a782fb73497c1539ebc0fff6e3fb4e9b28ce505d1e0cd9fcac6c627a WHIRLPOOL 470d01b08bff691328034b8a6e51d5e84686b03dddeb6b3d11b24a5543a4d843509653dacf889a3bcdd3ea3477f6bc4b52098964cdfe154f53568b67f0a5ff28
 EBUILD nspr-4.9.ebuild 3702 SHA256 70d3843e5d588eab366a77e35d5205f94decf60493f9670c0fe7ff3940b0c204 SHA512 f3a8b66281183b57278a44f8841dbc68fb3ef7ea45a56dfb46c142219d016641c1accd805b0d790136a96b51223c1a00a08738e77b291893ec050e0e1c18d99e WHIRLPOOL 8762e5b0cf414b64daa81c472daf4841e6209c946f2a1d3dadd1a8150449563b0293e9ba9613fb2d2878fcfdac3e3b7b04a0e9defb0db40f4b27257e1c79fc4f
-MISC ChangeLog 28601 SHA256 ff7e0801e78624221267615f785cf6f1027649ec2116869e6966f81f82ca3f3c SHA512 1178aae8b6cb8de2188ab85871ccacbad5a2281d8e33c4cb1e355d82fd59e8ee094c1e819d5eb7c585192d6d72d0858cea8673d1752b6d3a26bcabfade15cf44 WHIRLPOOL 687be79fd5d5c752cb486e04d098b67c49471a30b5ab3c1e2eb9a2ec94b836e82bd591293de15b2c36fac959d2b2e973be2e7359e0da27241483b7bce52446dd
+MISC ChangeLog 28827 SHA256 8bc36237c0597272ba68ae3c3058db7d943df0505a41679142ef679660156487 SHA512 1577e3b26c9433609ef41cab39c912eaff103936d9f6cdde2a549d6f652d57cbda560b05234d3e2cbe93a87e2aa056fc87606ac38d4d4323ee2bd2e3a52eb426 WHIRLPOOL 9ab5e8f2a2f7c349e51d7b757285b525bfa3c878738e439d828be62543dabec11ea9f467e67549724b101a656c547e941d8e7fcaf95ac293a895601a3d8aabcc
 MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRPoqoAAoJEKDMw7q00Ii0i8MIAK5n6sANmuRzxRikx4gY1ZSZ
-CLd0v1lPeQ5u0WRM0L6ADFvh+srLBxZF76gqXqGK+bEzpwcrRgVOnq3Q+y/D7Tsm
-sxJmp4qan3JdbN7VmrCwhileyQd1nO/MAmIG/1rRKQ3VSzGNa6mh0/MCVhXUpYfN
-Q3FAphwAprFS25B+S52Sdb3BuRZcwLChFISsyOtVF2+MRQke2ecvtedPkuBsGH5l
-4fFRQsnwEwTPTgvyB3kMDR/A8XatXEQuiF4hpm/tJxt3duLjfdOYvyMy+lBhDyxy
-2nZwyeXe2j85/KwvQXOEiwKumkMii1ZHGmRIcxZlu0flGh3dLOmJuallzceSUsY=
-=9hZV
+iQIcBAEBCAAGBQJRP0duAAoJELEHsLL7fEFW99MQAJ30kjp4gXoCsY5MZy/63Ys0
+50Y9JO41RdY8ofhiNlh1u7EvIEYxWa/oPVx7NVQSAy6inxKmddWBKkOzkhrk5wEG
+qOgvCtySUlPBLTgo7qdh6vzZTMYKsGg/5GjVTjzkETFRDpWxoaSUztgkGKqF7ObK
+ozz2qDdSimuthLgzPc57wUw+ypVCq1+Lcim9/hn+1hNok0fO/jcsmEpTLhcDWzNC
+6sPE/cYHqfxSqG0G1AuGJvWhE6Bb6Mt4sm/+BYNrAoIrFj0uC9CxsE2fweagXcPo
+0pTwFtyQBUAxI5lsIb5vEr3GtIct3aijbBcr2696hxU0YmgoROTFcSRjsODZ2uQa
+jB6xlBV1s+NAsGais4vY9QuCV5ciwzmNiC11JGmfBGDSfb2MDcbu8ehd9nX2kFHp
+IhhfPxZmhs+wv5X6Dys1OQTc2lhqJJiYBNMyZSxyk+SSOlladm3yaGG3tF/p64do
+Y9BIfK4+FCgxMajeh/yQtovW+PaQmKK3FU7uKqTIJkIkIO1BK/sRBBtn4q7a95uQ
+rtyMXug8P68KgZUjN9miu1sjpswUfB5sMp3TCNrCjc0SdNUV2577R/VRuA8/obXE
+JjlPfjOxdXALD4LjqDnXetsyjL0i5L61Mvr+K3v/PzP5jECB1FRyFfCFAXUM49/N
+s2laVDqyONEz+OLB9iw6
+=hPjN
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/nspr/nspr-4.9.5-r2.ebuild b/dev-libs/nspr/nspr-4.9.5-r2.ebuild
new file mode 100644
index 000000000000..b9b534fafbcc
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.9.5-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.5-r2.ebuild,v 1.1 2013/03/12 15:16:23 vapier Exp $
+
+EAPI=3
+WANT_AUTOCONF="2.1"
+
+inherit autotools 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-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
+IUSE="debug"
+
+src_prepare() {
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.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.4-darwin-install_name.patch
+	epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+
+	# We must run eautoconf to regenerate configure
+	cd "${S}"/mozilla/nsprpub
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/mozilla/nsprpub/config/rules.mk || die
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	# 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
+	echo > "${T}"/test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+	case $(file "${T}"/test.o) in
+		*32-bit*x86-64*|*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
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		${myconf}
+}
+
+src_compile() {
+	cd "${S}"/build
+	emake || 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)
+	einfo "removing static libraries as upstream has requested!"
+	rm -f *.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config"
+
+	# Remove stupid files in /usr/bin
+	rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+}