1.5 version bump for bug 121076. Request by Sascha Geschwandtner <s dot geschwandtner at gmx dot de>.

(Portage version: 2.0.54 vanquish yourself edition)

6 files changed, 73 insertions, 50 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index 788014bbb295..e95c665639f1 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/spidermonkey
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.16 2005/12/06 11:21:35 jer Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.17 2006/02/19 03:46:57 vanquirius Exp $
+
+*spidermonkey-1.5 (19 Feb 2006)
+
+  19 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -spidermonkey-1.5_rc6.ebuild, +spidermonkey-1.5.ebuild:
+  1.5 version bump for bug 121076. Request by Sascha Geschwandtner <s dot
+  geschwandtner at gmx dot de>.
 
   06 Dec 2005; Jeroen Roovers <jer@gentoo.org>
   spidermonkey-1.5_rc6-r1.ebuild:
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index f0fabad28ded..23d7b04bd151 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,8 +1,8 @@
 MD5 0c5feed9987cfdfbfad2403115c18d5f ChangeLog 2457
+MD5 57c9cfb3e51451cfde5599ae7252d53b files/digest-spidermonkey-1.5 58
 MD5 e7bfb72073e1ade3470d60ba93042804 files/digest-spidermonkey-1.5_rc5 63
-MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6 64
 MD5 8e216cdd6972fcc5206162ef5f0a9702 files/digest-spidermonkey-1.5_rc6-r1 64
 MD5 28f680a9a90133efd1e29dd6945ceb90 files/spidermonkey-1.5_rc6-va_copy-fix.patch 1643
+MD5 ce3b8f412a8f12159a60189f3f208231 spidermonkey-1.5.ebuild 1239
 MD5 92316cef417fab365401f2ce9d8f7394 spidermonkey-1.5_rc5.ebuild 802
 MD5 168eaec996bbe59b074f1df9eb309e00 spidermonkey-1.5_rc6-r1.ebuild 1376
-MD5 b0a39d97a54b44ecd77f8b5671cd7fdd spidermonkey-1.5_rc6.ebuild 1147
diff --git a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5 b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5
new file mode 100644
index 000000000000..4fa79f7b5b9f
--- /dev/null
+++ b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5
@@ -0,0 +1 @@
+MD5 863bb6462f4ce535399a7c6276ae6776 js-1.5.tar.gz 958135
diff --git a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc6 b/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc6
deleted file mode 100644
index 41a8dea7405d..000000000000
--- a/dev-lang/spidermonkey/files/digest-spidermonkey-1.5_rc6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25e1d1dd2674d85883391b6b42a7b02f js-1.5-rc6a.tar.gz 1058911
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5.ebuild
new file mode 100644
index 000000000000..290871310f07
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5.ebuild,v 1.1 2006/02/19 03:46:57 vanquirius Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P="js-${PV}"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/js/src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.5_rc6-va_copy-fix.patch
+}
+
+src_compile() {
+	cat >>Makefile.ref<<'EOF'
+
+.PHONY: install-headers
+install-headers: $(HFILES)
+	install -g root -o root -m 555 -d $(DESTDIR)/usr/include/js
+	install -g root -o root -m 444 $^ $(DESTDIR)/usr/include/js
+EOF
+
+	tc-export CC LD AR
+
+	do_my_compile() {
+		emake -j1 \
+		-f Makefile.ref \
+		BUILD_OPT=1
+		return $?
+	}
+
+	# it needs to run twice
+	{ do_my_compile || do_my_compile ;} || die
+}
+
+src_install() {
+	cd Linux_All_OPT.OBJ
+	dolib.a libjs.a || die "libjs.a failed"
+	dolib.so libjs.so || die "libjs.so failed"
+	dobin js jscpucfg || die "dobin failed"
+	cd -
+
+	make -f Makefile.ref \
+		DESTDIR="${D}" install-headers \
+		|| die "make install-headers failed."
+
+	dodoc ../README
+	dohtml README.html
+}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild b/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild
deleted file mode 100644
index a277afd5b94c..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.5_rc6.ebuild,v 1.2 2005/02/19 12:20:18 hansmi Exp $
-
-MY_PV="${PV/_/-}a"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/js-${MY_PV}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/js/src/
-
-src_compile() {
-	cat >>Makefile.ref<<'EOF'
-
-.PHONY: install-headers
-install-headers: $(JS_HFILES)
-	install -g root -o root -m 555 -d $(DESTDIR)/usr/include
-	install -g root -o root -m 444 $^ $(DESTDIR)/usr/include
-EOF
-
-	# it needs to run twice
-	emake -j1 -f Makefile.ref BUILD_OPT=1 \
-		|| emake -j1 -f Makefile.ref BUILD_OPT=1 || die
-}
-
-src_install() {
-	cd Linux_All_OPT.OBJ
-	dolib.a libjs.a || die "libjs.a failed"
-	dolib.so libjs.so || die "libjs.so failed"
-	dobin js jscpucfg || die "dobin failed"
-	cd -
-
-	make -f Makefile.ref DESTDIR=${D} install-headers \
-		|| die "make install-headers failed."
-
-	dodoc ../README
-	dohtml README.html
-}