commit: 0b3d20f023835f5c1f7c97a27c1e54c7bc5fefc6 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat May 26 11:24:05 2018 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat May 26 11:31:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3d20f0
gnome-extra/cjs: remove old Package-Manager: Portage-2.3.28, Repoman-2.3.9 gnome-extra/cjs/Manifest | 3 - gnome-extra/cjs/cjs-3.0.1.ebuild | 71 ---------------------- gnome-extra/cjs/cjs-3.4.1.ebuild | 67 -------------------- gnome-extra/cjs/cjs-3.4.4.ebuild | 67 -------------------- .../cjs/files/cjs-2.4.0-disable-unittest-1.patch | 48 --------------- .../cjs/files/cjs-2.4.0-disable-unittest-2.patch | 40 ------------ .../cjs/files/cjs-2.4.0-disable-unittest-3.patch | 35 ----------- 7 files changed, 331 deletions(-) diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest index 19cc1a015ba..c20b7157e77 100644 --- a/gnome-extra/cjs/Manifest +++ b/gnome-extra/cjs/Manifest @@ -1,4 +1 @@ -DIST cjs-3.0.1.tar.gz 325349 BLAKE2B 084713cb4b8b32fdcc21284af798016e6ad58bdb06b3960913c1721807d89bf55ff90e1a523fbc5cc9d456a176365770d5c75d3c25fddd38abc383f9bb9dcb3f SHA512 3980e60ca005e616be264ec5bf6cb920452eec538da266dc0645ec1c340506b864886007b371b96830efa379e8ed9dd9127dc205b45e004705fd5c181d82e538 -DIST cjs-3.4.1.tar.gz 425003 BLAKE2B 6910c6658ffeaf88e671a6fa6863aa7edc48c6f053170ca735faf4ce843146e3a2d593c37828a81e33a5ec332bdbf47167b5346e5aa06f4003993efd9e2e6b3f SHA512 aab752aa03862979374bfe883d62968efab6b9137914b7ab9fcca2025bab6a6ae536db59aaee6deeeba06d2ff8c433d7f769ae0a4c0e2542e7c9a58f723d8690 -DIST cjs-3.4.4.tar.gz 426665 BLAKE2B 18e232b446945ae296d1dcf4b4624ff10b733f023da99315ba9aeee72228e115a634eb7a31a7c6192c3d1bfb8af1cd89488a9e7fe81edfa3a729bd62061e3581 SHA512 318a1beef6f6a827266170f0c5c1cfaa8bf48908f96e0ce625aee20ddcd648ea967f09f465ed504f21f923830017d3c4a01f62bab26a1cb84181a96131058d33 DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155 diff --git a/gnome-extra/cjs/cjs-3.0.1.ebuild b/gnome-extra/cjs/cjs-3.0.1.ebuild deleted file mode 100644 index b56d402ca7a..00000000000 --- a/gnome-extra/cjs/cjs-3.0.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# 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:24 - >=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 ) -" -# Cinnamon 2.2 does not work with this release. -RDEPEND="${RDEPEND} - !<gnome-extra/cinnamon-2.4 -" - -src_prepare() { - # Disable broken unittests - eapply "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # FIXME: add systemtap/dtrace support, like in glib:2 - # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason - # XXX: Do NOT enable coverage, completely useless for portage installs - gnome2_src_configure \ - --disable-systemtap \ - --disable-dtrace \ - --disable-coverage \ - $(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/cjs-3.4.1.ebuild b/gnome-extra/cjs/cjs-3.4.1.ebuild deleted file mode 100644 index 23afc9055f7..00000000000 --- a/gnome-extra/cjs/cjs-3.4.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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:38 - >=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 -" - -src_prepare() { - eautoreconf - gnome2_src_prepare -} - -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/cjs-3.4.4.ebuild b/gnome-extra/cjs/cjs-3.4.4.ebuild deleted file mode 100644 index 23afc9055f7..00000000000 --- a/gnome-extra/cjs/cjs-3.4.4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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:38 - >=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 -" - -src_prepare() { - eautoreconf - gnome2_src_prepare -} - -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-2.4.0-disable-unittest-1.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch deleted file mode 100644 index 5afd8929369..00000000000 --- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" <[email protected]> -Date: Wed, 15 Jan 2014 17:00:22 -0500 -Subject: [PATCH] gjs-tests: Remove dumpstack test - -OK, I lied. This is the most useless test ever. ---- - test/gjs-tests.cpp | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp -index b79b616..6cade7b 100644 ---- a/test/gs-tests.cpp -+++ b/test/gjs-tests.cpp -@@ -163,22 +163,6 @@ gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void) - } - - static void --gjstest_test_func_gjs_stack_dump(void) --{ -- GjsContext *context; -- -- /* TODO this test could be better - maybe expose dumpstack as a JS API -- * so that we have a JS stack to dump? At least here we're getting some -- * coverage. -- */ -- context = gjs_context_new(); -- -- gjs_dumpstack(); -- g_object_unref(context); -- gjs_dumpstack(); --} -- --static void - gjstest_test_func_gjs_jsapi_util_error_throw(void) - { - GjsUnitTestFixture fixture; -@@ -348,7 +332,6 @@ main(int argc, - g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang); - g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang); - g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang); -- g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump); - g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null); - g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers); - --- -2.1.2 - diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch deleted file mode 100644 index 2490a63fea9..00000000000 --- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 12 Oct 2014 21:57:11 +0200 -Subject: [PATCH 1/2] Comment broken unittests - ---- - test/gjs-tests.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp -index 6cade7b..4d6c61e 100644 ---- a/test/gjs-tests.cpp -+++ b/test/gjs-tests.cpp -@@ -324,18 +324,18 @@ main(int argc, - - g_test_init(&argc, &argv, NULL); - -- g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); -+ /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */ - g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval); -- g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); -- g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); -- g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); -+ /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */ -+ /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */ -+ /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */ - g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang); - g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang); - g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang); - g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null); - g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers); - -- gjs_test_add_tests_for_coverage (); -+ /* gjs_test_add_tests_for_coverage (); */ - - g_test_run(); - --- -2.1.2 - diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch deleted file mode 100644 index 7b2898b75cf..00000000000 --- a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 12 Oct 2014 21:57:45 +0200 -Subject: [PATCH 2/2] Comment broken JS unittest - ---- - installed-tests/js/testLocale.js | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js -index b086a66..0c5abb1 100644 ---- a/installed-tests/js/testLocale.js -+++ b/installed-tests/js/testLocale.js -@@ -1,14 +1,14 @@ - // tests for JS_SetLocaleCallbacks(). - const JSUnit = imports.jsUnit; - --function testToLocaleDateString() { -- let date = new Date(); -+//function testToLocaleDateString() { -+ //let date = new Date(); - // %A is the weekday name, this tests locale_to_unicode - // we're basically just testing for a non-crash, since - // we'd have to run in a specific locale to have any - // idea about the result. -- date.toLocaleDateString("%A"); --} -+ //date.toLocaleDateString("%A"); -+//} - - function testToLocaleLowerCase() { - JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase()); --- -2.1.2 -
