gentoo resync : 16.01.2021

3 files changed, 20 insertions, 2 deletions

diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index e57630beda05..5ea283f36d27 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,6 +1,7 @@
 AUX 64gcl-gentoo.el 184 BLAKE2B 69607d9ac06e897bb02deeed65807438a19068f9d8de5179247e73576c18483a4a1b193af27a3811383f1c68072f787f6214054d9763bee1f6a5a561e6f65259 SHA512 06749b0c4ec7a34a7fdbb591d40106fe00a794e6db0950cc7187293d4c495d5c908235a2ba38236132618442924a7feae08496356fcd4b0139477cd89121e3cf
 AUX bootstrap-gcl 336 BLAKE2B a1c94177ccf15e2febd2315d83eb965903f0b22b8dfe230102891432564dcd8198b210aa004da3ad0d91e0b2e7ba43cc5e4e8c981923efb7f15a112e30dff86b SHA512 481a9ffa1102534c36a1a2084dda4b1ecd822888fafac4e6f0691b73ce0cc60e5328f628998ccef38bf75a26f3b79b24adf59562dc7cad23c3033a22d9593d0f
 AUX gcl-2.6.12-gcc5.patch 469 BLAKE2B 7ef376f56d4b9d04fa7d3e5162b22afd8276337f103ae7ab2d5d59759c99e479c4341773b158ffe5095e49aae8cab69f97387e6eff2847c6502057a3a0a3fe07 SHA512 b2dffb7a8b3f89ab8d18d6d23dfc756e9e70921d036f9d7b2445351b9e3b67bdecff286b04f8dcb5f30b5199635cd44f3f3a28cde8ec150911fd445d172c70fb
+AUX gcl-2.6.13_pre99-assertion.patch 534 BLAKE2B 5306a28c9e2439454d6343a228661ced66079953d2bf678115eda769d08e1d0f366c2f3ed2aa55a9653b97167824dcea7a8a86b6650df21b0186515f05609f88 SHA512 e7a914b760a321deb831f7907c2ba5f5ae2cd921118453bacc8dcc907bb22cb993295fbca9b5f45b0ecb195e36bf31e18a0b25dae5eee6fc45188a1edf2b485f
 AUX gcl-gmp-6.patch 363 BLAKE2B 103d473dc971c138ed4c7584fb61264e0ce4e6ef5823beade51a3ed4a5cae769564ae9ad252a6e40723e3ac8b5a33b9631d41954034ebc6324c58b878f4e1260 SHA512 cc578a915d154e94cf992f79e5a0130d294f506da13315bef060e19b08af3390942b2ebd5b4989acb37582315f3396fe605b56e9e441755728f54cf693be0ef1
 AUX gcl-readline-6.3.patch 656 BLAKE2B 5e8fab31dacab80c1a01cbbf17de6d346556aa7412c3ea33a104aaf4515f72bfac4b8bb316b64e77720efafefae289805b96ca9a9c396c7711c66b342a1ec3ea SHA512 d88e59a0082d01b7ae8bca1dd9870400b7e0b0e39eeb4fdce564bccfd615fadee6235c3cf1e3ef8074f74c17188144c93380cd499b215b5025304b0b2d272501
 AUX gcl-tcl-8.6.patch 3331 BLAKE2B a37ed5a50ab7c9601e36d83c511db20fd0d9cec7bd36d83dcd463bc692cf3a647fdcf32c090daa6f7b5c9697380307948d21e98de38e0c68479921c1710f3bb7 SHA512 108835fd285d6198935c6c1d20c96bc405f3c47dec66fc30201e01cd163734933cc0107b9a9035f728a594f1280a0c1bbfde2087ba5149d46c3b55ca066e3ca4
