[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/

[Matt Turner]

commit:     86c5c46f091e2388b1296cd13a4c2c1765724cea
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 18:59:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:04:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c5c46f

gnome-extra/cjs: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-extra/cjs/Manifest                           |  1 -
 gnome-extra/cjs/cjs-4.0.0-r1.ebuild                | 81 ----------------------
 ...for-System.version-to-be-this-restrictive.patch | 25 -------
 3 files changed, 107 deletions(-)

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index d92711189f4..f2f15f9f62c 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,2 +1 @@
-DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
 DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2

diff --git a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
deleted file mode 100644
index 4296fe82db8..00000000000
--- a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 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://developer.linuxmint.com/projects/cinnamon-projects.html"
-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:0=
-	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"
-}

diff --git a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
deleted file mode 100644
index 40be11981ed..00000000000
--- a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@××××××××××××××××.com>
-Date: Mon, 2 Apr 2018 19:27:35 +0200
-Subject: [PATCH] No reason for System.version to be this restrictive
-
----
- installed-tests/js/testSystem.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
-index 1211de4..d205595 100644
---- a/installed-tests/js/testSystem.js
-+++ b/installed-tests/js/testSystem.js
-@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
- describe('System.version', function () {
-     it('gives a plausible number', function () {
-         expect(System.version).not.toBeLessThan(14700);
--        expect(System.version).toBeLessThan(20000);
-+        expect(System.version).toBeLessThan(32000);
-     });
- });
- 
--- 
-2.16.1
-