gentoo resync : 12.05.2022

6 files changed, 2 insertions, 286 deletions

diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 32a3dfdf6002..92717ca64021 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -1,12 +1,6 @@
 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-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
-DIST gcl-2.6.10-fedora.tar.bz2 695718 BLAKE2B 151cac372f74a971ffb31191a3614d0f7bafca141258af9e1955185f8ed119cbcd3797f2d9bbe5eb5f82e76af4fd0d3e0cf155cd35f305a2c028e40b340b78cf SHA512 3e0ffaec859783443a8941a29302c7a17c9538ef2177d449ad34e24292c174de7bb8760a6d327e08f012773032f0d0a5230b79c7e4b4f5bad8354bf10a28af4c
-DIST gcl-2.6.10.tar.gz 5490689 BLAKE2B 46af0cf8a810a82fe2bc2bd46ca1cbe17b74c71eb4af6a06032040900dcad4dd4338883cd9225f0945ae425eba788ac84db9a0ed454779edd86c74a1bb48a947 SHA512 bbaacce712f15130550bcdf7e53edf4df9ab955e84ec701087034115df1c1e657d956853d5db85d7e88709981f9b7fd4c9df7acf6c8588a8ccf5f05e4e666aed
 DIST gcl-2.6.13_pre99.tar.xz 10030460 BLAKE2B 8750d641062bcad5a124173013d38403f37ad352c7c436e89d4e329d997200be399a100dcefc4ce484e3f85f46e2dd90ee02947e5e728e001782e973c4122b0e SHA512 a3ad2bd639157ca2a80b534e87c169f6e07002a1b9ca8039483cff336af764123dec9e749da045b656b990e0a97c70881c798420ec4bd0e4494f43d0d040e413
-EBUILD gcl-2.6.10.ebuild 3928 BLAKE2B bcc3e1b8b37323e6ef6740664d28191923cd69a59267ae0c8eeda8aa6d9a844a39b2ee9339d945a9a27e93b5294fb845268dba34fd826e4d203592ea68aa7768 SHA512 abb82bdd5ab6ed06111a29eaaf325636d4e3bde64c8f53b6b208783e702dc9be6f7389e1ac06978648547f3c9b90fafffdaf1647949ab1e102946044cd1db96c
-EBUILD gcl-2.6.13_pre99.ebuild 2452 BLAKE2B 79d99bbde11dee2984f546efabafbed5e073f3363a625082c7dd1e4e3bb78f970f5555007a9e84764297282c3b2862208e632f4489b4e42481f7d5f9aed3c7a3 SHA512 83b905410f12656cf18b60b43978041190ae2d036b6295a05c4c3178fc9032202c5b5d25bc6ec749807789c11b2fec4f89bc7daddbb4822653c35d0e12f74b80
+EBUILD gcl-2.6.13_pre99.ebuild 2451 BLAKE2B b841d2a2094ff1bfe2e6298fb26ac4ecfb759939a8bbe287a046f5df3bb8fb347129baf97d46d18ec54adbf498e00a4acbd24a3c39151b497b6cad06921b1577 SHA512 cf60e90e2e059ef3f9164c5655fe90a67682d15d414bb71a11a20b8fc0440d63c19a1694f7ebc7f4cf1fb198e5892f9ccc9617b52b7381a676247702302fe20a
 MISC metadata.xml 722 BLAKE2B 4efe3f45f285f77a679e5c745a98e6707db15ac67554c17a2de932183d216ac0906d302197ca094b0773d90bd0a36dcef5e0ecf621f8ef07c9e18478db734f77 SHA512 fb317108e1673ab66aeda56aff57fb70679dcc1c4893f1e8c8b54dd9220414777694d647089c6281426fdf07393be0a7ee64fe1bee519fab638523315c20adc6
