Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/, gnome-extra/cjs/files/
Date: Wed, 20 Oct 2021 01:14:36
Message-Id: 1634692287.f47851ed3165774f16b09971cefeb16624e12631.sam@gentoo
1 commit: f47851ed3165774f16b09971cefeb16624e12631
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Mon Oct 18 01:43:34 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 20 01:11:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47851ed
7
8 gnome-extra/cjs: Remove old
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 gnome-extra/cjs/Manifest | 1 -
15 gnome-extra/cjs/cjs-5.0.0-r1.ebuild | 77 --------------------------
16 gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch | 24 --------
17 3 files changed, 102 deletions(-)
18
19 diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
20 index 13dff339526..455a88ca7b7 100644
21 --- a/gnome-extra/cjs/Manifest
22 +++ b/gnome-extra/cjs/Manifest
23 @@ -1,3 +1,2 @@
24 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
25 -DIST cjs-5.0.0.tar.gz 601928 BLAKE2B b8d4e64472eefe15678fd2ebcd270161b779e5081b1f9fdff61c4410fdef601cff9bc948b423308059aa73de0b960d430711e8741c10511f758b41da8d96892f SHA512 32524de39e17ffc3e70f83188aed5d6bcb39e9ac4d4a1aa980a1f45dfc7970c103868f270775fcd290de0a6c70035b61b04dc575c6bcc1375972aaa0abdd8e59
26 DIST cjs-5.0.1.tar.gz 602005 BLAKE2B 7592b5b0be8fed1efc9fe1c7baca081515b8010935e24ba0cb1e30ce78890941f5c3b2384ee3846a02c3ba5a50c6d6ce5df232f02507743cf15ac089e29d7f23 SHA512 a341e8deae33baf51ed21ea0b03484ba459d83be8689f3928acbd286ebe878719cdd6b4c576907b08b117b3c5738a11f95d0e37ae21f94ae6b88631fad5d3375
27
28 diff --git a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
29 deleted file mode 100644
30 index 1cd6bfb71f4..00000000000
31 --- a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
32 +++ /dev/null
33 @@ -1,77 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7,8,9} )
40 -
41 -inherit meson pax-utils python-any-r1 virtualx
42 -
43 -DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
44 -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
45 -SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
48 -SLOT="0"
49 -IUSE="+cairo examples gtk readline sysprof test"
50 -KEYWORDS="~amd64 ~arm64 ~x86"
51 -
52 -RDEPEND="
53 - dev-lang/spidermonkey:78
54 - >=dev-libs/glib-2.58.0:2
55 - >=dev-libs/gobject-introspection-1.58.3:=
56 - >=dev-libs/libffi-3.2.1:0=
57 -
58 - cairo? ( x11-libs/cairo[glib,X] )
59 - readline? ( sys-libs/readline:0= )
60 -"
61 -DEPEND="
62 - ${RDEPEND}
63 - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
64 - test? (
65 - sys-apps/dbus
66 -
67 - gtk? ( x11-libs/gtk+:3[introspection] )
68 - )
69 -"
70 -BDEPEND="
71 - ${PYTHON_DEPS}
72 - virtual/pkgconfig
73 -"
74 -
75 -PATCHES=(
76 - "${FILESDIR}/${PN}-5.0.0-fix-test.patch"
77 -)
78 -
79 -src_prepare() {
80 - default
81 - python_fix_shebang build
82 -}
83 -
84 -src_configure() {
85 - local emesonargs=(
86 - $(meson_feature cairo)
87 - $(meson_feature readline)
88 - $(meson_feature sysprof profiler)
89 - -Dinstalled_tests=false
90 - $(meson_use !test skip_dbus_tests)
91 - $(meson_use !test skip_gtk_tests)
92 - )
93 - meson_src_configure
94 -}
95 -
96 -src_test() {
97 - virtx meson_src_test
98 -}
99 -
100 -src_install() {
101 - meson_src_install
102 -
103 - if use examples; then
104 - docinto examples
105 - dodoc "${S}"/examples/*
106 - fi
107 -
108 - # Required for cjs-console to run correctly on PaX systems
109 - pax-mark mr "${ED}/usr/bin/cjs-console"
110 -}
111
112 diff --git a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
113 deleted file mode 100644
114 index 347ca090782..00000000000
115 --- a/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
116 +++ /dev/null
117 @@ -1,24 +0,0 @@
118 -From ac2737f524b4d667a7700b8ff077cd603ee21c59 Mon Sep 17 00:00:00 2001
119 -From: Eli Schwartz <eschwartz@×××××××××.org>
120 -Date: Thu, 3 Jun 2021 05:21:51 -0400
121 -Subject: [PATCH] fix failing test checking for version number (#94)
122 -
123 ----
124 - installed-tests/js/testSystem.js | 4 ++--
125 - 1 file changed, 2 insertions(+), 2 deletions(-)
126 -
127 -diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
128 -index a4c098c0..8ae8c74a 100644
129 ---- a/installed-tests/js/testSystem.js
130 -+++ b/installed-tests/js/testSystem.js
131 -@@ -11,8 +11,8 @@ describe('System.addressOf()', function () {
132 -
133 - describe('System.version', function () {
134 - it('gives a plausible number', function () {
135 -- expect(System.version).not.toBeLessThan(14700);
136 -- expect(System.version).toBeLessThan(50000);
137 -+ expect(System.version).not.toBeLessThan(40802);
138 -+ expect(System.version).toBeLessThan(60000);
139 - });
140 - });
141 -