Version bump, remove old

(Portage version: 2.1.3.19)

6 files changed, 110 insertions, 97 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index a3be8fa21cf1..3ad8474fb57a 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.86 2007/08/15 23:57:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.87 2007/12/12 13:57:12 armin76 Exp $
+
+*nspr-4.7.0_pre20071016 (12 Dec 2007)
+
+  12 Dec 2007; Raúl Porcel <armin76@gentoo.org>
+  +files/nspr-4.7.0-prtime.patch, -nspr-4.6.6.ebuild,
+  +nspr-4.7.0_pre20071016.ebuild:
+  Version bump, remove old
 
   15 Aug 2007; Christoph Mende <angelos@gentoo.org> nspr-4.6.7.ebuild:
   Stable on amd64 wrt bug #188158
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.6 b/dev-libs/nspr/files/digest-nspr-4.6.6
deleted file mode 100644
index 5de600aa3ef0..000000000000
--- a/dev-libs/nspr/files/digest-nspr-4.6.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba49bc35e2068f54893d3ea7031ad59c nspr-4.6.6.tar.gz 1302662
-RMD160 d296242b55ce88f665c91ab0f13e03e1a54c1552 nspr-4.6.6.tar.gz 1302662
-SHA256 710125fce83bd6eb85bb48b432d8a62f7a666014ff8e0ff9f3cc93fdfd3d161d nspr-4.6.6.tar.gz 1302662
diff --git a/dev-libs/nspr/files/digest-nspr-4.7.0_pre20071016 b/dev-libs/nspr/files/digest-nspr-4.7.0_pre20071016
new file mode 100644
index 000000000000..dbeb1bb0d888
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.7.0_pre20071016
@@ -0,0 +1,3 @@
+MD5 6866cd2662310df7a53edf70d2ab91af nspr-4.7.0_pre20071016.tar.bz2 977877
+RMD160 d0aee49a5a90094b11013e16bfc5afb03d07ca0d nspr-4.7.0_pre20071016.tar.bz2 977877
+SHA256 27722468f440e89e32b6be553d28e5217a3f613216231067819df419ffbced7d nspr-4.7.0_pre20071016.tar.bz2 977877
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
new file mode 100644
index 000000000000..ac509ef23d5c
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
@@ -0,0 +1,26 @@
+--- mozilla/nsprpub/pr/src/misc/prtime.c.orig	2007-09-14 19:41:08.000000000 +0200
++++ mozilla/nsprpub/pr/src/misc/prtime.c	2007-09-14 19:42:17.000000000 +0200
+@@ -1536,7 +1536,7 @@
+                 case TT_EET: zone_offset =  2 * 60; break;
+                 case TT_JST: zone_offset =  9 * 60; break;
+                 default:
+-                  PR_ASSERT (0);
++                  return PR_FAILURE;
+                   break;
+                 }
+         }
+@@ -1578,11 +1578,12 @@
+           struct tm localTime;
+           time_t secs;
+ 
+-          PR_ASSERT(result->tm_month > -1 &&
++          if (!(result->tm_month > -1 &&
+                     result->tm_mday > 0 &&
+                     result->tm_hour > -1 &&
+                     result->tm_min > -1 &&
+-                    result->tm_sec > -1);
++                    result->tm_sec > -1))
++		    return PR_FAILURE;
+ 
+             /*
+              * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-4.6.6.ebuild b/dev-libs/nspr/nspr-4.6.6.ebuild
deleted file mode 100644
index fe1c3873c75d..000000000000
--- a/dev-libs/nspr/nspr-4.6.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.6.ebuild,v 1.1 2007/03/09 21:31:07 armin76 Exp $
-
-inherit eutils multilib
-
-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=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
-}
-
-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
-
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr"
-
-	ECONF_SOURCE="../mozilla/nsprpub" econf \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	make || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=6
-	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
-	#and while at it move them to files with versions-ending
-	#and link them back :)
-	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
-	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.7.0_pre20071016.ebuild b/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild
new file mode 100644
index 000000000000..b82362fd8dc7
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.0_pre20071016.ebuild,v 1.1 2007/12/12 13:57:12 armin76 Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 debug"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${PN}-4.6.1-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
+}
+
+src_compile() {
+	cd "${S}"/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
+
+	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr"
+
+	ECONF_SOURCE="../mozilla/nsprpub" econf \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=7
+	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,nspr.pc}
+}