Version bump (bug #522044). Removed old.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 117 insertions, 336 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index c6fb88e8ba4f..29397b0ea0c7 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.280 2014/08/10 18:37:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.281 2014/09/03 16:10:05 polynomial-c Exp $
+
+*nspr-4.10.7 (03 Sep 2014)
+
+  03 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -nspr-4.10.ebuild,
+  -nspr-4.10.4.ebuild, +nspr-4.10.7.ebuild, -files/nspr-4.8.3-aix-gcc.patch:
+  Version bump (bug #522044). Removed old.
 
   10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6-r1.ebuild:
   Stable for ppc64, wrt bug #517876
diff --git a/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch b/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch
deleted file mode 100644
index 4dc4ea335d91..000000000000
--- a/dev-libs/nspr/files/nspr-4.8.3-aix-gcc.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-NSPR does not know that gcc does work on AIX:
-https://bugzilla.mozilla.org/show_bug.cgi?id=547991
-
---- ./mozilla/nsprpub/configure.in.orig	2010-02-23 14:36:55 +0100
-+++ ./mozilla/nsprpub/configure.in	2010-02-23 14:37:08 +0100
-@@ -871,8 +871,13 @@
-         AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-         USE_IPV6=1
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-+        if test -n "$GNU_CC"; then
-+            LD='$(CC)'
-+            DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
-+        fi
-         ;;
-     esac
-+    test -z "$GNU_CC" &&
-     CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
---- ./mozilla/nsprpub/configure.orig	2010-02-23 14:36:58 +0100
-+++ ./mozilla/nsprpub/configure	2010-02-23 14:37:08 +0100
-@@ -3099,8 +3099,13 @@
- 
-         USE_IPV6=1
-         AIX_LINK_OPTS='-brtl -bnso -berok'
-+        if test -n "$GNU_CC"; then
-+            LD='$(CC)'
-+            DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
-+        fi
-         ;;
-     esac
-+    test -z "$GNU_CC" &&
-     CFLAGS="$CFLAGS -qro -qroconst"
-     AIX_WRAP='$(DIST)/lib/aixwrap.o'
-     AIX_TMP='./_aix_tmp.o'
---- ./mozilla/nsprpub/lib/ds/Makefile.in.orig	2010-02-23 14:40:10 +0100
-+++ ./mozilla/nsprpub/lib/ds/Makefile.in	2010-02-23 14:40:58 +0100
-@@ -68,11 +68,19 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH), AIX)
-+ifndef NS_USE_GCC
- ifeq ($(CLASSIC_NSPR),1)
- OS_LIBS = -lc
- else
- OS_LIBS = -lc_r
- endif
-+else
-+ifeq ($(CLASSIC_NSPR),1)
-+OS_LIBS =
-+else
-+OS_LIBS = -pthread
-+endif
-+endif
- endif
- 
- ifeq ($(OS_ARCH),IRIX)
---- ./mozilla/nsprpub/lib/libc/src/Makefile.in.orig	2010-02-23 14:45:41 +0100
-+++ ./mozilla/nsprpub/lib/libc/src/Makefile.in	2010-02-23 14:47:58 +0100
-@@ -77,11 +77,19 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH), AIX)
-+ifndef NS_USE_GCC
- ifeq ($(CLASSIC_NSPR),1)
- OS_LIBS = -lc
- else
- OS_LIBS = -lc_r
- endif
-+else
-+ifeq ($(CLASSIC_NSPR),1)
-+OS_LIBS =
-+else
-+OS_LIBS = -pthread
-+endif
-+endif
- endif
- 
- ifeq ($(OS_ARCH),IRIX)
---- ./mozilla/nsprpub/pr/src/Makefile.in.orig	2010-02-23 14:37:04 +0100
-+++ ./mozilla/nsprpub/pr/src/Makefile.in	2010-02-23 14:52:16 +0100
-@@ -110,19 +110,29 @@
- endif
- 
- ifeq ($(OS_ARCH),AIX)
-+ifndef NS_USE_GCC
- DSO_LDOPTS	+= -binitfini::_PR_Fini
-+endif
- OS_LIBS		= -lodm -lcfg
- ifeq ($(CLASSIC_NSPR),1)
- ifeq ($(OS_RELEASE),4.1)
- OS_LIBS		+= -lsvld -lc
- else
-+ifndef NS_USE_GCC
- OS_LIBS		+= -ldl -lc
-+else
-+OS_LIBS		+= -ldl
-+endif
- endif
- else
- ifeq ($(OS_RELEASE),4.1)
- OS_LIBS		+= -lpthreads -lsvld -lC_r -lC -lc_r -lm /usr/lib/libc.a
- else
-+ifndef NS_USE_GCC
- OS_LIBS		+= -lpthreads -ldl -lC_r -lC -lc_r -lm /usr/lib/libc.a
-+else
-+OS_LIBS		+= -pthread -ldl -lm
-+endif
- endif
- endif
- endif
---- mozilla/nsprpub/pr/tests/Makefile.in.orig	2010-02-23 15:14:03 +0100
-+++ mozilla/nsprpub/pr/tests/Makefile.in	2010-02-23 15:17:58 +0100
-@@ -341,9 +341,17 @@
- 
- # AIX
- ifeq ($(OS_ARCH),AIX)
-+  ifndef NS_USE_GCC
-     LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
-+  else
-+    LDOPTS += -Wl,-blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
-+  endif
-     ifneq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-+      ifndef NS_USE_GCC
-         LDOPTS += -brtl
-+      else
-+        LDOPTS += -Wl,-brtl
-+      endif
-         EXTRA_LIBS = -ldl
-     endif
- endif
---- mozilla/nsprpub/lib/tests/Makefile.in.orig	2010-02-23 15:35:37 +0100
-+++ mozilla/nsprpub/lib/tests/Makefile.in	2010-02-23 15:35:37 +0100
-@@ -127,7 +127,11 @@
- 
- # AIX
- ifeq ($(OS_ARCH),AIX)
-+ifndef NS_USE_GCC
- LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-+else
-+LDOPTS += -Wl,-blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
-+endif
- LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
- LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
- endif
diff --git a/dev-libs/nspr/nspr-4.10.4.ebuild b/dev-libs/nspr/nspr-4.10.4.ebuild
deleted file mode 100644
index 6764f9634c1a..000000000000
--- a/dev-libs/nspr/nspr-4.10.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.4.ebuild,v 1.8 2014/03/24 14:33:51 ago Exp $
-
-EAPI=5
-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 ~arm64 hppa ~ia64 ~m68k ~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
-	cd "${S}"/nspr/
-	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
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/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="../nspr" \
-	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
-}
-
-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
-
-	cd "${ED}"/usr/$(get_libdir)
-	einfo "removing static libraries as upstream has requested!"
-	rm *.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin "${S}"/build/config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}
diff --git a/dev-libs/nspr/nspr-4.10.7.ebuild b/dev-libs/nspr/nspr-4.10.7.ebuild
new file mode 100644
index 000000000000..649f6c3f145a
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.10.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.7.ebuild,v 1.1 2014/09/03 16:10:05 polynomial-c Exp $
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+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 ~arm64 ~hppa ~ia64 ~m68k ~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"
+
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# 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=()
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*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 ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable debug) \
+		$(use_enable !debug optimize) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
+}
diff --git a/dev-libs/nspr/nspr-4.10.ebuild b/dev-libs/nspr/nspr-4.10.ebuild
deleted file mode 100644
index 50526f151817..000000000000
--- a/dev-libs/nspr/nspr-4.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.10.ebuild,v 1.10 2013/10/09 17:10:14 ago 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
-	cd "${S}"/nspr/
-	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
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/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="../nspr" \
-	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"
-}