gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 84 deletions

diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 4f17c65738eb..1803504bb4e6 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,3 @@
-DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
 DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
-EBUILD cjs-4.4.0.ebuild 1844 BLAKE2B bb1da618ac42aeb96813eee02024e9ee190a2eb958c6adf6f06677c61560c4bac81dcd3e418486e700f5eb6acae998ee949b77ee65c1c13f9d6c093723cc61d6 SHA512 c150c1e2fe3b7629cc4e01663967adeca6035a5219326bd7ccb306be2aca20e30cf18ce16420dd093c95c56178b3ddebc7f75319bf723c2821263058a8fa686d
-EBUILD cjs-4.6.0.ebuild 1695 BLAKE2B 51745b5d618e91e8afd2f044dfaf2decb89068173c0534496933990697ca44ecfdcf126a1001aa3b98ee8bd1e42715f61ee8f386d3640587dc24c169049aeb7c SHA512 198ec71a6eb2e0a742c810a234df890ac832c3a68f9922672e948628ae508fd27b0320a18ef593f334e9a9ffa1215ac6e3b5e311612decf3c803ac84af6aa010
+EBUILD cjs-4.6.0.ebuild 1694 BLAKE2B 4f6075af2c26b2a3421e358e12907bf67daf6c6aca9fc139b48de52cdd09393fe5e0b23bfd11315385282215eb01a4fc122f2cdfc660b47d6f590a4c9550b704 SHA512 34557f9154df97fffd1f14be1b7e1f1e9adcb508cb08b7922b9a64e38f71373aa31041573667372e4f44bb86708409a1bb92a1453a67acdcae7b70a4bd4152c8
 MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
diff --git a/gnome-extra/cjs/cjs-4.4.0.ebuild b/gnome-extra/cjs/cjs-4.4.0.ebuild
deleted file mode 100644
index 4bd638f43d71..000000000000
--- a/gnome-extra/cjs/cjs-4.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
index 2173b520a753..a83515a191b1 100644
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ b/gnome-extra/cjs/cjs-4.6.0.ebuild
@@ -11,7 +11,7 @@ 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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 RESTRICT="test"
 
 RDEPEND="