diff --git a/dev-lisp/gcl/files/gcl-gmp-6.patch b/dev-lisp/gcl/files/gcl-gmp-6.patch
deleted file mode 100644
index f66638478af1..000000000000
--- a/dev-lisp/gcl/files/gcl-gmp-6.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 gcl.orig/configure gcl/configure
---- gcl.orig/configure	2013-11-11 21:55:48.000000000 +0700
-+++ gcl/configure	2014-03-30 17:25:04.874994142 +0700
-@@ -5027,3 +5027,3 @@
- 				    int main() {
--				    #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5
-+				    #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 || __GNU_MP_VERSION == 6
- 					return 0;
diff --git a/dev-lisp/gcl/files/gcl-readline-6.3.patch b/dev-lisp/gcl/files/gcl-readline-6.3.patch
deleted file mode 100644
index 063c772f1051..000000000000
--- a/dev-lisp/gcl/files/gcl-readline-6.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U1 gcl.orig/o/gcl_readline.d gcl/o/gcl_readline.d
---- gcl.orig/o/gcl_readline.d	2013-11-11 21:55:48.000000000 +0700
-+++ gcl/o/gcl_readline.d	2014-03-30 18:29:42.131967005 +0700
-@@ -53,2 +53,9 @@
- 
-+/* Deprecated CPPFunction disappeared in libreadline-6.3 */
-+#if defined(_RL_FUNCTION_TYPEDEF)
-+#define RL_COMPLETION_FUNC_T rl_completion_func_t
-+#else
-+#define RL_COMPLETION_FUNC_T CPPFunction
-+#endif
-+
- int readline_on = 0;		/* On (1) or off (0) */
-@@ -471,3 +478,3 @@
- #ifdef RL_COMPLETION
--  rl_attempted_completion_function = (CPPFunction *)rl_completion;
-+  rl_attempted_completion_function = (RL_COMPLETION_FUNC_T *)rl_completion;
- #endif		
diff --git a/dev-lisp/gcl/files/gcl-tcl-8.6.patch b/dev-lisp/gcl/files/gcl-tcl-8.6.patch
deleted file mode 100644
index cfbf82e32899..000000000000
--- a/dev-lisp/gcl/files/gcl-tcl-8.6.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff --git a/gcl/gcl-tk/tkMain.c b/gcl/gcl-tk/tkMain.c
-index 74475cc..21c6c59 100755
---- a/gcl/gcl-tk/tkMain.c
-+++ b/gcl/gcl-tk/tkMain.c
-@@ -42,6 +42,11 @@
- #if (TK_MINOR_VERSION==0 && TK_MAJOR_VERSION==4)
- #define TkCreateMainWindow Tk_CreateMainWindow
- #endif
-+#if TCL_MAJOR_VERSION >= 8
-+#define INTERP_RESULT(interp) Tcl_GetStringResult(interp)
-+#else
-+#define INTERP_RESULT(interp) (interp)->result
-+#endif
- 
- 
- /*-------------------------------------------------------------------*/
-@@ -276,7 +281,7 @@ TkX_Wish (argc, argv)
- 
-     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (void *)argv, argTable, 0)
- 	    != TCL_OK) {
--	fprintf(stderr, "%s\n", interp->result);
-+	fprintf(stderr, "%s\n", INTERP_RESULT(interp));
- 	exit(1);
-     }
-     if (name == NULL) {
-@@ -309,7 +314,7 @@ TkX_Wish (argc, argv)
- 
- /*     mainWindow = TkCreateMainWindow(interp, display, name/\*  , "Tk" *\/);  */
- /*     if (mainWindow == NULL) { */
--/* 	fprintf(stderr, "%s\n", interp->result); */
-+/* 	fprintf(stderr, "%s\n", INTERP_RESULT(interp)); */
- /* 	exit(1); */
- /*     } */
- /* #ifndef __MINGW32__     */
-@@ -362,7 +367,7 @@ TkX_Wish (argc, argv)
-     Tcl_FindExecutable ( argv[0] ); 
- #else
-     if (Tcl_AppInit(interp) != TCL_OK) {
--	fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
-+	fprintf(stderr, "Tcl_AppInit failed: %s\n", INTERP_RESULT(interp));
-     }
- #endif
-     /*
-@@ -372,7 +377,7 @@ TkX_Wish (argc, argv)
-     if (geometry != NULL) {
- 	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
- 	if (code != TCL_OK) {
--	    fprintf(stderr, "%s\n", interp->result);
-+	    fprintf(stderr, "%s\n", INTERP_RESULT(interp));
- 	}
-     }
- 
-@@ -402,13 +407,13 @@ TkX_Wish (argc, argv)
-     
- 	    fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
- 	    if (fullName == NULL) {
--		fprintf(stderr, "%s\n", interp->result);
-+		fprintf(stderr, "%s\n", INTERP_RESULT(interp));
- 	    } else {
- 		f = fopen(fullName, "r");
- 		if (f != NULL) {
- 		    code = Tcl_EvalFile(interp, fullName);
- 		    if (code != TCL_OK) {
--			fprintf(stderr, "%s\n", interp->result);
-+			fprintf(stderr, "%s\n", INTERP_RESULT(interp));
- 		    }
- 		    fclose(f);
- 		}
-@@ -443,7 +448,7 @@ TkX_Wish (argc, argv)
- error:
-     msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-     if (msg == NULL) {
--	msg = interp->result;
-+	msg = INTERP_RESULT(interp);
-     }
-     dfprintf(stderr, "%s\n", msg);
-     Tcl_Eval(interp, errorExitCmd);
-@@ -566,13 +571,13 @@ StdinProc(clientData, mask)
- 	      || code)
- 	    {
- 	      char buf[4];
--	      char *p = buf;
-+	      char *p = buf, *string;
- 	      /*header */
- 	      *p++ = (code ? '1' : '0');
- 	      bcopy(msg->msg_id,p,3);
- 	      /* end header */
--	      if(sock_write_str2(dsfd, m_reply, buf, 4 ,
--				 interp->result, strlen(interp->result))
-+	      string = INTERP_RESULT(interp);
-+	      if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string))
- 		 < 0)
- 		{		/* what do we want to do if the write failed */}
- 	      
-@@ -752,7 +757,7 @@ guiBindCallback(char *szNameCmdProc, char *szTclObject, char *szModifier,char* a
-   code = Tcl_Eval(interp, szCmd);
-   if (code != TCL_OK)
-     {
--      dfprintf(stderr, "TCL Error int bind : %s\n", interp->result);
-+      dfprintf(stderr, "TCL Error int bind : %s\n", INTERP_RESULT(interp));
- 
-     }
-   return code;
diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
deleted file mode 100644
index 47a5f441a32c..000000000000
--- a/dev-lisp/gcl/gcl-2.6.10.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common epatch flag-o-matic
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz https://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2"
-S="${WORKDIR}"/${PN}
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+ansi athena emacs +readline tk X"
-
-# See bug #205803
-RESTRICT="strip"
-
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	readline? ( sys-libs/readline:= )
-	athena? ( x11-libs/libXaw )
-	>=dev-libs/gmp-4.1:=
-	tk? ( dev-lang/tk:= )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	virtual/latex-base"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_prepare() {
-	mv "${WORKDIR}"/fedora/info/* info/
-	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
-	find . -type f -perm /0111 | xargs chmod a-x
-	chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
-	chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab
-	chmod a+x o/egrep-def utils/replace xbin/*
-
-	# fedora patches
-	epatch "${WORKDIR}"/fedora/fd-leak.patch
-	epatch "${WORKDIR}"/fedora/latex.patch
-	epatch "${WORKDIR}"/fedora/texinfo.patch
-	epatch "${WORKDIR}"/fedora/elisp.patch
-	epatch "${WORKDIR}"/fedora/rename.patch
-	epatch "${WORKDIR}"/fedora/getcwd.patch
-	epatch "${WORKDIR}"/fedora/infrastructure.patch
-	epatch "${WORKDIR}"/fedora/extension.patch
-	epatch "${WORKDIR}"/fedora/unrandomize.patch
-	epatch "${WORKDIR}"/fedora/asm-signal-h.patch
-	epatch "${WORKDIR}"/fedora/plt.patch
-	epatch "${WORKDIR}"/fedora/ellipsis.patch
-	epatch "${WORKDIR}"/fedora/man.patch
-	epatch "${WORKDIR}"/fedora/reloc-type.patch
-	epatch "${WORKDIR}"/fedora/largefile.patch
-
-	epatch "${FILESDIR}"/${PN}-tcl-8.6.patch
-	epatch "${FILESDIR}"/${PN}-gmp-6.patch
-	epatch "${FILESDIR}"/${PN}-readline-6.3.patch
-
-	sed -e 's|"-fomit-frame-pointer"|""|' -i configure
-	sed -e 's|@EXT@||g' debian/in.gcl.1 > gcl.1
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -fstack-protector -fstack-protector-all
-
-	local tcl=""
-	if use tk; then
-		tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib"
-	fi
-
-	econf --enable-dynsysgmp \
-		--disable-xdr \
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
-		--enable-infodir=/usr/share/info \
-		$(use_enable readline) \
-		$(use_enable ansi) \
-		$(use_enable athena xgcl) \
-		$(use_with X x) \
-		${tcl}
-}
-
-src_compile() {
-	emake -j1
-	VARTEXFONTS="${T}"/fonts emake -C info gcl.info
-	if use athena; then
-		pushd xgcl-2 > /dev/null
-		pdflatex dwdoc.tex
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl"
-	if use ansi; then
-		cd ansi-tests
-
-		( make clean && make test-unixport ) \
-			|| die "make ansi-tests failed!"
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-			| ../unixport/saved_ansi_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-			|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
-			| ./bootstrapped_ansi_gcl
-
-		( ${make_ansi_tests_clean} && \
-			echo "(load \"gclload.lsp\")" \
-			| ./bootstrapped_r_ansi_gcl ) \
-			|| die "Phase 2, bootstraped compiler failed in tests"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	mv "${D}"usr/share/doc/*.dvi .
-	rm -rf "${D}"usr/share/doc
-	rm -rf "${D}"usr/share/emacs
-	rm -rf "${D}"usr/lib/gcl-*/info
-
-	rm doc/makefile elisp/add-defaults.el
-	dodoc readme* RELEASE* ChangeLog* doc/*
-	doman gcl.1
-	doinfo info/*.info*
-	dohtml -r info/gcl-si info/gcl-tk
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-		elisp-install ${PN} elisp/*.el
-	fi
-
-	docompress -x /usr/share/doc/${PF}/*.dvi
-	if use athena; then
-		dodoc xgcl-2/*.pdf
-		docompress -x /usr/share/doc/${PF}/*.pdf
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
index 8b07ee93371f..1529fde33026 100644
--- a/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="+ansi athena emacs +readline tk X"
 RESTRICT="strip"  #205803