4.6.1 version bump for bug 120441.

(Portage version: 2.0.54)

6 files changed, 115 insertions, 20 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index d706049083ea..3cf1df686f3d 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.39 2005/09/25 10:38:45 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.40 2006/01/26 21:41:50 vanquirius Exp $
+
+*nspr-4.6.1 (26 Jan 2006)
+
+  26 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> +files/nspr.pc.in,
+  +metadata.xml, +nspr-4.6.1.ebuild:
+  4.6.1 version bump for bug 120441. Added crypto as a herd.
 
   25 Sep 2005; Mike Frysinger <vapier@gentoo.org> nspr-4.4.1-r2.ebuild:
   Touchup ebuild and run gnuconfig #99975 by Yuri Vasilevski.
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 6b0fe272d27c..fc74ca7af3cc 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,22 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 249653fbfdf5589f8a8bb2f645f017a1 nspr-4.1.2.ebuild 1160
-MD5 c3e6bf1670e6e6f79920efb95aff7fd5 nspr-4.4.1.ebuild 1144
-MD5 d3ce1a1e550a679dad6f7592447d4b2c nspr-4.4.1-r2.ebuild 1796
 MD5 4e09dedbd2811a413643332821c39d05 ChangeLog 4479
-MD5 695935dce10dfe23aad92e8122edeaa3 nspr-4.3.ebuild 1009
-MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1 63
 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63
-MD5 8febddba94492208369d1934210180f9 files/nspr-4.4.1-ppc64.patch 2077
+MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61
+MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1 63
 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63
-MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046
+MD5 84010e076a0643e1dea88d07b71f896f files/digest-nspr-4.6.1 133
 MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713
-MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNn5sgIKl8Uu19MoRAiJqAJkBz3nCqPp28IkeYviVLzdQvWSNqACaAsJc
-yX2xmeBqHrwrn8pKfxNoSss=
-=HC78
------END PGP SIGNATURE-----
+MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046
+MD5 8febddba94492208369d1934210180f9 files/nspr-4.4.1-ppc64.patch 2077
+MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250
+MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
+MD5 249653fbfdf5589f8a8bb2f645f017a1 nspr-4.1.2.ebuild 1160
+MD5 695935dce10dfe23aad92e8122edeaa3 nspr-4.3.ebuild 1009
+MD5 d3ce1a1e550a679dad6f7592447d4b2c nspr-4.4.1-r2.ebuild 1796
+MD5 c3e6bf1670e6e6f79920efb95aff7fd5 nspr-4.4.1.ebuild 1144
+MD5 28ee4a02dc353e067cec93ab185e352f nspr-4.6.1.ebuild 2061
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.1 b/dev-libs/nspr/files/digest-nspr-4.6.1
new file mode 100644
index 000000000000..6f4e4700e7d0
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.1
@@ -0,0 +1,2 @@
+MD5 24939a4e1a13b3306863b9867694271d nspr-4.6.1-amd64.patch.bz2 36035
+MD5 267a63dec54e72b02831d3083fd9faaf nspr-4.6.1.tar.gz 1327028
diff --git a/dev-libs/nspr/files/nspr.pc.in b/dev-libs/nspr/files/nspr.pc.in
new file mode 100644
index 000000000000..266079015c4e
--- /dev/null
+++ b/dev-libs/nspr/files/nspr.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib/nspr
+includedir=/usr/include
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: @NSPR_VER@
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Wl,-R${libdir}
+Cflags: -I${includedir}/nspr
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
new file mode 100644
index 000000000000..d68fe974c15a
--- /dev/null
+++ b/dev-libs/nspr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.6.1.ebuild b/dev-libs/nspr/nspr-4.6.1.ebuild
new file mode 100644
index 000000000000..3012ea5372b9
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.1.ebuild,v 1.1 2006/01/26 21:41:50 vanquirius Exp $
+
+inherit eutils gnuconfig
+
+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
+	mirror://gentoo/nspr-4.6.1-amd64.patch.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${DISTDIR}"/${PN}-4.6.1-amd64.patch.bz2
+	gnuconfig_update
+}
+
+src_compile() {
+	cd build
+
+	if use amd64; then
+		myconf="--enable-64bit"
+	else
+		myconf=""
+	fi
+
+	../mozilla/nsprpub/configure \
+		--build=${CBUILD:-${CHOST}} \
+		--host=${CHOST} \
+		--prefix=${S}/inst \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "./configure failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	cd "${S}"/build
+	make install
+	dodir /usr
+	cp -RfL dist/* "${D}"/usr
+	rm -rf "${D}"/usr/bin/lib*.so
+
+	# there have been /usr/lib/nspr changes (like the ldpath below), but never
+	# have I seen any libraries end up in this directory. lets fix that.
+	# note: I tried doing this fix via the build system. It wont work.
+	if [ ! -e "${D}"/usr/lib/nspr ] ; then
+		mkdir -p "${D}"/usr/lib/nspr
+		mv "${D}"/usr/lib/*so* "${D}"/usr/lib/nspr
+		mv "${D}"/usr/lib/*\.a "${D}"/usr/lib/nspr
+	fi
+	# and while we're at it, lets make it actually use the arch's libdir damnit
+	if [ "lib" != "$(get_libdir)" ] ; then
+		mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+	fi
+
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > "${D}"/etc/env.d/50nspr
+
+	# create pkg-config file
+	mkdir -p "${D}"/usr/$(get_libdir)/pkgconfig/
+	sed -e "s:@NSPR_VER@:${PV}:g" \
+		-e "s:^libdir=.*:libdir=/usr/$(get_libdir)/nspr:" \
+		< "${FILESDIR}"/${PN}.pc.in \
+		> "${D}"/usr/$(get_libdir)/pkgconfig/${PN}.pc \
+		|| die "pkg-config file creation failed!"
+}