added missing zlib dep, bug 502332 ; remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

4 files changed, 11 insertions, 126 deletions

diff --git a/dev-lang/spidermonkey/ChangeLog b/dev-lang/spidermonkey/ChangeLog
index c00554b50367..829726d44efe 100644
--- a/dev-lang/spidermonkey/ChangeLog
+++ b/dev-lang/spidermonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.137 2014/02/23 17:10:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.138 2014/02/24 19:34:52 axs Exp $
+
+  24 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  -spidermonkey-17.0.0-r1.ebuild, spidermonkey-17.0.0-r2.ebuild,
+  spidermonkey-24.2.0.ebuild:
+  added missing zlib dep, bug 502332 ; remove old
 
   23 Feb 2014; Pacho Ramos <pacho@gentoo.org> spidermonkey-17.0.0-r2.ebuild:
   x86 stable, bug #500758
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r1.ebuild
deleted file mode 100644
index d9bd7a779c13..000000000000
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r1.ebuild,v 1.5 2014/02/22 16:17:42 jer Exp $
-
-EAPI="5"
-WANT_AUTOCONF="2.1"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads"
-inherit eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
-
-MY_PN="mozjs"
-MY_P="${MY_PN}${PV}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
-
-LICENSE="NPL-1.1"
-SLOT="17"
-KEYWORDS="~alpha ~amd64 ~arm -hppa -ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug jit minimal static-libs test"
-
-REQUIRED_USE="debug? ( jit )"
-
-S="${WORKDIR}/${MY_P}"
-BUILDDIR="${S}/js/src"
-
-RDEPEND=">=dev-libs/nspr-4.9.4
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	virtual/pkgconfig"
-
-pkg_setup(){
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		python-any-r1_pkg_setup
-		export LC_ALL="C"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch
-	epatch_user
-
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# Don't try to be smart, this does not work in cross-compile anyway
-		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
-	fi
-}
-
-src_configure() {
-	cd "${BUILDDIR}" || die
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-	AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-	LD="$(tc-getLD)" \
-	econf \
-		${myopts} \
-		--enable-jemalloc \
-		--enable-readline \
-		--enable-threadsafe \
-		--with-system-nspr \
-		--enable-system-ffi \
-		--enable-jemalloc \
-		$(use_enable debug) \
-		$(use_enable jit tracejit) \
-		$(use_enable jit methodjit) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_compile() {
-	cd "${BUILDDIR}" || die
-	if tc-is-cross-compiler; then
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			jscpucfg host_jsoplengen host_jskwgen || die
-		make CFLAGS="" CXXFLAGS="" \
-			CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
-			AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
-			-C config nsinstall || die
-		mv {,native-}jscpucfg || die
-		mv {,native-}host_jskwgen || die
-		mv {,native-}host_jsoplengen || die
-		mv config/{,native-}nsinstall || die
-		sed -e 's@./jscpucfg@./native-jscpucfg@' \
-			-e 's@./host_jskwgen@./native-host_jskwgen@' \
-			-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
-			-i Makefile || die
-		sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || die
-		rm -f config/host_nsinstall.o \
-			config/host_pathsub.o \
-			host_jskwgen.o \
-			host_jsoplengen.o || die
-	fi
-	emake
-}
-
-src_test() {
-	cd "${BUILDDIR}/jsapi-tests" || die
-	emake check
-}
-
-src_install() {
-	cd "${BUILDDIR}" || die
-	emake DESTDIR="${D}" install
-
-	if ! use minimal; then
-		if use jit; then
-			pax-mark m "${ED}/usr/bin/js${SLOT}"
-		fi
-	else
-		rm -f "${ED}/usr/bin/js${SLOT}"
-	fi
-
-	if ! use static-libs; then
-		# We can't actually disable building of static libraries
-		# They're used by the tests and in a few other places
-		find "${D}" -iname '*.a' -delete || die
-	fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild
index 5a9e48231750..c24eafa95e09 100644
--- a/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild,v 1.4 2014/02/23 17:10:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-17.0.0-r2.ebuild,v 1.5 2014/02/24 19:34:52 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -26,7 +26,8 @@ S="${WORKDIR}/${MY_P}"
 BUILDDIR="${S}/js/src"
 
 RDEPEND=">=dev-libs/nspr-4.9.4
-	virtual/libffi"
+	virtual/libffi
+	>=sys-libs/zlib-1.1.4"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-arch/zip
diff --git a/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild
index 2b1939a7e8a3..f0159f07154e 100644
--- a/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild,v 1.2 2014/02/03 13:19:33 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0.ebuild,v 1.3 2014/02/24 19:34:52 axs Exp $
 
 EAPI="5"
 WANT_AUTOCONF="2.1"
@@ -26,6 +26,7 @@ BUILDDIR="${S}/js/src"
 
 RDEPEND=">=dev-libs/nspr-4.9.4
 	virtual/libffi
+	>=sys-libs/zlib-1.1.4
 	system-icu? ( >=dev-libs/icu-1.51 )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}