gentoo auto-resync : 26:06:2024 - 00:12:24

3 files changed, 75 insertions, 3 deletions

diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 4f6731258081..aa1ae7a02c59 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,11 +1,12 @@
 AUX 64gcl-gentoo.el 154 BLAKE2B 57356dd1f8a1fe80a519c36beb0937733fe4aef09df9108ee81c7ccac03760ef7cf1b60019acc045bfd69e2688c40c144802c5195dc86c03c847640b39477840 SHA512 bc471a4b21866a9db2f21234b0b42cafff5bc509668a59ba39516d5fe0b148739d65b89ed1982b3a06109f793d28321da6fe6856693f279d77ab6313d0185b1c
 AUX bootstrap-gcl 336 BLAKE2B a1c94177ccf15e2febd2315d83eb965903f0b22b8dfe230102891432564dcd8198b210aa004da3ad0d91e0b2e7ba43cc5e4e8c981923efb7f15a112e30dff86b SHA512 481a9ffa1102534c36a1a2084dda4b1ecd822888fafac4e6f0691b73ce0cc60e5328f628998ccef38bf75a26f3b79b24adf59562dc7cad23c3033a22d9593d0f
 AUX gcl-2.6.13_pre99-assertion.patch 534 BLAKE2B 5306a28c9e2439454d6343a228661ced66079953d2bf678115eda769d08e1d0f366c2f3ed2aa55a9653b97167824dcea7a8a86b6650df21b0186515f05609f88 SHA512 e7a914b760a321deb831f7907c2ba5f5ae2cd921118453bacc8dcc907bb22cb993295fbca9b5f45b0ecb195e36bf31e18a0b25dae5eee6fc45188a1edf2b485f
+AUX gcl-2.6.15-riscv.patch 1832 BLAKE2B c54913fb7b2d542b06b308339a52161ce418b3deec518956f793760176361b45cf782e2f60b97624f127eaae4f16a027481d245d3e0ce042c9ec690c8ea04027 SHA512 6368f9cd8cf3f4ad0a60fef0be10e669ce78a835bbcbb9a56e4d86cc12172285055a3a3bee74e54d472bf7cfcb032549e44c1bc2e230ee7941d1f912b1ab3dbc
 DIST gcl-2.6.13_pre99.tar.xz 10030460 BLAKE2B 8750d641062bcad5a124173013d38403f37ad352c7c436e89d4e329d997200be399a100dcefc4ce484e3f85f46e2dd90ee02947e5e728e001782e973c4122b0e SHA512 a3ad2bd639157ca2a80b534e87c169f6e07002a1b9ca8039483cff336af764123dec9e749da045b656b990e0a97c70881c798420ec4bd0e4494f43d0d040e413
 DIST gcl-2.6.14.tar.gz 11725385 BLAKE2B 3e6a7fc359f94897d1062f5e5e31a0ae36f5d24ca0155fd22044cb967f1fd6a0303572dafe25b1a7abbc936db4e8caa93d0e50b1779886e2ba40e148fa868b8f SHA512 1a69f5e8195783c88b618a613253da1089b13e390dd259056df52f1ed95cf0c99358c34d3782c8eb297c07fda74deb7db359e6b9bf94590ee7fc34e94742eb14
 DIST gcl-2.6.15_pre3-spelling.patch.gz 10530 BLAKE2B ce2f4a2a568467c77ef58d6063df4596220a0826e18158e0f3308dc6c4a89451910a2c54a179131a4d0cb5362e7b20ba33691d2a80c02dc81e826d664298c29b SHA512 f72cf9c6607603f548220ee169fdbaf9151ea41f2be03209c258a261c6274b97c78b02e8258b2a2550ff9fcd8ab144a334789f274deedf0fe9f050a10bd54a67
 DIST gcl-Version_2_6_15pre3.tar.gz 11433299 BLAKE2B cee392674f465477d37bcdf724651f88e08b90a74ca3e79a561b99f0e61227332dbee77ed688cda7525341421df262a0a58c325576d6e8a5daaa1122ae36c6e4 SHA512 bf05c3f4ecad74a9e29b25969d3f82d39c9715bfa98c1b734b279a7886e60076ecb5896723fe1888255c4eecf4e5eda60696d25ad6a8e17eb55088b2a37ad3ce
 EBUILD gcl-2.6.13_pre99.ebuild 2451 BLAKE2B 666a9ffd8568bd32fefb279b70f0df50ad6872767dc3338de517b68f2fea5fb194e86be41bfaf2cbdd010fdefcdc9070bf22756cf2e3ec71e1dac171d6d81f32 SHA512 b40d54e93fec0f4692f8b65f5b14c2a9e55719633e3f49804e2f7dafeb933d0441333edc73e4785ddde1d7e38bef3f598515291cb68acef77cac3c0276c88888
 EBUILD gcl-2.6.14.ebuild 2389 BLAKE2B 9df12ca93c6bcd2ba2b6e38e4c1960134484813ef62ddc14d40d77b8708e469220c06bf1db8555469c18e903d3829e5ba961ca1027ac538fc0da42b91bf21991 SHA512 b569d8e029de60492f6a76c8a19934daf840e575123ef2f0ab85eecbe7ec46891b7cb24d4a7086246f1f8ee6a01deb1843fb3b4f821ff5fb79307e105c64dddf
