Patch to fix the entire tree for spidermonkey-1.8.5 slotting

185-slot.patch (text/plain), 15.07 KB, created by Ian Stakenvicius (RETIRED) on 2011-08-26 19:24:05 UTC

diff -ur /usr/portage/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild app-accessibility/edbrowse/edbrowse-3.4.7.ebuild
--- /usr/portage/app-accessibility/edbrowse/edbrowse-3.4.7.ebuild	2011-05-16 12:31:01.000000000 +0000
+++ app-accessibility/edbrowse/edbrowse-3.4.7.ebuild	2011-08-26 18:42:41.000000000 +0000
@@ -12,7 +12,7 @@
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="linguas_fr odbc"
-COMMON_DEPEND="dev-lang/spidermonkey
+COMMON_DEPEND="<dev-lang/spidermonkey-1.8.5
 	>=sys-libs/readline-6.0
 	>=net-misc/curl-7.17.0
 	>=dev-libs/libpcre-7.8
@@ -29,7 +29,7 @@
 src_compile() {
 	local JSLIB=-ljs
 
-	if has_version ">=dev-lang/spidermonkey-1.9"; then
+	if has_version "=dev-lang/spidermonkey-1.8*"; then
 		JSLIB=-lmozjs
 	fi
 
diff -ur /usr/portage/dev-db/couchdb/couchdb-1.0.2.ebuild dev-db/couchdb/couchdb-1.0.2.ebuild
--- /usr/portage/dev-db/couchdb/couchdb-1.0.2.ebuild	2011-02-11 00:01:06.000000000 +0000
+++ dev-db/couchdb/couchdb-1.0.2.ebuild	2011-08-26 18:43:19.000000000 +0000
@@ -19,7 +19,7 @@
 		dev-lang/erlang[ssl]
 		>=dev-libs/openssl-0.9.8j
 		>=net-misc/curl-7.18.2
-		dev-lang/spidermonkey"
+		<dev-lang/spidermonkey-1.8.5"
 
 DEPEND="${RDEPEND}"
 
diff -ur /usr/portage/dev-db/couchdb/couchdb-1.1.0.ebuild dev-db/couchdb/couchdb-1.1.0.ebuild
--- /usr/portage/dev-db/couchdb/couchdb-1.1.0.ebuild	2011-06-06 12:53:05.000000000 +0000
+++ dev-db/couchdb/couchdb-1.1.0.ebuild	2011-08-26 18:43:03.000000000 +0000
@@ -19,7 +19,7 @@
 		dev-lang/erlang[ssl]
 		>=dev-libs/openssl-0.9.8j
 		>=net-misc/curl-7.18.2
-		dev-lang/spidermonkey"
+		<dev-lang/spidermonkey-1.8.5"
 
 DEPEND="${RDEPEND}"
 
diff -ur /usr/portage/dev-db/mongodb/mongodb-1.6.5-r1.ebuild dev-db/mongodb/mongodb-1.6.5-r1.ebuild
--- /usr/portage/dev-db/mongodb/mongodb-1.6.5-r1.ebuild	2011-06-22 05:31:06.000000000 +0000
+++ dev-db/mongodb/mongodb-1.6.5-r1.ebuild	2011-08-26 17:59:47.000000000 +0000
@@ -18,7 +18,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8:0 )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
diff -ur /usr/portage/dev-db/mongodb/mongodb-1.8.2-r1.ebuild dev-db/mongodb/mongodb-1.8.2-r1.ebuild
--- /usr/portage/dev-db/mongodb/mongodb-1.8.2-r1.ebuild	2011-07-29 15:35:14.000000000 +0000
+++ dev-db/mongodb/mongodb-1.8.2-r1.ebuild	2011-08-26 18:00:05.000000000 +0000
@@ -18,7 +18,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8:0 )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
diff -ur /usr/portage/dev-db/mongodb/mongodb-1.8.2.ebuild dev-db/mongodb/mongodb-1.8.2.ebuild
--- /usr/portage/dev-db/mongodb/mongodb-1.8.2.ebuild	2011-06-22 17:26:09.000000000 +0000
+++ dev-db/mongodb/mongodb-1.8.2.ebuild	2011-08-26 18:00:12.000000000 +0000
@@ -18,7 +18,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8:0 )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
diff -ur /usr/portage/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild dev-db/mongodb/mongodb-1.8.2_rc3.ebuild
--- /usr/portage/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild	2011-06-22 05:31:06.000000000 +0000
+++ dev-db/mongodb/mongodb-1.8.2_rc3.ebuild	2011-08-26 18:00:17.000000000 +0000
@@ -18,7 +18,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8:0 )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
diff -ur /usr/portage/dev-games/crystalspace/crystalspace-1.2.1.ebuild dev-games/crystalspace/crystalspace-1.2.1.ebuild
--- /usr/portage/dev-games/crystalspace/crystalspace-1.2.1.ebuild	2011-07-20 13:31:06.000000000 +0000
+++ dev-games/crystalspace/crystalspace-1.2.1.ebuild	2011-08-26 18:00:57.000000000 +0000
@@ -30,7 +30,6 @@
 	png? ( media-libs/libpng )
 	wxwidgets? ( x11-libs/pango
 		=x11-libs/wxGTK-2.6* )
