gentoo resync : 24.12.2018

4 files changed, 87 insertions, 4 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index eec94da5f89a..6768007356b6 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,6 +1,8 @@
 AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
 DIST cjs-3.8.0.tar.gz 446667 BLAKE2B d7d37d2aa47fb32b401727e2d5f7f6bd3779e62f5bdaf77501e0999bc7d74a14c5c9924702091d4b32dc7a572b5e920e2dcf19e50b048907f87993d8be392ea7 SHA512 7f776be2d4863ea7bb32e266efb0c5d5e0f86bab68bdabc1478e04809f8f887b4ff0853075baffa46055d347fc22c6252faefaceba750f61b0b21229f6130bd0
-EBUILD cjs-3.6.1.ebuild 2099 BLAKE2B 09dbb18fe6444150291372bdacac0a73ff6530e59f874cd2220df9a682f5af74beed4d632c6cd13c2abda6b571ef2cab4caef08111c8e3ba13e3d23e9ba37301 SHA512 9fc82a49feece084bb937045928ca3e1d33d2585bf9aaa822b4a9329e17179a3f71b3b7f83b263a5e36f3de3b1118aca81b20848dce04632ca9445d4987e7771
-EBUILD cjs-3.8.0.ebuild 2004 BLAKE2B 98c59a8043cecae98ee150751c842f8837332a12e8d400a0c98f3531e7e55a243cfe8a2e0528831b33c722e543d5740100f6d4ff009ab46ceaf890796589e1a8 SHA512 a7968e8750b66d75f7ac8d57eb3f77918054635c06caa19f1df3d2c30991e896b62069a1dcca2c6ded9a159d9484889adbd9f66db8f4113fce7432166049d488
+DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
+EBUILD cjs-3.6.1.ebuild 2096 BLAKE2B 5f2cc7c4517cc8c012075f2ff5ff0dba936699f5997e0cd3839fb17de6c0b8e5352c3bfdb3ce4dc00d86816352d7347c193a853b6c1a3e1741c310dc5b9dad1a SHA512 187d890fc87dfdbb36aabac71265949543c033ab650125782b806a9b2c1dae05cd9fae5316a4013d8fe20cfd6543dca2305f6634b1ab29dae26a175c6631e375
+EBUILD cjs-3.8.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
+EBUILD cjs-4.0.0.ebuild 2001 BLAKE2B f8aca1867ff72015b96331d882f31533656965f9758476622d1382dcf07bb8ea2831ef933bdcfd9fa01e8220538e1c87afe54bff54627aabafb6814f8a253303 SHA512 0ac840158afd4df20b43fc640fd4ed12ba2410e9b9817ab47e8fc293b291c6d46870993812bd3f2c3e2c7d399f8af41422431e166dd203702f2bfe312d5a4c82
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 8aea23c9840d..285c4c138814 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/gnome-extra/cjs/cjs-3.8.0.ebuild b/gnome-extra/cjs/cjs-3.8.0.ebuild
index dfb627aff795..c36285e11ef2 100644
--- a/gnome-extra/cjs/cjs-3.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/gnome-extra/cjs/cjs-4.0.0.ebuild b/gnome-extra/cjs/cjs-4.0.0.ebuild
new file mode 100644
index 000000000000..c36285e11ef2
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:52
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+	sed -ie "s/gjs-console/cjs-console/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh \
+		"${S}"/installed-tests/scripts/testWarnings.sh || die
+
+	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.js \
+		"${S}"/installed-tests/js/testSignals.js \
+		"${S}"/installed-tests/js/testGDBus.js \
+		"${S}"/installed-tests/js/testEverythingBasic.js || die
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}