commit:     ba5ae143c61e68e4e4964fbfd098178ac2a56650
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 15:10:36 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 15:11:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5ae143

dev-lang/spidermonkey: clean up old ebuilds

Package-Manager: portage-2.2.26

 dev-lang/spidermonkey/Manifest                     |   1 -
 .../spidermonkey-1.8.5-arm_respect_cflags-2.patch  | 102 ---------------------
 .../files/spidermonkey-1.8.7-filter_desc.patch     |  18 ----
 .../files/spidermonkey-1.9.2.13-as-needed.patch    |  22 -----
 dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild |  51 -----------
 dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild |  52 -----------
 dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild    |  50 ----------
 .../spidermonkey/spidermonkey-1.8.2.15-r2.ebuild   |  77 ----------------
 8 files changed, 373 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index bd16fe6..45577ad 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,4 +1,3 @@
-DIST firefox-3.6.15.source.tar.bz2 51552828 SHA256 
405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f SHA512 
82bf0a6c6cb30fc0b18b067ac3d9cb7e48a0fd0126edd851e628d49e429aea33500a5a5eba87bce922e51b1b7410ccccfe4f8b7ce5573bdbd718c76da7acb1da
 WHIRLPOOL 
b788d7ba2cfcaec4f317e615878401a7a1fb985aaa43829831c17b699812e59adb7874247114e0143da63198118cab059796fc5d5fd08d72ccc54b4fef279f85
 DIST js-1.7.0.tar.gz 1165607 SHA256 
44363f0f3895800ee6010763eae90c0d15ed28e07d783bc7b3c607ce98d8668b SHA512 
9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
 WHIRLPOOL 
8044b306b3a1f0abed5ac8a6bf4f9ed70e1ebc6f83f44934a6306d9ed68cd73124f82e40430d764f158377031f5ee986595e58fdb52259ab6a3a8674eaf4eed1
 DIST js185-1.0.0.tar.gz 6164605 SHA256 
5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 SHA512 
2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 WHIRLPOOL 
58b372713275874d3ae3c6b58c12c56bf8d17d024d591e321538bcdd8e615332e41655954368ce86b90e970209e3fd650c39d931000880f5ec22cb044b5d7a4e
 DIST mozjs-24.2.0.tar.bz2 15624530 SHA256 
e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 SHA512 
49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4
 WHIRLPOOL 
ea74d19c79b1a0fe407e2803900c49c23e8b76444fb4e20995072c3c59427e8df1895df04f2f4de779a1c58cd1166dd97aeaf7564350832011efe89dbcf9583e

