Version bump, remove old

Package-Manager: portage-2.1.3.19

7 files changed, 126 insertions, 119 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/Manifest b/dev-libs/nspr/Manifest
index 0e97ddce4597..7584120cc2f7 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6
 MD5 268f90a610fa729ec783fbdbed7adf1b files/nspr-4.6.1-config-1.patch 565
 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 files/nspr-4.6.1-config-1.patch 565
@@ -21,29 +18,33 @@ AUX nspr-4.6.1-prtime.patch 1003 RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b
 MD5 427516bd171200f54d93738aa4c1ab28 files/nspr-4.6.1-prtime.patch 1003
 RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b files/nspr-4.6.1-prtime.patch 1003
 SHA256 54ed12024f4fd65bb911279faab18665b00429c7d0811c7485d4ff5c2c436237 files/nspr-4.6.1-prtime.patch 1003
+AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7
+MD5 09eaeb2b4bebd8aea465c50b46e90e45 files/nspr-4.7.0-prtime.patch 964
+RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d files/nspr-4.7.0-prtime.patch 964
+SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 files/nspr-4.7.0-prtime.patch 964
 AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bcdb0618418aaa0d3fb82a3d0475b9098a SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639
 MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250
 RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250
 SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 files/nspr.pc.in 250
 DIST nspr-4.6.5.tar.gz 1284497 RMD160 d01785db70bf949aefb09f0095911794f31b7769 SHA1 1939369fc6313cb4a9f935817e1e77fd5750b6b1 SHA256 335c5e541af65632a57b7ea70b4c47e3e1f33e758cd146ff7154f547ef836c74
-DIST nspr-4.6.6.tar.gz 1302662 RMD160 d296242b55ce88f665c91ab0f13e03e1a54c1552 SHA1 5e0d35f0ae968dc7a38387688ecd9ea6002dcf5e SHA256 710125fce83bd6eb85bb48b432d8a62f7a666014ff8e0ff9f3cc93fdfd3d161d
 DIST nspr-4.6.7.tar.gz 1303759 RMD160 11a0d8b14ebdd441f6899c464b77144704ab638e SHA1 cf45319d02285ec5479445a1e9adfb9e94f55a6a SHA256 314e078f954677f469f2a60e8aca8efa3dd1807f7e1a109cc688a2469e2e3b70
+DIST nspr-4.7.0_pre20071016.tar.bz2 977877 RMD160 d0aee49a5a90094b11013e16bfc5afb03d07ca0d SHA1 207f559d6300bd54f103cb49f26974f0f85a1234 SHA256 27722468f440e89e32b6be553d28e5217a3f613216231067819df419ffbced7d
 EBUILD nspr-4.6.5-r1.ebuild 2560 RMD160 7639aa40c7337d56b03c422d48423108371e2cdb SHA1 436b47018ca144af599c9980bd5969c4e7ca5bac SHA256 ece342ea40dac2b273b34cb05af3d3074183c5549cad1abe423f665d0b60f148
 MD5 e257a350b96428d7cd47af7dc4655a5f nspr-4.6.5-r1.ebuild 2560
 RMD160 7639aa40c7337d56b03c422d48423108371e2cdb nspr-4.6.5-r1.ebuild 2560
 SHA256 ece342ea40dac2b273b34cb05af3d3074183c5549cad1abe423f665d0b60f148 nspr-4.6.5-r1.ebuild 2560
-EBUILD nspr-4.6.6.ebuild 2564 RMD160 78a1ed608b71d98e39e40bfbe586f3c7a72892b0 SHA1 7d6378af9ba7e7ac21032ca414f74edf4cd5814b SHA256 748fe1f7cf633e864c35e6fe0d6667a3ec4c69150327a0edc74e0c83f05124a1
-MD5 c15a1e9b9a8ecf463420149f949f8c3c nspr-4.6.6.ebuild 2564
-RMD160 78a1ed608b71d98e39e40bfbe586f3c7a72892b0 nspr-4.6.6.ebuild 2564
-SHA256 748fe1f7cf633e864c35e6fe0d6667a3ec4c69150327a0edc74e0c83f05124a1 nspr-4.6.6.ebuild 2564
 EBUILD nspr-4.6.7.ebuild 2554 RMD160 169c07cafe936e414a4dcec155b8bd7b4b85710e SHA1 978d4644e09e1df7c3c4c3056cfce1eb4c8437c3 SHA256 1f8790a29b54bc0125762cc5a9fa401024dafcd70d3fc6d81e49b7c978ce3b4a
 MD5 535c58da7153d6660776cec1bf59fe75 nspr-4.6.7.ebuild 2554
 RMD160 169c07cafe936e414a4dcec155b8bd7b4b85710e nspr-4.6.7.ebuild 2554
 SHA256 1f8790a29b54bc0125762cc5a9fa401024dafcd70d3fc6d81e49b7c978ce3b4a nspr-4.6.7.ebuild 2554