-EBUILD gcl-2.6.15_pre3.ebuild 2504 BLAKE2B 667327d4492e68e628d29210311d26453227bc67fd140e216cecf6d5ac58b79ff8c20baf0c1e80a93fd5e6956a0db8b1c517d0441d08abceb4c0a363090333d1 SHA512 1d673f3aee2c403a2ed7b664e1445d56de1b40d8e885be37eb8edbccb82d235324c3ce8a42079a943d758080022f698777133f2a59c2ae9454ad758b5f6992aa
+EBUILD gcl-2.6.15_pre3.ebuild 2566 BLAKE2B a4287b3c0cc529ccc9c892c8eae12ce8a1a150e4b6fe76abb42152d8b6792fb78bdd8ab5ff520df3316d8340fa0e7efed255a12bb576c597e5d7877607f3b70c SHA512 3ca570456751c9307e111920a61193e982e234a922e79e434b9034ee6cc4df17559486f4f5744a0e6dd893b457763a695762ec2512cb94d71928dc0a17baf94d
 MISC metadata.xml 722 BLAKE2B 4efe3f45f285f77a679e5c745a98e6707db15ac67554c17a2de932183d216ac0906d302197ca094b0773d90bd0a36dcef5e0ecf621f8ef07c9e18478db734f77 SHA512 fb317108e1673ab66aeda56aff57fb70679dcc1c4893f1e8c8b54dd9220414777694d647089c6281426fdf07393be0a7ee64fe1bee519fab638523315c20adc6
diff --git a/dev-lisp/gcl/files/gcl-2.6.15-riscv.patch b/dev-lisp/gcl/files/gcl-2.6.15-riscv.patch
new file mode 100644
index 000000000000..1250ac2cf1e0
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-2.6.15-riscv.patch
@@ -0,0 +1,67 @@
+From bc3324432b859477feed47e7db0e97dd33b61d1f Mon Sep 17 00:00:00 2001
+From: Camm Maguire <camm@transcendence.maguirefamily.org>
+Date: Fri, 23 Feb 2024 07:47:26 -0500
+Subject: update relocs for riscv64
+
+---
+ gcl/h/elf64_riscv64_reloc.h | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 43 insertions(+), 1 deletion(-)
+
+diff --git a/gcl/h/elf64_riscv64_reloc.h b/gcl/h/elf64_riscv64_reloc.h
+index c2f8232..08e94ce 100644
+--- a/h/elf64_riscv64_reloc.h
++++ b/h/elf64_riscv64_reloc.h
+@@ -23,8 +23,50 @@
+     case R_RISCV_JAL:
+       break;
+     case R_RISCV_64:
+-      store_val(where,MASK(64),(s+a));
++      store_val(where,~0L,(s+a));
+       break;
+     case R_RISCV_32:
+       store_val(where,MASK(32),(s+a));
+       break;
++    case R_RISCV_32_PCREL:
++      store_val(where,MASK(32),(s+a)-p);
++      break;
++    case R_RISCV_ADD8:
++      add_val(where,MASK(8),(s+a));
++      break;
++    case R_RISCV_ADD16:
++      add_val(where,MASK(16),(s+a));
++      break;
++    case R_RISCV_ADD32:
++      add_val(where,MASK(32),(s+a));
++      break;
++    case R_RISCV_ADD64:
++      add_val(where,~0L,(s+a));
++      break;
++    case R_RISCV_SUB6:
++      add_val(where,MASK(6),-(s+a));
++      break;
++    case R_RISCV_SUB8:
++      add_val(where,MASK(8),-(s+a));
++      break;
++    case R_RISCV_SUB16:
++      add_val(where,MASK(16),-(s+a));
++      break;
++    case R_RISCV_SUB32:
++      add_val(where,MASK(32),-(s+a));
++      break;
++    case R_RISCV_SUB64:
++      add_val(where,~0L,-(s+a));
++      break;
++    case R_RISCV_SET6:
++      store_val(where,MASK(6),(s+a));
++      break;
++    case R_RISCV_SET8:
++      store_val(where,MASK(8),(s+a));
++      break;
++    case R_RISCV_SET16:
++      store_val(where,MASK(16),(s+a));
++      break;
++    case R_RISCV_SET32:
++      store_val(where,MASK(32),(s+a));
++      break;
+-- 
+cgit v1.1
diff --git a/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild b/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild
index dd6b7e3a812d..6473aba4cc59 100644
--- a/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/gcl.git/snapshot/${PN}-Version_2_6_15p
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ansi athena doc emacs +readline tk X"
 RESTRICT="strip"  #205803
 
@@ -27,7 +27,11 @@ DEPEND="${RDEPEND}
 	app-text/texi2html
 	>=dev-build/autoconf-2.52"
 
-PATCHES=( "${WORKDIR}"/${PF}-spelling.patch )
+PATCHES=(
+	"${WORKDIR}"/${PF}-spelling.patch
+	# bug 893938
+	"${FILESDIR}"/${PN}-2.6.15-riscv.patch
+)
 S="${WORKDIR}"/${PN}-Version_2_6_15pre3/${PN}
 
 src_configure() {