diff --git 
a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch 
b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
deleted file mode 100644
index 106ec14..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_respect_cflags-2.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/js-1.8.5/js/src/configure.in     2011-03-31 15:08:36.000000000 -0400
-+++ b/js-1.8.5/js/src/configure.in     2012-11-02 15:32:38.000000000 -0400
-@@ -3550,7 +3550,7 @@
- _SAVE_CFLAGS="$CFLAGS"
- if test "$GNU_CC"; then
-   # gcc needs -mfpu=neon to recognize NEON instructions
--  CFLAGS="$CFLAGS -mfpu=neon -mfloat-abi=softfp"
-+  CFLAGS="$CFLAGS -mfpu=neon"
- fi
- AC_TRY_COMPILE([],
-                [asm("vadd.i8 d0, d0, d0");],
-@@ -4654,12 +4654,6 @@
- dnl ========================================================
- MOZ_ARG_HEADER(Individual module options)
- 
--dnl Setup default CPU arch for arm target
--case "$target_cpu" in
--  arm*)
--    MOZ_ARM_ARCH=armv7
--  ;;
--esac
- dnl ========================================================
- dnl = Enable building the Thumb2 instruction set
- dnl ========================================================
-@@ -4668,66 +4662,35 @@
-     MOZ_THUMB2=1,
-     MOZ_THUMB2=)
- if test -n "$MOZ_THUMB2"; then
--  MOZ_ARM_ARCH=armv7
-+    AC_MSG_WARN([thumb2 enabled instead of autodetected -- hope you know what 
you are doing])
-+else
-+    AC_MSG_CHECKING([for thumb2 support in arm architecture])
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    AC_TRY_LINK([int ac_test(int i) { return i; }],[asm(".syntax 
unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1;],
-+      [MOZ_THUMB2=1
-+        AC_MSG_RESULT([yes])],
-+      [MOZ_THUMB2=
-+        AC_MSG_RESULT([no])])
-+    AC_LANG_RESTORE
- fi
- 
- dnl ========================================================
- dnl = Enable building for ARM specific CPU features
- dnl ========================================================
--MOZ_ARG_WITH_STRING(cpu-arch,
--[  --with-cpu-arch=arch      Use specific arm architecture CPU features, 
default armv7],
--    MOZ_ARM_ARCH=$withval)
--
- if test -n "$MOZ_THUMB2"; then
-   case "$target_cpu" in
-     arm*)
--      if test "$MOZ_ARM_ARCH" != "armv7"; then
--        AC_MSG_ERROR([--enable-thumb2 is not compatible with 
cpu-arch=$MOZ_ARM_ARCH])
--      fi
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU 
toolchains])
-       fi
-     ;;
--    *)
--      AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU 
architectures])
--    ;;
--  esac
--elif test "$MOZ_ARM_ARCH" = "armv7"; then
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp 
$MOZ_ARM_VFP_FLAGS"
--      else
--        AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU 
toolchains])
--      fi
--    ;;
--    *)
--      AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU 
architectures])
--    ;;
--  esac
--else
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--      fi
--      ;;
-   esac
- fi
- 
- AC_SUBST(MOZ_THUMB2)
--AC_SUBST(MOZ_ARM_ARCH)
- 
- dnl ========================================================
- dnl =

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch 
b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
deleted file mode 100644
index 65d0a2d..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-filter_desc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/js/src/Makefile.in       2012-06-18 13:53:41.000000000 -0400
-+++ b/js/src/Makefile.in       2012-06-18 13:55:44.000000000 -0400
-@@ -965,10 +965,10 @@
- endif
- endif
- 
--install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
--      $(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
--      mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst 
$(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
-+install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) 
$(IMPORT_LIBRARY)
-+ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
-+      $(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) 
$(DESTDIR)$(libdir)
-+      mv -f $(DESTDIR)$(libdir)/$(filter-out 
%.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst 
$(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out
 %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
- endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
-

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch 
b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
deleted file mode 100644
index 847bf79..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
---- a/js/src/jsapi-tests/Makefile.in
-+++ b/js/src/jsapi-tests/Makefile.in
-@@ -55,17 +55,17 @@ CPPSRCS = \
-   testSameValue.cpp \
-   testDebugger.cpp \
-   testDefineGetterSetterNonEnumerable.cpp \
-   testExtendedEq.cpp \
-   $(NULL)
- 
- DEFINES         += -DEXPORT_JS_API
- 
--LIBS      = $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
-+LIBS      = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS)
- 
- LOCAL_INCLUDES += -I$(topsrcdir) -I..
- 
- ifdef _MSC_VER
- ifdef WINCE
- WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
- endif
- endif

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
deleted file mode 100644
index b38ada4..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-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="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.5-build.patch"
-       epatch "${FILESDIR}/${PN}-1.6-header.patch"
-       epatch "${FILESDIR}/${P}-threadsafe.diff"
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk"
-       fi
-}
-
-src_compile() {
-       use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-       tc-export CC LD AR
-       if use threadsafe; then
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" 
JS_THREADSAFE=1 \
-               || die "emake with threadsafe enabled failed";
-       else
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
-               || die "emake without threadsafe enabled failed";
-       fi
-}
-
-src_install() {
-       emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || 
die
-       dodoc ../jsd/README
-       dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
deleted file mode 100644
index 9fc6671..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-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="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="threadsafe unicode"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.5-build.patch"
-       epatch "${FILESDIR}/${PN}-1.6-header.patch"
-       epatch "${FILESDIR}/${P}-threadsafe.diff" \
-               "${FILESDIR}"/${P}-ldflags.patch
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk"
-       fi
-}
-
-src_compile() {
-       use unicode && append-flags "-DJS_C_STRINGS_ARE_UTF8"
-       tc-export CC LD AR
-       if use threadsafe; then
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" 
JS_THREADSAFE=1 \
-                       XLDFLAGS="$(raw-ldflags)" HOST_LDFLAGS="${LDFLAGS}" \
-                               || die "emake with threadsafe enabled failed";
-       else
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" 
XLDFLAGS="$(raw-ldflags)" \
-               HOST_LDFLAGS="${LDFLAGS}" || die "emake without threadsafe 
enabled failed";
-       fi
-}
-
-src_install() {
-       emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || 
die
-       dodoc ../jsd/README
-       dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
deleted file mode 100644
index 2a130bc..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs multilib
-
-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="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="threadsafe"
-
-S="${WORKDIR}/js/src"
-
-RDEPEND="threadsafe? ( dev-libs/nspr )"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PN}-1.5-build.patch"
-       epatch "${FILESDIR}/${PN}-1.6-header.patch"
-       epatch "${FILESDIR}/${P}-threadsafe.diff"
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -s "${S}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk"
-       fi
-}
-
-src_compile() {
-       tc-export CC LD AR
-       if use threadsafe; then
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" 
JS_THREADSAFE=1 \
-               || die "emake with threadsafe enabled failed";
-       else
-               emake -j1 -f Makefile.ref LIBDIR="$(get_libdir)" \
-               || die "emake without threadsafe enabled failed";
-       fi
-}
-
-src_install() {
-       emake -f Makefile.ref install DESTDIR="${D}" LIBDIR="$(get_libdir)" || 
die
-       dodoc ../jsd/README
-       dohtml README.html
-}

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild 
b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
deleted file mode 100644
index da38130..0000000
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit eutils toolchain-funcs multilib python-any-r1
-
-MY_PV="${PV}"
-MY_PV="${MY_PV/1.8.2/3.6}"
-DESCRIPTION="Stand-alone JavaScript C library"
-HOMEPAGE="http://www.mozilla.org/js/spidermonkey/";
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases";
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
-
-LICENSE="NPL-1.1"
-SLOT="0/mozjs"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE="threadsafe"
-
-S="${WORKDIR}/mozilla-1.9.2"
-BUILDDIR="${S}/js/src"
-
-RDEPEND="threadsafe? ( >=dev-libs/nspr-4.8.6 )"
-
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       app-arch/zip
-       virtual/pkgconfig"
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
-
-       epatch_user
-
-       if [[ ${CHOST} == *-freebsd* ]]; then
-               # Don't try to be smart, this does not work in cross-compile 
anyway
-               ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname 
-s)$(uname -r).mk"
-       fi
-}
-
-src_configure() {
-       cd "${BUILDDIR}" || die
-
-       local myconf
-
-       use threadsafe && myconf="${myconf} \
-               --with-system-nspr --enable-threadsafe"
-
-       # Disable no-print-directory
-       MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-       AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
-       LD="$(tc-getLD)" econf \
-               ${myconf}
-}
-
-src_compile() {
-       cd "${BUILDDIR}" || die
-       emake -j1
-}
-
-src_install() {
-       cd "${BUILDDIR}" || die
-       emake install DESTDIR="${D}"
-       dobin shell/js
-       dodoc ../jsd/README
-       dohtml README.html
-
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               # fixup install_name
-               install_name_tool -id 
"${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
-                       "${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
-       fi
-}

Reply via email to