full changes for nspr-config, revision bump

(Portage version: 2.1_pre4-r1)

8 files changed, 247 insertions, 83 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 3cf1df686f3d..bd6910d4ee4d 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.41 2006/01/30 17:35:52 anarchy Exp $
+
+*nspr-4.6.1-r1 (30 Jan 2006)
+
+  30 Jan 2006; <anarchy@gentoo.org> +files/nspr-4.6.1-config.patch,
+  +files/nspr-4.6.1-gcc-visibility.patch, -nspr-4.6.1.ebuild,
+  +nspr-4.6.1-r1.ebuild:
+  full changes for nspr-config, revision bump
 
 *nspr-4.6.1 (26 Jan 2006)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 6ee83a718809..19fbaf8267ce 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,16 +1,57 @@
 MD5 c4b8e064545ad572c7a65bb0e58b5378 ChangeLog 4680
+RMD160 b51c61f7be02dfd57e7c1c58711c118f912a52ab ChangeLog 4680
+SHA256 af12f25c5ea7511c276232bd0f6c7baa5a12b07c89d9fbdcf1f6a8294881e6fe ChangeLog 4680
 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63
+RMD160 65c4d3237415274ec1ce62e169cf56ff62399e4a files/digest-nspr-4.1.2 63
+SHA256 50cb6893f71edc7b685c3c4e65fb18a580913044916c83d6fd9c2aefe8707b50 files/digest-nspr-4.1.2 63
 MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61
+RMD160 67865078453e6d1815b3c4f0aa8cf2b84f389f0a files/digest-nspr-4.3 61
+SHA256 61b8b5f4bb7a3c634619778c1e33085ed9c11f1a32f1023b333e2045b2226d11 files/digest-nspr-4.3 61
 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1 63
+RMD160 4a2aaaa9d4c3e6fd3751a7434ab0343740246a57 files/digest-nspr-4.4.1 63
+SHA256 7639d67da355e49a73e9da46a2e777855cf772783bc881e188c3ab2d178bbcad files/digest-nspr-4.4.1 63
 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63
-MD5 84010e076a0643e1dea88d07b71f896f files/digest-nspr-4.6.1 133
+RMD160 4a2aaaa9d4c3e6fd3751a7434ab0343740246a57 files/digest-nspr-4.4.1-r2 63
+SHA256 7639d67da355e49a73e9da46a2e777855cf772783bc881e188c3ab2d178bbcad files/digest-nspr-4.4.1-r2 63
+MD5 1e20cce753e48be8b2954bfb6169c097 files/digest-nspr-4.6.1-r1 235
+RMD160 e7633c996ab8a550204eb7306a35917c53a0eff9 files/digest-nspr-4.6.1-r1 235
+SHA256 7e0f76c1cca61e4239e0818ee0f97c9bc774a01878545c79b62713901fadf0ca files/digest-nspr-4.6.1-r1 235
 MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713
+RMD160 33bc221a8f59c5b7175784b777693aa19e027e4a files/nspr-4.3-amd64.patch 7713
+SHA256 da682b4d50a6093750f621afecf91f04380e0379207b82dfd6f283f714db8fde files/nspr-4.3-amd64.patch 7713
 MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046
+RMD160 b56671f5e64ab94b85679e245a2be8dd9f468d2c files/nspr-4.4.1-hppa.patch 4046
+SHA256 a4444d9a9eaa70bfc22bb632e2aedac75b8e9ce658f7c67f62da2a2489625624 files/nspr-4.4.1-hppa.patch 4046
 MD5 8febddba94492208369d1934210180f9 files/nspr-4.4.1-ppc64.patch 2077
+RMD160 08650a78b25a7cf6d3c10821969ccca4032ea0de files/nspr-4.4.1-ppc64.patch 2077
+SHA256 3c4e80ebb922fb4dc9a3b6f9acf728cdb230f32d58edafad2c7ac1d9084547f7 files/nspr-4.4.1-ppc64.patch 2077
+MD5 ea9d3d76a3bb62cb554c40ecd45f04ee files/nspr-4.6.1-config.patch 2722
+RMD160 75701d5dbdd25a05a3bb43539bfa5f5ea850aabd files/nspr-4.6.1-config.patch 2722
+SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842 files/nspr-4.6.1-config.patch 2722
+MD5 7f00cf7ec34e028c20bc70175c7feb86 files/nspr-4.6.1-disable-gcc-ansi.patch 31858
+RMD160 de486835a70ed34660f815a4714eeffbb8f9a610 files/nspr-4.6.1-disable-gcc-ansi.patch 31858
+SHA256 498a55a7771a3bbbb0ea4b87839bb684ed0ee87b37abb0d327fb4e44497a8c84 files/nspr-4.6.1-disable-gcc-ansi.patch 31858
+MD5 094b3d2db82a236dbc4623522988a619 files/nspr-4.6.1-gcc-visibility.patch 594
+RMD160 90d12fb89d8c23880d6a9c2018cddb100e1c0fb9 files/nspr-4.6.1-gcc-visibility.patch 594
+SHA256 1a8f18ecff6d28b0ce92a3d59e4eb844d79e9d25eed401e6dc66c33b03f59613 files/nspr-4.6.1-gcc-visibility.patch 594
 MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250
+RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250
+SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 files/nspr.pc.in 250
 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
+RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159
+SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 metadata.xml 159
 MD5 249653fbfdf5589f8a8bb2f645f017a1 nspr-4.1.2.ebuild 1160
+RMD160 fa08290138d0b926451750f79a477dc2ebdae2ae nspr-4.1.2.ebuild 1160
+SHA256 f8bed79d39942be6d22b365a9d0b1fdbb21db8b1156245aa06f3bec7f15828fc nspr-4.1.2.ebuild 1160
 MD5 695935dce10dfe23aad92e8122edeaa3 nspr-4.3.ebuild 1009
+RMD160 d9e5119e11a8f01bb839e056fc06ce8dbf46aa0a nspr-4.3.ebuild 1009
+SHA256 0c0dba7a291ca3b1d693fbf2f039a3915d683f628fe0c74eaca8410505199421 nspr-4.3.ebuild 1009
 MD5 d3ce1a1e550a679dad6f7592447d4b2c nspr-4.4.1-r2.ebuild 1796
+RMD160 dfe7053cb04dcd4e0d6f4cf26db76e231d649747 nspr-4.4.1-r2.ebuild 1796
+SHA256 6cbfbd40c1f38704379b6318690624d02ceb4c99ceb8c90dffe058f92e2061c3 nspr-4.4.1-r2.ebuild 1796
 MD5 c3e6bf1670e6e6f79920efb95aff7fd5 nspr-4.4.1.ebuild 1144