-MISC ChangeLog 10793 RMD160 1e90be3839c3eab635385eb82ec5868d5d767635 SHA1 a1ff8ae9587b49dde6bc4faba7e7d49fbb4c0965 SHA256 9a09a3b6d36dd1cd314dbd1d7ffea48e1d2b3bc5e2be4f75ddfa1af248c04233
-MD5 3d4149e4894cf1d8dda4bc7c4fd131e1 ChangeLog 10793
-RMD160 1e90be3839c3eab635385eb82ec5868d5d767635 ChangeLog 10793
-SHA256 9a09a3b6d36dd1cd314dbd1d7ffea48e1d2b3bc5e2be4f75ddfa1af248c04233 ChangeLog 10793
+EBUILD nspr-4.7.0_pre20071016.ebuild 1823 RMD160 d2b72accda251dc712407daa1e91ef2a554f8349 SHA1 dcda588cff6b279a01e86b37f1f85d9d9687cd70 SHA256 53be8a8178f019a490a4a47e854ff84497a1fe14ec69a54ae7438870b524128f
+MD5 cbcbb48b81c7b5e0d7852e7804ac6c76 nspr-4.7.0_pre20071016.ebuild 1823
+RMD160 d2b72accda251dc712407daa1e91ef2a554f8349 nspr-4.7.0_pre20071016.ebuild 1823
+SHA256 53be8a8178f019a490a4a47e854ff84497a1fe14ec69a54ae7438870b524128f nspr-4.7.0_pre20071016.ebuild 1823
+MISC ChangeLog 10997 RMD160 2db71b97dcdfd728ca1d713b8826247cf00ae65a SHA1 6437d3511e08bef4711acd6fbef38b739767a3b0 SHA256 8d08fa4a8e1122f207aa382670681514244cc8d7f4e80750efca813c76ccf957
+MD5 307321c1749832d9263249c8c3ad3877 ChangeLog 10997
+RMD160 2db71b97dcdfd728ca1d713b8826247cf00ae65a ChangeLog 10997
+SHA256 8d08fa4a8e1122f207aa382670681514244cc8d7f4e80750efca813c76ccf957 ChangeLog 10997
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -51,16 +52,9 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 3152d6c36a46cd518be77a94f25a237c files/digest-nspr-4.6.5-r1 235
 RMD160 6bbde84a7da4c7c40519b214a29b1e0f3ceccbe4 files/digest-nspr-4.6.5-r1 235
 SHA256 ef477cfba8315b1d00228bc3fda1ac99dfa12eb36b8dbb00ea4de1d79750020f files/digest-nspr-4.6.5-r1 235
-MD5 349e1166f1b791212b6b2c0db73fd67f files/digest-nspr-4.6.6 235
-RMD160 238501f1d043f510f4f371c261c466afc415a04e files/digest-nspr-4.6.6 235
-SHA256 917e7f319d65729d8ad5a92ae5c27917aeda6736eba84c01f6f98c7af3cfd155 files/digest-nspr-4.6.6 235
 MD5 69b785bf715953ce33c80ab115418d07 files/digest-nspr-4.6.7 235
 RMD160 3f9e72b3ac2de9d141862806f06713fb4d9e258a files/digest-nspr-4.6.7 235
 SHA256 d3a65ae555f9cf56e935ad8a0feefc5b51d53ec05ae9318a7830764271d03f75 files/digest-nspr-4.6.7 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG0K/hp/wUKkr7RBoRAiYuAJ0UoJ/bRm/j6fhicC6w+rI1PzpBmQCg3e7a
-WFhX0GGT+OvmFGDymwUWoeY=
-=u/sK
------END PGP SIGNATURE-----
+MD5 afb9be027b029834274fe9b446e2461f files/digest-nspr-4.7.0_pre20071016 271
+RMD160 875626704f55b73e284ef54f65804861652c2697 files/digest-nspr-4.7.0_pre20071016 271
+SHA256 d7dcc8ab4b21f3b72884c07cf23d2f16be0ca734619129ed6c0bd0c7e6dbc90f files/digest-nspr-4.7.0_pre20071016 271
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}
+}