@@ -11,5 +12,5 @@ DIST gcl-2.6.12.tar.gz 7031837 BLAKE2B afd3f81dd8a712d92883a96399a2e0621b0d38a34
 DIST gcl-2.6.13_pre99.tar.xz 10030460 BLAKE2B 8750d641062bcad5a124173013d38403f37ad352c7c436e89d4e329d997200be399a100dcefc4ce484e3f85f46e2dd90ee02947e5e728e001782e973c4122b0e SHA512 a3ad2bd639157ca2a80b534e87c169f6e07002a1b9ca8039483cff336af764123dec9e749da045b656b990e0a97c70881c798420ec4bd0e4494f43d0d040e413
 EBUILD gcl-2.6.10.ebuild 3957 BLAKE2B 7490f7ac90b1133dfaabd02119eaba0a6c6cda8a2ce8e21d53c7fb9d42919eeb12a4bdac9e58bfa983582e5a7d7248f6c1f80cee82e10f493bde47a1c444ddf8 SHA512 0d87bdc13c7f9323d93d8f4f29844435c67d244a3b9525712742b7afa889eba7a4e8a97ef0d50f2740b1befbe32f2f7358ba0815e3d38b2fde79ae42db23a52b
 EBUILD gcl-2.6.12.ebuild 3827 BLAKE2B 6cd0e7d56cc77b12643bc0bb0b2405d24bea7d678af09930e6412d42389d101b18a63c43e1a09b9c09efbd5391d544acccee8bfed3efccf11e04cf46c1890265 SHA512 73fc32245476e456f3689d15b12b2d0a89fe7c6c1cc39f2a46a832c2324d6a306107bb940a5fe50567d4bc9c1452c13ddd8592661b77960bbbdadde826ba30fb
-EBUILD gcl-2.6.13_pre99.ebuild 2399 BLAKE2B 11f1b4b48153f9e71a711ff8faa1f42737b442891aa9f527428537cc7506785d3466f98e3b5c575385a6b6ecbacef61d11cc1d0f223a73e0cf61b89f74d5040d SHA512 929af218c17e86c53ed60345097c5efe902852ede29fc6f9d40b9356e930604bdbfdb4958f534f1d736d5b278ab91970c807e89888f8461f13456504e772a2a3
+EBUILD gcl-2.6.13_pre99.ebuild 2462 BLAKE2B 84d3315f0448ec280740571f6e3d9e48cb1ab29dc1862c649704f18dcc36b8be4f0384109362733a7f8005b3a80f02369a32e96d91c725b11b072ba190dfa496 SHA512 f9fcce8135ef5c904a14e9ab14fe513f4c5c8267c0d1c30ea1b565ea913df4fb0e596f8d1299808ebdeddc93ea4581e289034455dace4f6c5800ccae4881c7d1
 MISC metadata.xml 722 BLAKE2B 4efe3f45f285f77a679e5c745a98e6707db15ac67554c17a2de932183d216ac0906d302197ca094b0773d90bd0a36dcef5e0ecf621f8ef07c9e18478db734f77 SHA512 fb317108e1673ab66aeda56aff57fb70679dcc1c4893f1e8c8b54dd9220414777694d647089c6281426fdf07393be0a7ee64fe1bee519fab638523315c20adc6
diff --git a/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch b/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch
new file mode 100644
index 000000000000..e788b62f2bf0
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/778770
+--- a/h/notcomp.h
++++ b/h/notcomp.h
+@@ -299,7 +299,7 @@
+ #define coerce_to_filename(a_,b_) coerce_to_filename1(a_,b_,sizeof(b_))
+ 
+ #include <errno.h>
+-#define massert(a_) ({errno=0;if (!(a_)||errno) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__);})
++#define massert(a_) ({errno=0;if (!(a_)) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__);})
+ 
+ extern bool writable_malloc;
+ #define writable_malloc_wrap(f_,rt_,a_...) ({rt_ v;bool w=writable_malloc;writable_malloc=1;v=f_(a_);writable_malloc=w;v;})
diff --git a/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
index a1f37e04a53b..6858ff5af62f 100644
--- a/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,11 @@ DEPEND="${RDEPEND}
 	app-text/texi2html
 	>=sys-devel/autoconf-2.52"
 
+PATCHES=(
+	# bug 778770
+	"${FILESDIR}"/${P}-assertion.patch
+)
+
 src_configure() {
 	strip-flags
 	filter-flags -fstack-protector -fstack-protector-all