summaryrefslogtreecommitdiff
path: root/dev-perl
diff options
context:
space:
mode:
Diffstat (limited to 'dev-perl')
-rw-r--r--dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild26
-rw-r--r--dev-perl/JavaScript-SpiderMonkey/Manifest5
-rw-r--r--dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch167
-rw-r--r--dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch486
-rw-r--r--dev-perl/JavaScript-SpiderMonkey/metadata.xml12
-rw-r--r--dev-perl/Manifest.gzbin282218 -> 282037 bytes
-rw-r--r--dev-perl/Tk-TableMatrix/Manifest5
-rw-r--r--dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild30
-rw-r--r--dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild32
-rw-r--r--dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch35
-rw-r--r--dev-perl/Tk-TableMatrix/files/pTk-1.22.patch18
11 files changed, 0 insertions, 816 deletions
diff --git a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild b/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild
deleted file mode 100644
index f706b2f4e578..000000000000
--- a/dev-perl/JavaScript-SpiderMonkey/JavaScript-SpiderMonkey-0.210.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TBUSCH
-MODULE_VERSION=${PV%0.0}
-inherit perl-module
-
-DESCRIPTION="Perl interface to the JavaScript Engine"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Log-Log4perl
- >=dev-lang/spidermonkey-1.5:0"
-DEPEND="${RDEPEND}
- dev-perl/ExtUtils-PkgConfig"
-
-PATCHES=(
- "${FILESDIR}/mozjs185.patch"
- "${FILESDIR}/${P}-no-dot-inc.patch"
-)
-
-SRC_TEST=do
diff --git a/dev-perl/JavaScript-SpiderMonkey/Manifest b/dev-perl/JavaScript-SpiderMonkey/Manifest
deleted file mode 100644
index 276900163cf4..000000000000
--- a/dev-perl/JavaScript-SpiderMonkey/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch 3235 BLAKE2B d8ca1dbc32b8e8d5f54e163c8e907f5704a8d5b1b98c0770ada74dd0995e7a948d325cbbc342b8beb29fcc7116d2de15384ebb40a80eb7766c21b7fbfd6fb157 SHA512 92c89a8e8c3e1a295ec40567b207c20f0c8f10bc36ef1327a97629da541bf924ff91bc4ff6d3d82c54a4889f3571b4f6f6d56a1dabdb81629f6b72293384cd2b
-AUX mozjs185.patch 14890 BLAKE2B e597509512bfda2cfa9b17a8c03b8842b472f884bdc6d4eddebbab446d61366d5c18e147756095444e0d8e59fb405ee2625108bd8f2f07ca8f9e605e364c0359 SHA512 23c111d840b59fd6663dd642c2fa17a1abba719b0bc797de06f002c8f7e53f83d2ad3d4eba0923adb0f42c57abfce8d3e35b22e725c0857b319c79a392b9e2f9
-DIST JavaScript-SpiderMonkey-0.21.tar.gz 19494 BLAKE2B 842769d02b04d489b9fac446b0ec24ba7feca6c0206ca0927528af81bc464ab31c0b617635f060fa4a0e230da13901306192dfdf99db1f442ea84af33997e778 SHA512 5a1e26d8ee15c73a566715ac150ac597e6bbf542629bf1884ae623478ed6dd1085b4afc02ab6a152c7407239ba46a9d30f9472fc6375fab823815b38372fb1ec
-EBUILD JavaScript-SpiderMonkey-0.210.0-r1.ebuild 489 BLAKE2B a491ea36aefbefdbdb5bc7f39d7c27b35d9aaac5aadc64885e71aafc86359e28cf3f6593845fb10d29c3642e0e7e0122aa03201ec1d986bec531dbd359abfcc8 SHA512 661bb5146d328d5d1ebde3856e2982b981e9f4013a9c3b629ef77c13015aad446c57cfecba0a1a512de1d5c1da614d86e7a37838f41bb159f6ba99378cef25be
-MISC metadata.xml 419 BLAKE2B 929db94111387a7cb6cf45f16c4af3657d6c96ea517b45a9509095cf5af76ccdd7677f77d347dcddaf7f4f7b42699e5f7bae23a58bec3f77435a09b21a07101a SHA512 6be0ca9d093d193de056c02d0e9260550eeb7e48430d5e70144befcb8e543f12eb5f179d213fbd1d95eb3f4676116626a83a45a9f1863e73b4ba2628fd0c2cf5
diff --git a/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch b/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch
deleted file mode 100644
index f76aaa95a1ce..000000000000
--- a/dev-perl/JavaScript-SpiderMonkey/files/JavaScript-SpiderMonkey-0.210.0-no-dot-inc.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From c89a871ead0a961f8a0125d875cbe28974e23f29 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Thu, 26 Oct 2017 18:50:34 +1300
-Subject: Fix test failures without '.' in @INC
-
-Bug: https://bugs.gentoo.org/617006
-Bug: https://rt.cpan.org/Ticket/Display.html?id=121452
----
- t/00array.t | 2 +-
- t/01doc-href.t | 2 +-
- t/02nav-appv.t | 2 +-
- t/03doc-write.t | 2 +-
- t/04loop.t | 2 +-
- t/05form.t | 2 +-
- t/06form2.t | 2 +-
- t/07func.t | 2 +-
- t/08func2.t | 2 +-
- t/09meth.t | 2 +-
- t/10elobj.t | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/t/00array.t b/t/00array.t
-index 3bd85a6..ba36807 100755
---- a/t/00array.t
-+++ b/t/00array.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- $js->array_by_path("document.form");
-
-diff --git a/t/01doc-href.t b/t/01doc-href.t
-index 7f79c95..c545ca7 100755
---- a/t/01doc-href.t
-+++ b/t/01doc-href.t
-@@ -6,7 +6,7 @@ print "1..1\n";
-
- $init = "";
-
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/02nav-appv.t b/t/02nav-appv.t
-index d038f3e..2e0d7f6 100755
---- a/t/02nav-appv.t
-+++ b/t/02nav-appv.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/03doc-write.t b/t/03doc-write.t
-index 9b38e21..f757592 100755
---- a/t/03doc-write.t
-+++ b/t/03doc-write.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/04loop.t b/t/04loop.t
-index 3757c1d..768067a 100755
---- a/t/04loop.t
-+++ b/t/04loop.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/05form.t b/t/05form.t
-index 0dc763a..3212d05 100755
---- a/t/05form.t
-+++ b/t/05form.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/06form2.t b/t/06form2.t
-index 9aacb7a..fdf1bd2 100755
---- a/t/06form2.t
-+++ b/t/06form2.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $a = $js->array_by_path("document.array");
- my $e = $js->array_set_element($a, 0, "gurkenhobel");
-diff --git a/t/07func.t b/t/07func.t
-index c0f95cc..9b12633 100644
---- a/t/07func.t
-+++ b/t/07func.t
-@@ -6,7 +6,7 @@ print "1..1\n";
-
- $init = "";
- $buffer = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- my $source = <<EOT;
- $init
-diff --git a/t/08func2.t b/t/08func2.t
-index 6b49ef7..95c7749 100644
---- a/t/08func2.t
-+++ b/t/08func2.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- $args = "";
-
-diff --git a/t/09meth.t b/t/09meth.t
-index 4b5da81..2b86a9c 100644
---- a/t/09meth.t
-+++ b/t/09meth.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- $args = "";
-
-diff --git a/t/10elobj.t b/t/10elobj.t
-index d4eca5c..2c097b9 100644
---- a/t/10elobj.t
-+++ b/t/10elobj.t
-@@ -5,7 +5,7 @@
- print "1..1\n";
-
- $init = "";
--require "t/init.pl";
-+require "./t/init.pl";
-
- $submitted = "0";
-
---
-2.14.3
-
diff --git a/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch b/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch
deleted file mode 100644
index 788a523b8c8b..000000000000
--- a/dev-perl/JavaScript-SpiderMonkey/files/mozjs185.patch
+++ /dev/null
@@ -1,486 +0,0 @@
-From 9c0fbdce2ee643c23b3be8fa391b779fc6afbab3 Mon Sep 17 00:00:00 2001
-From: Ian Stakenvicius <axs@gentoo.org>
-Date: Fri, 12 Oct 2012 08:09:57 +1300
-Subject: Support spidermonkey 1.8.5 and newer
-
-Fix support for x86_64
-
-Bug: https://bugs.gentoo.org/404129
----
- Makefile.PL | 44 ++++++++++++-----
- SpiderMonkey.pm | 5 +-
- SpiderMonkey.xs | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- t/error.t | 2 +-
- 4 files changed, 180 insertions(+), 21 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index 901b773..6095dcd 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -12,6 +12,7 @@
- ######################################################################
-
- use ExtUtils::MakeMaker;
-+use ExtUtils::PkgConfig;
- use Getopt::Long;
-
- # Get the right lib and include dirs for different platforms
-@@ -39,7 +40,7 @@ my %possible_install_paths = (
- "/opt/local/lib" => "/opt/local/include", # MacPorts
- );
-
--my ($JS_LIB_DIR, @JS_INCL_DIRS, $JS_LIB_NAME);
-+my ($JS_LIB_DIR, @JS_INCL_DIRS, $JS_LIB_NAME, $JS_LIBS, $JS_INCLUDES);
-
- #### Determine compile options
- ##############################
-@@ -59,6 +60,19 @@ GetOptions(
- "JS_LIB_DIR=s" => \$JS_LIB_DIR,
- "JS_LIB_NAME=s" => \$JS_LIB_NAME,
- );
-+
-+# try to find spidermonkey via pkg-config first
-+
-+$JS_LIBS = ExtUtils::PkgConfig->libs ('mozjs187');
-+if ("".$JS_LIBS ne "") {
-+ $JS_INCLUDES = ExtUtils::PkgConfig->cflags ('mozjs187');
-+} else {
-+ $JS_LIBS = ExtUtils::PkgConfig->libs ('mozjs185');
-+ if ("".$JS_LIBS ne "") {
-+ $JS_INCLUDES = ExtUtils::PkgConfig->cflags ('mozjs185');
-+ } else {
-+
-+# pkg-config did not work, use the old (direct) way to find older libs
- if ($JS_LIB_DIR) {
- push @JS_INCL_DIRS, $JS_LIB_DIR;
- }
-@@ -80,13 +94,15 @@ foreach my $install_path(keys %possible_install_paths) {
- }
- }
- if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) {
-- $JS_LIB_DIR = $libfile;
-+ $JS_LIB_DIR = "-L".$libfile;
- $JS_LIB_DIR =~ s/$possible_lib$//;
-
- $JS_LIB_NAME = $possible_lib;
- $JS_LIB_NAME =~ s/\.(a|so|dll)$//;
- $JS_LIB_NAME =~ s/^lib//;
-
-+ $JS_LIBS = "-l".$JS_LIB_NAME;
-+
- last;
- } else {
- @JS_INCL_DIRS = ();
-@@ -96,15 +112,22 @@ foreach my $install_path(keys %possible_install_paths) {
- }
- last if $JS_LIB_DIR;
- }
-+foreach my $include_dir(@JS_INCL_DIRS) {
-+ $JS_INCLUDES.=" -I".$include_dir;
-+}
-
- if ($JS_INCL_DIRS[0] eq $JS_INCL_DIRS[1]) {
- shift @JS_INCL_DIRS;
- }
-
-+} # end of pkgcfg mozjs185
-+} # end of pkgcfg mozjs187
-+
-+
- ## If no SpiderMonkey library found report that and exit.
- ## Otherwise print lib and include paths.
-
--if (!$JS_LIB_DIR) {
-+if (!$JS_LIBS) {
- print <<EOT;
-
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@@ -113,17 +136,13 @@ README file on how to download, compile and link it.
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
- EOT
-- exit 0;
-+ exit 1;
- } else {
-- print "JS_LIB_DIR: $JS_LIB_DIR\n";
-- foreach my $include_dir(@JS_INCL_DIRS) {
-- print "JS_INCL_DIR: $include_dir\n";
-- }
-- print "JS_LIB_NAME: $JS_LIB_NAME\n";
-+ print "JS_LIBS: $JS_LIBS\n";
-+ print "JS_INCLUDES: $include_dir\n";
- }
-
-
--
- ## Determine library name and system-related defines
- if ($^O ne 'MSWin32') {
- $JS_DEFINE = '-DXP_UNIX';
-@@ -162,10 +181,11 @@ WriteMakefile(
- ($] >= 5.005 ? ## Add these new keywords supported since 5.005
- (ABSTRACT_FROM => 'SpiderMonkey.pm', # retrieve abstract from module
- AUTHOR => 'Mike Schilli <m@perlmeister.com>') : ()),
-- 'LIBS' => ["-L$JS_LIB_DIR -l$JS_LIB_NAME"],
-+ 'LIBS' => ["$JS_LIB_DIR $JS_LIBS"],
- 'DEFINE' => $JS_DEFINE, # e.g., '-DHAVE_SOMETHING'
- # Insert -I. if you add *.h files later:
-- 'INC' => "-I".join " -I", @JS_INCL_DIRS,
-+# 'INC' => "-I".join " -I", @JS_INCL_DIRS,
-+ 'INC' => $JS_INCLUDES,
- # Un-comment this if you add C files to link with later:
- # 'OBJECT' => '$(O_FILES)', # link all the C files too
- );
-diff --git a/SpiderMonkey.pm b/SpiderMonkey.pm
-index 223204a..de210c3 100644
---- a/SpiderMonkey.pm
-+++ b/SpiderMonkey.pm
-@@ -162,9 +162,8 @@ sub init {
- $self->{global_class} =
- JavaScript::SpiderMonkey::JS_GlobalClass();
- $self->{global_object} =
-- JavaScript::SpiderMonkey::JS_NewObject(
-- $self->{context}, $self->{global_class},
-- $self->{global_class}, $self->{global_class});
-+ JavaScript::SpiderMonkey::JS_NewCompartmentAndGlobalObject(
-+ $self->{context}, $self->{global_class});
-
- JavaScript::SpiderMonkey::JS_InitStandardClasses($self->{context},
- $self->{global_object});
-diff --git a/SpiderMonkey.xs b/SpiderMonkey.xs
-index 4d97117..1cfc9a5 100644
---- a/SpiderMonkey.xs
-+++ b/SpiderMonkey.xs
-@@ -20,10 +20,13 @@
- #define snprintf _snprintf
- #endif
-
-+#ifndef JSCLASS_GLOBAL_FLAGS
-+#define JSCLASS_GLOBAL_FLAGS 0
-+#endif
- /* JSRuntime needs this global class */
- static
- JSClass global_class = {
-- "Global", 0,
-+ "Global", JSCLASS_GLOBAL_FLAGS,
- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
- JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
- };
-@@ -67,10 +70,18 @@ JSBool getsetter_dispatcher(
- * I hope all reasonable machines can hold an address in
- * an int.
- */
-- XPUSHs(sv_2mortal(newSViv((int)obj)));
-+ XPUSHs(sv_2mortal(newSViv(PTR2IV(obj))));
-+#if JS_VERSION < 185
- XPUSHs(sv_2mortal(newSVpv(JS_GetStringBytes(JSVAL_TO_STRING(id)), 0)));
-+#else
-+ XPUSHs(sv_2mortal(newSVpv(JS_EncodeString(cx, JSVAL_TO_STRING(id)), 0)));
-+#endif
- XPUSHs(sv_2mortal(newSVpv(what, 0)));
-+#if JS_VERSION < 185
- XPUSHs(sv_2mortal(newSVpv(JS_GetStringBytes(JSVAL_TO_STRING(*vp)), 0)));
-+#else
-+ XPUSHs(sv_2mortal(newSVpv(JS_EncodeString(cx, JSVAL_TO_STRING(*vp)), 0)));
-+#endif
- PUTBACK;
- call_pv("JavaScript::SpiderMonkey::getsetter_dispatcher", G_DISCARD);
- FREETMPS;
-@@ -83,10 +94,21 @@ JSBool getsetter_dispatcher(
- JSBool getter_dispatcher(
- JSContext *cx,
- JSObject *obj,
-+#if JS_VERSION < 185
- jsval id,
-+#else
-+ jsid iid,
-+#endif
- jsval *vp
- /* --------------------------------------------------------------------- */
- ) {
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(cx,iid,&id)) {
-+ fprintf(stderr, "getter_dispatcher: JS_IdToValue failed.\n");
-+ return JS_FALSE;
-+ }
-+#endif
- return getsetter_dispatcher(cx, obj, id, vp, "getter");
- }
-
-@@ -94,10 +116,22 @@ JSBool getter_dispatcher(
- JSBool setter_dispatcher(
- JSContext *cx,
- JSObject *obj,
-+#if JS_VERSION < 185
- jsval id,
-+#else
-+ jsid iid,
-+ JSBool strict,
-+#endif
- jsval *vp
- /* --------------------------------------------------------------------- */
- ) {
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(cx,iid,&id)) {
-+ fprintf(stderr, "setter_dispatcher: JS_IdToValue failed.\n");
-+ return JS_FALSE;
-+ }
-+#endif
- return getsetter_dispatcher(cx, obj, id, vp, "setter");
- }
-
-@@ -128,10 +162,19 @@ int debug_enabled(
-
- /* --------------------------------------------------------------------- */
- static JSBool
-+#if JS_VERSION < 185
- FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
- jsval *argv, jsval *rval) {
-+#else
-+FunctionDispatcher(JSContext *cx, uintN argc, jsval *vp) {
-+#endif
- /* --------------------------------------------------------------------- */
- dSP;
-+#if JS_VERSION >= 185
-+ JSObject *obj = JS_THIS_OBJECT(cx,vp);
-+ jsval *argv = JS_ARGV(cx,vp);
-+ jsval rval;
-+#endif
- SV *sv;
- char *n_jstr;
- int n_jnum;
-@@ -149,12 +192,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
- ENTER ;
- SAVETMPS ;
- PUSHMARK(SP);
-- XPUSHs(sv_2mortal(newSViv((int)obj)));
-+ XPUSHs(sv_2mortal(newSViv(PTR2IV(obj))));
- XPUSHs(sv_2mortal(newSVpv(
-- JS_GetFunctionName(fun), 0)));
-+#if JS_VERSION < 185
-+ JS_GetStringBytes(JS_GetFunctionId(fun)), 0)));
-+#else
-+ JS_EncodeString(cx, JS_GetFunctionId(fun)), 0)));
-+#endif
- for(i=0; i<argc; i++) {
- XPUSHs(sv_2mortal(newSVpv(
-+#if JS_VERSION < 185
- JS_GetStringBytes(JS_ValueToString(cx, argv[i])), 0)));
-+#else
-+ JS_EncodeString(cx, JS_ValueToString(cx, argv[i])), 0)));
-+#endif
- }
- PUTBACK;
- count = call_pv("JavaScript::SpiderMonkey::function_dispatcher", G_SCALAR);
-@@ -174,7 +225,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
-
- if(Debug)
- fprintf(stderr, "DEBUG: %lx is a ref!\n", (long) sv);
-- *rval = OBJECT_TO_JSVAL(SvIV(SvRV(sv)));
-+#if JS_VERSION < 185
-+ *rval = OBJECT_TO_JSVAL(INT2PTR(JSObject *,SvIV(SvRV(sv))));
-+#else
-+ JS_SET_RVAL(cx,vp,OBJECT_TO_JSVAL(INT2PTR(JSObject *,SvIV(SvRV(sv)))));
-+#endif
- }
- else if(SvIOK(sv)) {
- /* It appears that we have been sent an int return
-@@ -183,7 +238,11 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
- n_jnum=SvIV(sv);
- if(Debug)
- fprintf(stderr, "DEBUG: %lx is an int (%d)\n", (long) sv,n_jnum);
-+#if JS_VERSION < 185
- *rval = INT_TO_JSVAL(n_jnum);
-+#else
-+ JS_SET_RVAL(cx,vp,INT_TO_JSVAL(n_jnum));
-+#endif
- } else if(SvNOK(sv)) {
- /* It appears that we have been sent an double return
- * value. Thats fine we can give javascript an double
-@@ -192,11 +251,20 @@ FunctionDispatcher(JSContext *cx, JSObject *obj, uintN argc,
-
- if(Debug)
- fprintf(stderr, "DEBUG: %lx is a double(%f)\n", (long) sv,n_jdbl);
-+#if JS_VERSION < 185
- *rval = DOUBLE_TO_JSVAL(JS_NewDouble(cx, n_jdbl));
-+#else
-+ JS_NewNumberValue(cx, n_jdbl, &rval);
-+ JS_SET_RVAL(cx,vp,rval);
-+#endif
- } else if(SvPOK(sv)) {
- n_jstr = SvPV(sv, PL_na);
- //warn("DEBUG: %s (%d)\n", n_jstr);
-+#if JS_VERSION < 185
- *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, n_jstr));
-+#else
-+ JS_SET_RVAL(cx,vp,STRING_TO_JSVAL(JS_NewStringCopyZ(cx, n_jstr)));
-+#endif
- }
- }
-
-@@ -240,8 +308,13 @@ ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) {
- }
-
- /* --------------------------------------------------------------------- */
-+#if JS_VERSION < 181
- static JSBool
- BranchHandler(JSContext *cx, JSScript *script) {
-+#else
-+static JSBool
-+BranchHandler(JSContext *cx) {
-+#endif
- /* --------------------------------------------------------------------- */
- PJS_Context* pcx = (PJS_Context*) JS_GetContextPrivate(cx);
-
-@@ -374,11 +447,46 @@ JS_NewObject(cx, class, proto, parent)
- JSObject *obj;
- CODE:
- {
-+#ifdef JS_THREADSAFE
-+ JS_BeginRequest(cx);
-+#endif
- obj = JS_NewObject(cx, class, NULL, NULL);
- if(!obj) {
- XSRETURN_UNDEF;
- }
- RETVAL = obj;
-+#ifdef JS_THREADSAFE
-+ JS_EndRequest(cx);
-+#endif
-+ }
-+ OUTPUT:
-+ RETVAL
-+
-+######################################################################
-+JSObject *
-+JS_NewCompartmentAndGlobalObject(cx, class)
-+ JSContext * cx
-+ JSClass * class
-+######################################################################
-+ PREINIT:
-+ JSObject *obj;
-+ CODE:
-+ {
-+#ifdef JS_THREADSAFE
-+ JS_BeginRequest(cx);
-+#endif
-+#if JS_VERSION < 185
-+ obj = JS_NewObject(cx, class, NULL, NULL);
-+#else
-+ obj = JS_NewCompartmentAndGlobalObject(cx, class, NULL);
-+#endif
-+ if(!obj) {
-+ XSRETURN_UNDEF;
-+ }
-+ RETVAL = obj;
-+#ifdef JS_THREADSAFE
-+ JS_EndRequest(cx);
-+#endif
- }
- OUTPUT:
- RETVAL
-@@ -404,6 +512,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p
- na = (uintN) nargs;
- CODE:
- {
-+#ifdef JS_THREADSAFE
-+ JS_BeginRequest(cx);
-+#endif
- obj = JS_InitClass(cx, iobj, parent_proto, clasp,
- constructor, nargs, ps, fs, static_ps,
- static_fs);
-@@ -411,6 +522,9 @@ JS_InitClass(cx, iobj, parent_proto, clasp, constructor, nargs, ps, fs, static_p
- XSRETURN_UNDEF;
- }
- RETVAL = obj;
-+#ifdef JS_THREADSAFE
-+ JS_EndRequest(cx);
-+#endif
- }
- OUTPUT:
- RETVAL
-@@ -469,11 +583,17 @@ JS_InitStandardClasses(cx, gobj)
- JSBool rc;
- CODE:
- {
-+#ifdef JS_THREADSAFE
-+ JS_BeginRequest(cx);
-+#endif
- rc = JS_InitStandardClasses(cx, gobj);
- if(!rc) {
- XSRETURN_UNDEF;
- }
- RETVAL = (int) rc;
-+#ifdef JS_THREADSAFE
-+ JS_BeginRequest(cx);
-+#endif
- }
- OUTPUT:
- RETVAL
-@@ -582,10 +702,18 @@ JS_GetProperty(cx, obj, name)
- rc = JS_GetProperty(cx, obj, name, &vp);
- if(rc) {
- str = JS_ValueToString(cx, vp);
-+#if JS_VERSION < 185
- if(strcmp(JS_GetStringBytes(str), "undefined") == 0) {
-+#else
-+ if(strcmp(JS_EncodeString(cx, str), "undefined") == 0) {
-+#endif
- sv = &PL_sv_undef;
- } else {
-+#if JS_VERSION < 185
- sv_setpv(sv, JS_GetStringBytes(str));
-+#else
-+ sv_setpv(sv, JS_EncodeString(cx, str));
-+#endif
- }
- } else {
- sv = &PL_sv_undef;
-@@ -675,10 +803,18 @@ JS_GetElement(cx, obj, idx)
- rc = JS_GetElement(cx, obj, idx, &vp);
- if(rc) {
- str = JS_ValueToString(cx, vp);
-+#if JS_VERSION < 185
- if(strcmp(JS_GetStringBytes(str), "undefined") == 0) {
-+#else
-+ if(strcmp(JS_EncodeString(cx, str), "undefined") == 0) {
-+#endif
- sv = &PL_sv_undef;
- } else {
-+#if JS_VERSION < 185
- sv_setpv(sv, JS_GetStringBytes(str));
-+#else
-+ sv_setpv(sv, JS_EncodeString(cx, str));
-+#endif
- }
- } else {
- sv = &PL_sv_undef;
-@@ -718,7 +854,11 @@ JS_SetMaxBranchOperations(cx, max_branch_operations)
- PJS_Context* pcx = (PJS_Context *) JS_GetContextPrivate(cx);
- pcx->branch_count = 0;
- pcx->branch_max = max_branch_operations;
-+#if JS_VERSION < 181
- JS_SetBranchCallback(cx, BranchHandler);
-+#else
-+ JS_SetOperationCallback(cx, BranchHandler);
-+#endif
- }
- OUTPUT:
-
-diff --git a/t/error.t b/t/error.t
-index 732226c..de977a1 100644
---- a/t/error.t
-+++ b/t/error.t
-@@ -9,7 +9,7 @@ my $js1 = JavaScript::SpiderMonkey->new ();
- $js1->init ();
- ok (!$js1->eval ($jscode1));
- ok ($@ !~ "\n");
--ok ($@ =~ "SyntaxError");
-+ok ($@ =~ "SyntaxError" || $@ =~ "ReferenceError: invalid assignment left-hand side");
- #print "$@\n";
- my $jscode2 =<<EOF;
- var fruit = non_existant_function ();
---
-2.14.3
-
diff --git a/dev-perl/JavaScript-SpiderMonkey/metadata.xml b/dev-perl/JavaScript-SpiderMonkey/metadata.xml
deleted file mode 100644
index eb7edfd58c08..000000000000
--- a/dev-perl/JavaScript-SpiderMonkey/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>perl@gentoo.org</email>
- <name>Gentoo Perl Project</name>
- </maintainer>
- <upstream>
- <remote-id type="cpan">JavaScript-SpiderMonkey</remote-id>
- <remote-id type="cpan-module">JavaScript::SpiderMonkey</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 02f52d29daed..4c8db026fb0e 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
Binary files differ
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index f865c5240e9d..53638ff80629 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,8 +1,3 @@
-AUX Tk-TableMatrix-1.23-makemaker.patch 959 BLAKE2B f5d8eaf4abc648868baf553b880d78ec9ffa2306c5780ad43739812f975f598a93e0e8d6513d42e6c76680eaca302ce4f79c871a11cffb13df94cc0cdbb7f77c SHA512 807ad91a5147266674c941bd33dac5a44db2df20b34aaf66df5920700bd9c5a72a8d93347f81e4bb5e3b49a9de2cde4241f4583fc8cb0168b43a34f1fd8b9203
-AUX pTk-1.22.patch 558 BLAKE2B c62d921287899aa542a618168f26ff37f1bdf92373c8d72dd98cc52aed15a8d2741968487fab7d4091817517fb01dc541018c0129d7b781e82c8afea0bd30da7 SHA512 c709c5f6baf326389a794764a4b223c0fc154f0f6157e4696ba2e7af6cc029f1e977558be7a16bcdcd40a3e31cfc30bdd23e319ccd5cb33b227a84a55ab82631
-DIST Tk-TableMatrix-1.23.tar.gz 318954 BLAKE2B 9e6380cf0949aaf15861ad9a9209d7fb2cd69c3e1983f26b364aeaaa28143b00a063fc842da48c7d18ba1f9c69a60973519de07fdf91e39532b2347ddbcdd4fb SHA512 115eb2a71c3725392f2bcf5e468bc84844c8a5ad3db221205876d7de6486833a3fd4e98aa32e21f5dcf038a38f9d98721adeebb1f9cd0990359aec7d07f6f32e
DIST Tk-TableMatrix-1.26.tar.gz 410559 BLAKE2B d0a5763469b5abdd6eba92a6a3de05b1b07f7d09f851f6471d3953ef93b242e65be6bcbc00a72ff61c11a9b42b0cf10678c11efbbff91ca4cb209df9317a0874 SHA512 bd45e3c72e330de3722fe365989f6bd0bd938d72fad166c1a65a3667d07f8c10bf792742bf82a8154b43d3453a79e737788b0a4a288f318c370cc0c5fe94917f
-EBUILD Tk-TableMatrix-1.230.0-r1.ebuild 600 BLAKE2B 79819d23e021851851394f08c5208cf125d372a5456aa2ec2674231717f378be2583ab1df8f2312f81dd915c4adb7c14f83aa6e575f9ad48c201ba870c2c5513 SHA512 0ecbd05dd068841b13cb8a1571186fc04346c2ae023652a43d3f4a14faf964ac1918ebfd36f93c69d542b157e4c93744eedb6af88bdf181b16a56cb0c93dd578
-EBUILD Tk-TableMatrix-1.230.0-r2.ebuild 686 BLAKE2B 581ac0a5e85d4733a05cb7d6b6cae34bc945d214db909cd347834dcdba9e7680cfc937fc2ce4adf8497c8b6c36de981c99067992d6f9e673f0b49a5b14ca4874 SHA512 cb170338994051b45c6f150016ca11983e24947045c448bb7abe36d899003f999b7de6ecc34557d556ab3fbf1a60d0b86454482be7a4e47e9501ea4b62916ace
EBUILD Tk-TableMatrix-1.260.0.ebuild 682 BLAKE2B 8cea172216e5095c03c2c12c62c1bdb9e504ea2ef1955341310e9e91d68fd83cf93b9751c887fc9d96ec997c4e9e553a06e7b55b100b4ebd79f2e2ae48de97f0 SHA512 7a4db975972cd15d707111db824746073ee7cef970857e996c10ed49223bf433b65e3501ba5afdafe07fc01bae35546f730fdd05dc3b671e2033230a16a63f54
MISC metadata.xml 559 BLAKE2B 992fe97c68e40e1fa7c68c07686375917197a8ee8c63867847765970e74d5820bb2dad84a3fddc5e0e44b851f51660397ef766202767fabf159d718daaf1852b SHA512 0fa6f4decc0d30c9aeba1209615de0ddc5e81a3e839ebae9d92ca6638f297ca8298e1c949f40b65c9889ef9909a742435a9ef75519f3e12b8747c952d817a85d
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
deleted file mode 100644
index dcf368664ac8..000000000000
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CERNEY
-MODULE_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Perl module for Tk-TableMatrix"
-
-#SRC_TEST="do"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="dev-perl/Tk"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/pTk-1.22.patch" )
-
-src_install() {
- perl-module_src_install
-
- # Clean out stray conflicting file - its generated by perl-tk already.
- # Bug 169294
- rm "${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
-}
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
deleted file mode 100644
index 7698ad6f7eee..000000000000
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.230.0-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CERNEY
-DIST_VERSION=1.23
-inherit perl-module virtualx
-
-DESCRIPTION="Create and manipulate tables in Perl + Tk"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-perl/Tk"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.23-makemaker.patch" )
-
-src_install() {
- perl-module_src_install
-
- # Clean out stray conflicting file - its generated by perl-tk already.
- # Bug 169294
- rm "${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
-}
-
-src_test() {
- virtx perl-module_src_test
-}
diff --git a/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch b/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch
deleted file mode 100644
index 9180e728f312..000000000000
--- a/dev-perl/Tk-TableMatrix/files/Tk-TableMatrix-1.23-makemaker.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 009a27f86c882e229ea8e9cc7efdff9f6f5f751b Mon Sep 17 00:00:00 2001
-From: Matt Chorman <matt@legalizefreedom.org>
-Date: Wed, 21 Jan 2004 03:02:36 +1300
-Subject: Patch issues with newer MakeMaker
-
-Bug: https://bugs.gentoo.org/34940
-Bug: https://bugs.gentoo.org/70000
----
- pTk/Makefile.PL | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/pTk/Makefile.PL b/pTk/Makefile.PL
-index d035029..3d66a0f 100755
---- a/pTk/Makefile.PL
-+++ b/pTk/Makefile.PL
-@@ -234,12 +234,10 @@ sub MY::postamble {
- my $self = shift;
- my $dep = $self->Tk::MMutil::mTk_postamble;
-
--$dep .= $self->dir_target(@{$self->{'dir_targets'}});
--
--$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
-- "\n\t".$self->{NOECHO}."\$(NOOP)\n";
--
--
-+if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
-+ {
-+ my $cc = $Config{'cc'};
-+ }
- $dep . '
-
- '.$self->{NOECHO}.'$(NOOP)
---
-2.16.2
-
diff --git a/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch b/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
deleted file mode 100644
index ff9938535b69..000000000000
--- a/dev-perl/Tk-TableMatrix/files/pTk-1.22.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pTk/Makefile.PL.old 2006-05-01 18:09:31.000000000 -0400
-+++ pTk/Makefile.PL 2006-05-01 18:10:05.000000000 -0400
-@@ -234,11 +234,11 @@ sub MY::postamble {
- my $self = shift;
- my $dep = $self->Tk::MMutil::mTk_postamble;
-
--$dep .= $self->dir_target(@{$self->{'dir_targets'}});
--
--$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
-- "\n\t".$self->{NOECHO}."\$(NOOP)\n";
-
-+if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
-+ {
-+ my $cc = $Config{'cc'};
-+ }
-
- $dep . '
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:48:27 +0000