-	javascript? ( dev-lang/spidermonkey )
 	cegui? ( >=dev-games/cegui-0.5.0 )
 	x11-libs/libXaw
 	x11-libs/libXxf86vm"
@@ -87,7 +86,6 @@
 		$(use_with wxwidgets wx) \
 		$(use_with cegui CEGUI) \
 		$(use_with cg Cg) \
-		$(use_with javascript js) \
 		$(use_with alsa asound)
 	#remove unwanted CFLAGS added by ./configure
 	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
diff -ur /usr/portage/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild
--- /usr/portage/dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild	2011-07-03 06:01:07.000000000 +0000
+++ dev-lang/spidermonkey/spidermonkey-1.8.5.ebuild	2011-08-26 15:53:38.000000000 +0000
@@ -14,7 +14,7 @@
 SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 
 LICENSE="NPL-1.1"
-SLOT="0"
+SLOT="185"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="static-libs test"
 
@@ -46,8 +46,11 @@
 src_configure() {
 	cd "${BUILDDIR}"
 
+	# Added the --includedir to support slotting, note that includes will install to
+	# subdir 'js' which supports code that uses "#include <js/header.h>"
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" \
 	econf \
+		--includedir=/usr/include/mozjs185 \
 		--enable-jemalloc \
 		--enable-readline \
 		--enable-threadsafe \
@@ -77,4 +80,12 @@
 		# They're used by the tests and in a few other places
 		find "${D}" -iname '*.a' -delete || die
 	fi
+
+	# New slot support:
+	# rename the js-config tool to js185-config, just so it sticks around.
+	# (pkg-config is the recommended config-detection method now so it won't be used)
+	mv "${D}"/usr/bin/js-config "${D}"/usr/bin/js185-config ||die "could not rename js-config"
+	ewarn "The js-config utility has been renamed  to js185-config to support slotting."
+	elog "The recommended means to obtain build settings is now via pkg-config:"
+	elog "\tpkg-config {--cflags,--libs} mozjs185"
 }
Only in dev-libs/gjs/files: gjs-0.7.14-add-mozjs185-to-config.patch
diff -ur /usr/portage/dev-libs/gjs/gjs-0.7.14.ebuild dev-libs/gjs/gjs-0.7.14.ebuild
--- /usr/portage/dev-libs/gjs/gjs-0.7.14.ebuild	2011-05-01 15:42:03.000000000 +0000
+++ dev-libs/gjs/gjs-0.7.14.ebuild	2011-08-26 18:35:19.000000000 +0000
@@ -21,16 +21,14 @@
 # FIXME: https://bugzilla.mozilla.org/show_bug.cgi?id=628723 instead of libxul
 RDEPEND=">=dev-libs/glib-2.18:2
 	>=dev-libs/gobject-introspection-0.10.1