-MD5 6ec71b11d4e141bc2f18aee00fba4d50 nspr-4.6.1.ebuild 2158
+RMD160 e780fa2219e694a9e995df0513affbcf803ff016 nspr-4.4.1.ebuild 1144
+SHA256 e035ac48cae2fd39df495fa69dfbfb7372892371c3ba9ed48427d11b3fac72fd nspr-4.4.1.ebuild 1144
+MD5 d53c75e8edebf1f8a26f9de77d7cbcbb nspr-4.6.1-r1.ebuild 2243
+RMD160 aaee63c36a8f6880052daffce5694b08b763c8e0 nspr-4.6.1-r1.ebuild 2243
+SHA256 dc44f1481583dd38334131c3e08a0e89640cf6798d03f2941f47742d2b8153f3 nspr-4.6.1-r1.ebuild 2243
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.1 b/dev-libs/nspr/files/digest-nspr-4.6.1
deleted file mode 100644
index 6f4e4700e7d0..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-nspr-4.6.1-r1 b/dev-libs/nspr/files/digest-nspr-4.6.1-r1
new file mode 100644
index 000000000000..32e187be92c3
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.1-r1
@@ -0,0 +1,3 @@
+MD5 267a63dec54e72b02831d3083fd9faaf nspr-4.6.1.tar.gz 1327028
+RMD160 75e8fe9b32df1698a9290baec122fa5bb970a75d nspr-4.6.1.tar.gz 1327028
+SHA256 30c70a5a241016d0968d148c3bdaf9d9692b5aa44426d40c01ec51654e0e0479 nspr-4.6.1.tar.gz 1327028
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config.patch b/dev-libs/nspr/files/nspr-4.6.1-config.patch
new file mode 100644
index 000000000000..ffbbf1ad8141
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.1-config.patch
@@ -0,0 +1,89 @@
+--- mozilla/nsprpub/lib/libc/src/Makefile.in.orig	2005-06-01 14:28:26.000000000 +0000
++++ mozilla/nsprpub/lib/libc/src/Makefile.in	2006-01-15 02:50:39.000000000 +0000
+@@ -112,6 +112,10 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_ARCH), Linux)
++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
++endif
++
+ ifeq ($(OS_ARCH),OS2)
+ MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+ GARBAGE += $(MAPFILE)
+--- mozilla/nsprpub/lib/ds/Makefile.in.orig	2005-06-01 14:28:25.000000000 +0000
++++ mozilla/nsprpub/lib/ds/Makefile.in	2006-01-15 02:52:30.000000000 +0000
+@@ -102,6 +102,10 @@
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++ifeq ($(OS_ARCH), Linux)
++DSO_LDOPTS += -Wl,-R,'$$ORIGIN'
++endif
++
+ ifeq ($(OS_ARCH),OS2)
+ MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+ GARBAGE += $(MAPFILE)
+--- mozilla/nsprpub/pr/src/Makefile.in.orig	2005-06-01 14:28:27.000000000 +0000
++++ mozilla/nsprpub/pr/src/Makefile.in	2006-01-15 03:29:36.000000000 +0000
+@@ -168,6 +168,7 @@
+ else
+ OS_LIBS		= -ldl
+ endif
++DSO_LDOPTS +=-Wl,-R,'$$ORIGIN'
+ endif
+ 
+ ifeq ($(OS_ARCH),HP-UX)
+--- mozilla/nsprpub/config/Makefile.in.orig	2005-06-01 14:28:23.000000000 +0000
++++ mozilla/nsprpub/config/Makefile.in	2006-01-15 04:13:42.000000000 +0000
+@@ -54,7 +54,7 @@
+ # because it is included by every makefile.
+ DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
+ 
+-RELEASE_BINS	= nspr-config
++RELEASE_BINS	= nspr-config nspr.pc
+ 
+ include $(topsrcdir)/config/config.mk
+ 
+@@ -139,6 +139,7 @@
+ 
+ export:: $(TARGETS)
+ 	rm -f $(dist_bindir)/nspr-config
++	rm -f $(dist_bindir)/nspr.pc
+ 
+ ifdef WRAP_SYSTEM_INCLUDES
+ export::
+--- mozilla/nsprpub/config/nspr.pc.in.orig	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/nsprpub/config/nspr.pc.in	2006-01-15 04:12:23.000000000 +0000
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSPR
++Description: The Netscape Portable Runtime
++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
++Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir}
++Cflags: -I${includedir}
+--- mozilla/nsprpub/configure.orig	2006-01-15 04:17:59.000000000 +0000
++++ mozilla/nsprpub/configure	2006-01-15 04:21:35.000000000 +0000
+@@ -5899,6 +5899,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile 
+--- mozilla/nsprpub/config/nspr-config.in.orig	2005-05-11 00:53:41.000000000 +0000
++++ mozilla/nsprpub/config/nspr-config.in	2006-01-15 06:37:58.000000000 +0000
+@@ -122,7 +122,7 @@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      libdirs=-L$libdir
++      libdirs="-Wl,-R$libdir -L$libdir"
+       if test -n "$lib_plds"; then
+ 	libdirs="$libdirs -lplds${major_version}"
+       fi
diff --git a/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch b/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch
new file mode 100644
index 000000000000..a741c3b3bbbb
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch
@@ -0,0 +1,15 @@
+Index: mozilla/nsprpub/pr/include/prtypes.h
+diff -u mozilla/nsprpub/pr/include/prtypes.h:3.30 mozilla/nsprpub/pr/include/prtypes.h:3.30.2.1
+--- mozilla/nsprpub/pr/include/prtypes.h:3.30   Fri Apr 29 21:02:54 2005
++++ mozilla/nsprpub/pr/include/prtypes.h        Tue Jan  3 17:43:35 2006
+@@ -178,7 +178,9 @@
+
+ #else /* Unix */
+
+-#ifdef HAVE_VISIBILITY_PRAGMA
++/* GCC 3.3 and later support the visibility attribute. */
++#if (__GNUC__ >= 4) || \
++    (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+ #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default")))
+ #else
+ #define PR_VISIBILITY_DEFAULT
diff --git a/dev-libs/nspr/nspr-4.6.1-r1.ebuild b/dev-libs/nspr/nspr-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..2de7c58b9b28
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.1-r1.ebuild
@@ -0,0 +1,89 @@
+# 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-r1.ebuild,v 1.1 2006/01/30 17:35:52 anarchy 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"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${P}-gcc-visibility.patch
+	epatch "${DISTDIR}"/${P}-disable-gcc-ansi.patch.bz2
+	epatch "${FILESDIR}"/${P}-config.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	cd build
+
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	../mozilla/nsprpub/configure \
+		--build=${CBUILD:-${CHOST}} \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/nspr \
+		--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
+	insinto /usr
+	doins -r dist/*
+	rm -rf ${D}/usr/bin/lib*.so
+
+	#removing includes/nspr/md as per fedora spec
+	# i.e a waste of space!
+	rm -rf ${D}/usr/include/nspr/md
+
+	# 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/08nspr
+
+	# install nspr-config
+	insinto  /usr/bin
+	doins ${S}/build/config/nspr-config
+	chmod a+x ${D}/usr/bin/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins ${S}/build/config/nspr.pc
+}
diff --git a/dev-libs/nspr/nspr-4.6.1.ebuild b/dev-libs/nspr/nspr-4.6.1.ebuild
deleted file mode 100644
index 3012ea5372b9..000000000000
--- a/dev-libs/nspr/nspr-4.6.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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!"
-}