version bump

(Portage version: 2.1.7.9/cvs/Linux x86_64)

4 files changed, 268 insertions, 1 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index dd139acce447..2e053643f7b5 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.130 2009/11/12 15:07:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.131 2009/11/30 15:07:32 anarchy Exp $
+
+*nspr-4.8.2 (30 Nov 2009)
+
+  30 Nov 2009; Jory A. Pratt <anarchy@gentoo.org> +nspr-4.8.2.ebuild,
+  +files/nspr-4.8-config.patch, +files/nspr-4.8-pkgconfig-gentoo.patch:
+  version bump
 
   12 Nov 2009; Joseph Jezak <josejx@gentoo.org> nspr-4.8.ebuild:
   Marked ppc64 stable for bug #280837.
diff --git a/dev-libs/nspr/files/nspr-4.8-config.patch b/dev-libs/nspr/files/nspr-4.8-config.patch
new file mode 100644
index 000000000000..e8fc6c112bf8
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.8-config.patch
@@ -0,0 +1,47 @@
+--- 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/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.8-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch
new file mode 100644
index 000000000000..3309ae085feb
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch
@@ -0,0 +1,126 @@
+diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk
+--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk	2009-09-12 00:43:47.678357452 -0500
++++ nspr-4.8/mozilla/nsprpub/config/config.mk	2009-09-12 00:44:19.383381757 -0500
+@@ -162,3 +162,4 @@
+ RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
+ RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
+ RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig
+diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in
+--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in	2009-09-12 00:43:47.678357452 -0500
++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in	2009-09-12 00:44:19.384379661 -0500
+@@ -52,9 +52,10 @@
+ 
+ # autoconf.mk must be deleted last (from the top-level directory)
+ # because it is included by every makefile.
+-DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config
++DIST_GARBAGE	= nsprincl.mk nsprincl.sh nspr-config nspr.pc
+ 
+ RELEASE_BINS	= nspr-config
++RELEASE_PC	= nspr.pc
+ 
+ include $(topsrcdir)/config/config.mk
+ 
+diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in
+--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in	2009-09-12 00:43:47.677356194 -0500
++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in	2009-09-12 00:45:53.723359547 -0500
+@@ -92,13 +92,13 @@
+ 
+ # Set variables that may be dependent upon other variables
+ if test -z "$exec_prefix"; then
+-    exec_prefix=@exec_prefix@
++    exec_prefix=`pkg-config --variable=exec_prefix nspr`
+ fi
+ if test -z "$includedir"; then
+-    includedir=@includedir@
++    includedir=`pkg-config --variable=includedir nspr`
+ fi
+ if test -z "$libdir"; then
+-    libdir=@libdir@
++    libdir=`pkg-config --variable=libdir nspr`
+ fi
+ 
+ if test "$echo_prefix" = "yes"; then
+diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in
+--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in	1969-12-31 18:00:00.000000000 -0600
++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in	2009-09-12 00:44:19.410432811 -0500
+@@ -0,0 +1,11 @@
++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} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread 
++Cflags: -I${includedir}
++
+diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk
+--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk	2009-09-12 00:43:47.677356194 -0500
++++ nspr-4.8/mozilla/nsprpub/config/rules.mk	2009-09-12 00:44:19.435517111 -0500
+@@ -211,7 +211,7 @@
+ 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
+ 	+$(LOOP_OVER_DIRS)
+ 
+-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC)
+ ifdef RELEASE_BINS
+ 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
+ endif
+@@ -221,6 +221,9 @@
+ ifdef RELEASE_LIBS
+ 	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
+ endif
++ifdef RELEASE_PC
++	$(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/
++endif
+ 	+$(LOOP_OVER_DIRS)
+ 
+ release:: export
+@@ -272,6 +275,23 @@
+ 	fi
+ 	cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST)
+ endif
++ifdef RELEASE_PC
++	@echo "Copying pkg-config files to release directory"
++	@if test -z "$(BUILD_NUMBER)"; then \
++		echo "BUILD_NUMBER must be defined"; \
++		false; \
++	else \
++		true; \
++	fi
++	@if test ! -d $(RELEASE_PC_DEST); then \
++		rm -rf $(RELEASE_PC_DEST); \
++		$(NSINSTALL) -D $(RELEASE_PC_DEST);\
++	else \
++		true; \
++	fi
++	cp $(RELEASE_PC) $(RELEASE_PC_DEST)
++endif
++
+ 	+$(LOOP_OVER_DIRS)
+ 
+ alltags:
+diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure
+--- nspr-4.8-orig/mozilla/nsprpub/configure	2009-09-12 00:43:47.600359058 -0500
++++ nspr-4.8/mozilla/nsprpub/configure	2009-09-12 00:44:19.444380569 -0500
+@@ -6037,6 +6037,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile 
+diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in
+--- nspr-4.8-orig/mozilla/nsprpub/configure.in	2009-09-12 00:43:47.678357452 -0500
++++ nspr-4.8/mozilla/nsprpub/configure.in	2009-09-12 00:44:19.451396074 -0500
+@@ -2871,6 +2871,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile 
diff --git a/dev-libs/nspr/nspr-4.8.2.ebuild b/dev-libs/nspr/nspr-4.8.2.ebuild
new file mode 100644
index 000000000000..ad67bd2af973
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.8.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.2.ebuild,v 1.1 2009/11/30 15:07:32 anarchy Exp $
+
+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 ~x86-fbsd"
+IUSE="ipv6 debug"
+
+DEPEND=">=dev-db/sqlite-3.5"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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.patch
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		mozilla/nsprpub/config/rules.mk
+}
+
+src_compile() {
+	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*) myconf="${myconf} --enable-64bit";;
+		*32-bit*) ;;
+		*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \
+		--enable-system-sqlite 	--with-mozilla --with-pthreads"
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+	make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+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 "${D}"/usr/$(get_libdir)/nspr
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# 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
+	dobin "${S}"/build/config/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/build/config/nspr.pc
+
+	# Remove stupid files in /usr/bin
+	rm "${D}"/usr/bin/prerr.properties
+}
+
+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
+}