-	>=net-libs/xulrunner-2.0:1.9
+	>=dev-lang/spidermonkey-1.8.5
 
 	dev-libs/dbus-glib
 	sys-libs/readline
 	x11-libs/cairo"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	!dev-lang/spidermonkey"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey installed
+	>=dev-util/pkgconfig-0.9"
 
 src_prepare() {
 	# AUTHORS, ChangeLog are empty
@@ -44,6 +42,8 @@
 
 	# https://bugs.gentoo.org/353941
 	epatch "${FILESDIR}/${PN}-drop-js-config.patch"
+	# port mozjs185 detection from configure.ac in gjs-1.29.0
+	epatch "${FILESDIR}/${P}-add-mozjs185-to-config.patch"
 
 	eautoreconf
 
diff -ur /usr/portage/dev-libs/gjs/gjs-1.29.0.ebuild dev-libs/gjs/gjs-1.29.0.ebuild
--- /usr/portage/dev-libs/gjs/gjs-1.29.0.ebuild	2011-06-14 13:19:59.000000000 +0000
+++ dev-libs/gjs/gjs-1.29.0.ebuild	2011-08-26 18:04:13.000000000 +0000
@@ -25,12 +25,10 @@
 	dev-libs/dbus-glib
 	sys-libs/readline
 	x11-libs/cairo
-	>=net-libs/xulrunner-2.0:1.9"
+	>=dev-lang/spidermonkey-1.8.5"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	!dev-lang/spidermonkey"
-# HACK HACK: gjs-tests picks up /usr/lib/libmozjs.so with spidermonkey installed
+	>=dev-util/pkgconfig-0.9"
 
 src_prepare() {
 	# AUTHORS, ChangeLog are empty
diff -ur /usr/portage/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.20.ebuild dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.20.ebuild
--- /usr/portage/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.20.ebuild	2010-05-31 08:16:42.000000000 +0000
+++ dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.20.ebuild	2011-08-26 18:43:55.000000000 +0000
@@ -15,7 +15,7 @@
 IUSE=""
 
 RDEPEND="dev-perl/Log-Log4perl
-	>=dev-lang/spidermonkey-1.5"
+	<dev-lang/spidermonkey-1.8.5"
 DEPEND="${RDEPEND}"
 
 SRC_TEST=do
diff -ur /usr/portage/media-libs/coin/coin-3.1.0.ebuild media-libs/coin/coin-3.1.0.ebuild
--- /usr/portage/media-libs/coin/coin-3.1.0.ebuild	2011-01-13 01:01:08.000000000 +0000
+++ media-libs/coin/coin-3.1.0.ebuild	2011-08-26 18:44:36.000000000 +0000
@@ -29,7 +29,7 @@
 	x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( <dev-lang/spidermonkey-1.8.5 )
 	openal? ( media-libs/openal )"
 
 DEPEND="${RDEPEND}
diff -ur /usr/portage/media-libs/coin/coin-3.1.3-r1.ebuild media-libs/coin/coin-3.1.3-r1.ebuild
--- /usr/portage/media-libs/coin/coin-3.1.3-r1.ebuild	2011-01-13 01:01:08.000000000 +0000
+++ media-libs/coin/coin-3.1.3-r1.ebuild	2011-08-26 18:44:44.000000000 +0000
@@ -30,7 +30,7 @@
 	x11-libs/libX11
 	x11-libs/libXext
 	bzip2? ( app-arch/bzip2 )
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( <dev-lang/spidermonkey-1.8.5 )
 	openal? ( media-libs/openal )
 	simage? ( media-libs/simage )
 	zlib? ( sys-libs/zlib )
diff -ur /usr/portage/media-video/gpac/gpac-0.4.5-r1.ebuild media-video/gpac/gpac-0.4.5-r1.ebuild
--- /usr/portage/media-video/gpac/gpac-0.4.5-r1.ebuild	2011-04-17 20:01:18.000000000 +0000
+++ media-video/gpac/gpac-0.4.5-r1.ebuild	2011-08-26 18:40:48.000000000 +0000
@@ -26,7 +26,7 @@
 	ffmpeg? ( virtual/ffmpeg )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg )
-	javascript? ( >=dev-lang/spidermonkey-1.5 )
+	javascript? ( <dev-lang/spidermonkey-1.8 )
 	mad? ( >=media-libs/libmad-0.15.1b )
 	opengl? ( virtual/opengl media-libs/freeglut )
 	ogg? ( >=media-libs/libogg-1.1 )
diff -ur /usr/portage/media-video/gpac/gpac-0.4.5-r4.ebuild media-video/gpac/gpac-0.4.5-r4.ebuild
--- /usr/portage/media-video/gpac/gpac-0.4.5-r4.ebuild	2011-07-24 18:31:19.000000000 +0000
+++ media-video/gpac/gpac-0.4.5-r4.ebuild	2011-08-26 18:41:17.000000000 +0000
@@ -26,7 +26,7 @@
 	ffmpeg? ( virtual/ffmpeg )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg )
-	javascript? ( >=dev-lang/spidermonkey-1.5 )
+	javascript? ( <dev-lang/spidermonkey-1.8.5 )
 	mad? ( >=media-libs/libmad-0.15.1b )
 	opengl? ( virtual/opengl media-libs/freeglut )
 	>=media-libs/libogg-1.1
diff -ur /usr/portage/media-video/gxine/gxine-0.5.905-r1.ebuild media-video/gxine/gxine-0.5.905-r1.ebuild
--- /usr/portage/media-video/gxine/gxine-0.5.905-r1.ebuild	2011-06-22 02:31:32.000000000 +0000
+++ media-video/gxine/gxine-0.5.905-r1.ebuild	2011-08-26 18:41:52.000000000 +0000
@@ -18,7 +18,7 @@
 	>=x11-libs/gtk+-2.8:2
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/pango-1.12
-	>=dev-lang/spidermonkey-1.8.2.13
+	>=dev-lang/spidermonkey-1.8.2.13:0
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff -ur /usr/portage/net-misc/mediatomb/mediatomb-0.12.1.ebuild net-misc/mediatomb/mediatomb-0.12.1.ebuild
--- /usr/portage/net-misc/mediatomb/mediatomb-0.12.1.ebuild	2011-04-04 12:31:20.000000000 +0000
+++ net-misc/mediatomb/mediatomb-0.12.1.ebuild	2011-08-26 18:45:07.000000000 +0000
@@ -17,7 +17,7 @@
 DEPEND="
 	mysql? ( virtual/mysql )
 	!mysql? ( >=dev-db/sqlite-3 )
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( <dev-lang/spidermonkey-1.8.5 )
 	dev-libs/expat
 	taglib? ( media-libs/taglib )
 	!taglib? ( media-libs/id3lib )
diff -ur /usr/portage/net-misc/plowshare/plowshare-0.9.3.ebuild net-misc/plowshare/plowshare-0.9.3.ebuild
--- /usr/portage/net-misc/plowshare/plowshare-0.9.3.ebuild	2010-11-20 11:54:33.000000000 +0000
+++ net-misc/plowshare/plowshare-0.9.3.ebuild	2011-08-26 18:52:18.000000000 +0000
@@ -11,10 +11,10 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="examples +javascript +perl view-captcha"
+IUSE="examples javascript +perl view-captcha"
 
 RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( =dev-lang/spidermonkey-1.7* )
 	perl? ( dev-lang/perl
 		media-gfx/imagemagick[perl] )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
@@ -30,6 +30,7 @@
 # spidermonkey dep should be any javascript interpreter using /usr/bin/js
 
 # TODO:
+# spidermonkey >= 1.8 does not provide /usr/bin/js anymore
 # dev-java/rhino could probably be an alternative for spidermonkey
 
 src_prepare() {
diff -ur /usr/portage/net-misc/plowshare/plowshare-0.9.4.ebuild net-misc/plowshare/plowshare-0.9.4.ebuild
--- /usr/portage/net-misc/plowshare/plowshare-0.9.4.ebuild	2011-03-06 22:59:05.000000000 +0000
+++ net-misc/plowshare/plowshare-0.9.4.ebuild	2011-08-26 18:52:48.000000000 +0000
@@ -11,10 +11,10 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="examples +javascript +perl view-captcha"
+IUSE="examples javascript +perl view-captcha"
 
 RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( =dev-lang/spidermonkey-1.7* )
 	perl? ( dev-lang/perl
 		media-gfx/imagemagick[perl] )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
@@ -30,6 +30,7 @@
 # spidermonkey dep should be any javascript interpreter using /usr/bin/js
 
 # TODO:
+# spidermonkey >= 1.8 does not provide /usr/bin/js anymore, need an alternative
 # dev-java/rhino could probably be an alternative for spidermonkey
 
 src_prepare() {
diff -ur /usr/portage/net-misc/plowshare/plowshare-1327.ebuild net-misc/plowshare/plowshare-1327.ebuild
--- /usr/portage/net-misc/plowshare/plowshare-1327.ebuild	2011-04-10 07:31:20.000000000 +0000
+++ net-misc/plowshare/plowshare-1327.ebuild	2011-08-26 18:53:08.000000000 +0000
@@ -13,10 +13,10 @@
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+javascript +perl scripts view-captcha"
+IUSE="javascript +perl scripts view-captcha"
 
 RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
+	javascript? ( =dev-lang/spidermonkey-1.7* )
 	perl? ( dev-lang/perl
 		media-gfx/imagemagick[perl] )
 	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
@@ -34,6 +34,7 @@
 # spidermonkey dep should be any javascript interpreter using /usr/bin/js
 
 # TODO:
+# spidermonkey >= 1.8 does not provide /usr/bin/js anymore, need an alternative
 # dev-java/rhino could probably be an alternative for spidermonkey
 
 src_prepare() {
--- /usr/portage/profiles/package.mask	2011-08-22 18:31:23.000000000 +0000
+++ profiles/package.mask	2011-08-26 18:58:43.000000000 +0000
@@ -368,10 +368,6 @@
 =sys-apps/pcsc-lite-1.7.4
 =app-crypt/ccid-1.4.4
 
-# Nirbheek Chauhan <[e-mail]> (03 Jul 2011)
-# Mask js185 release, changes pkgconfig file, soname, etc
->=dev-lang/spidermonkey-1.8.5
-
 # Pacho Ramos <[e-mail]> (29 Jun 2011)
 # Mask for removal in 30 days x11-libs/gtksourceview:1.0
 # and reverse dependencies, bug #354241
diff -ur /usr/portage/www-client/elinks/elinks-0.12_pre5-r1.ebuild www-client/elinks/elinks-0.12_pre5-r1.ebuild
--- /usr/portage/www-client/elinks/elinks-0.12_pre5-r1.ebuild	2011-06-22 03:01:27.000000000 +0000
+++ www-client/elinks/elinks-0.12_pre5-r1.ebuild	2011-08-26 18:56:04.000000000 +0000
@@ -54,7 +54,7 @@
 	epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
 	epatch "${FILESDIR}"/elinks-0.12_pre5-compilation-fix.patch
 
-	if use javascript && has_version ">=dev-lang/spidermonkey-1.8"; then
+	if use javascript && has_version ">=dev-lang/spidermonkey-1.8:0"; then
 		epatch "${FILESDIR}"/elinks-0.12pre5-spidermonkey-callback.patch
 	fi