gentoo resync : 30.05.2020

3 files changed, 91 insertions, 1 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 038fc9a4633f..a6e8eb21680d 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1,6 @@
 AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
 DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
+DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
 EBUILD cjs-4.0.0-r1.ebuild 2035 BLAKE2B 98606c8974acd3162c3519d6729ba5f2cd718afaacccedabe70e249ff01d49cd8d0d23783f1b443ef1713c732bd12a9b2478cac48de3fb4ba578c0b38ac3df2d SHA512 14e993aa9c7f57ff34d69e12ac0f9eddf6fe49bddda21cef80125ca5823d44d40ca12d71b635dec5f4c50ada953d3748fe843eb91272c6cb549793513b5021e0
-MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
+EBUILD cjs-4.4.0.ebuild 1844 BLAKE2B bb1da618ac42aeb96813eee02024e9ee190a2eb958c6adf6f06677c61560c4bac81dcd3e418486e700f5eb6acae998ee949b77ee65c1c13f9d6c093723cc61d6 SHA512 c150c1e2fe3b7629cc4e01663967adeca6035a5219326bd7ccb306be2aca20e30cf18ce16420dd093c95c56178b3ddebc7f75319bf723c2821263058a8fa686d
+MISC metadata.xml 565 BLAKE2B f6539f17247ac5dda8a38c3514521a60ef0e4340483fcf124b0f06965d83060543c2b3351c72d50903c6eedc20ea9cd671ab6eb5fb4f20b748b02342d60d8834 SHA512 720cba6409d0c9f3a54e16a48b5409de021ce63be5daddf7e59dc81e91d4b28bdc3e78e541c668b6129c6f9ef4183303abf05b0f0d9a384588ebc23523b3541f
diff --git a/gnome-extra/cjs/cjs-4.4.0.ebuild b/gnome-extra/cjs/cjs-4.4.0.ebuild
new file mode 100644
index 000000000000..4bd638f43d71
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 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="https://projects.linuxmint.com/cinnamon/"
+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.42:2
+	>=dev-libs/gobject-introspection-1.41.4:=
+	sys-libs/readline:0=
+	dev-libs/libffi:0=
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	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
+
+	# Fixed in 4.6.0
+	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+	# Fixed in 4.6.0
+	sed -ie "s/40000/50000/g" \
+		"${S}"/installed-tests/js/testSystem.js || die
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.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
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
index 9e988588122b..bbfdb56cdcf9 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -5,6 +5,14 @@
 		<email>cinnamon@gentoo.org</email>
 		<name>Cinnamon Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/cjs</remote-id>
 	</upstream>