gentoo resync : 20.03.2022

3 files changed, 15 insertions, 21 deletions

diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 5ea283f36d27..52d111be4b02 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -10,7 +10,7 @@ DIST gcl-2.6.10.tar.gz 5490689 BLAKE2B 46af0cf8a810a82fe2bc2bd46ca1cbe17b74c71eb
 DIST gcl-2.6.12-fedora.tar.bz2 680471 BLAKE2B 0ad96ce0a09bb73ee77456373eb7e50b2325a4f2e042c21120a1c33b2dec2aa10f5485bb1b02e8eb8e77aaaea6e141189d676217f9d139615911d8a77ea5818a SHA512 7640f8370754c889e2db9d047c4476195f949f4d97eafc7ef81761c1a548e24125d6d93381227b55f1840c3d127770995e88bf66f83c6952e121f5fa004e7f1a
 DIST gcl-2.6.12.tar.gz 7031837 BLAKE2B afd3f81dd8a712d92883a96399a2e0621b0d38a349904707846bd694892510012fde27f94ec36664c249659a480e7f92c412b3790ecb74247a91ba0cb44aa420 SHA512 e82b5bdded6f846de4ea35a83bc8294043ba6d4fe03ff421f8753e78add1e5e87124782f672cd38ad89bbec1ca7c5ff69fe2621be1552b209516b58b6c97fd20
 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.10.ebuild 3928 BLAKE2B bcc3e1b8b37323e6ef6740664d28191923cd69a59267ae0c8eeda8aa6d9a844a39b2ee9339d945a9a27e93b5294fb845268dba34fd826e4d203592ea68aa7768 SHA512 abb82bdd5ab6ed06111a29eaaf325636d4e3bde64c8f53b6b208783e702dc9be6f7389e1ac06978648547f3c9b90fafffdaf1647949ab1e102946044cd1db96c
+EBUILD gcl-2.6.12.ebuild 3839 BLAKE2B 8e3f5c1d9620112c79b7604f9beeef8d41d8a8e3337d0bc4c170a61f79d80cbd1b78d389a2c0293f6bad1f11e9bf178108d8ab8052896a0e5d1b1685ba2acfa7 SHA512 11bdbaaec48e3d7a1264c0ddca91b041b0b16a70a2b1530d80e98def9466d83399e8cb74e1446f4add1bcc238e6e9f954829f19e540d36300d841154b71133a7
 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/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
index 0216a90d7973..47a5f441a32c 100644
--- a/dev-lisp/gcl/gcl-2.6.10.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.10.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=5
@@ -8,6 +8,7 @@ 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"
@@ -29,8 +30,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-1.64
 	>=sys-devel/autoconf-2.52"
 
-S="${WORKDIR}"/${PN}
-
 src_prepare() {
 	mv "${WORKDIR}"/fedora/info/* info/
 	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
@@ -134,13 +133,10 @@ src_install() {
 		elisp-install ${PN} elisp/*.el
 	fi
 
-	insinto /usr/share/doc/${PF}
-	doins *.dvi
+	docompress -x /usr/share/doc/${PF}/*.dvi
 	if use athena; then
-		pushd xgcl-2 > /dev/null
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		popd > /dev/null
+		dodoc xgcl-2/*.pdf
+		docompress -x /usr/share/doc/${PF}/*.pdf
 	fi
 }
 
diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
index 33b27a39d040..37a0306ac5f1 100644
--- a/dev-lisp/gcl/gcl-2.6.12.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.12.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=5
@@ -7,10 +7,11 @@ 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 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="+ansi athena emacs +readline tk X"
 
 # See bug #205803
@@ -28,8 +29,6 @@ DEPEND="${RDEPEND}
 	>=app-text/texi2html-1.64
 	>=sys-devel/autoconf-2.52"
 
-S="${WORKDIR}"/${PN}
-
 src_prepare() {
 	mv "${WORKDIR}"/fedora/info/* info/
 	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
@@ -130,13 +129,12 @@ src_install() {
 		elisp-install ${PN} elisp/*.el
 	fi
 
-	insinto /usr/share/doc/${PF}
-	doins info/*.pdf
+	dodoc info/gcl-{si,tk}.pdf
+	docompress -x /usr/share/doc/${PF}/gcl-{si,tk}.pdf
+
 	if use athena; then
-		pushd xgcl-2 > /dev/null
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		popd > /dev/null
+		dodoc xgcl-2/dwdoc.pdf
+		docompress -x /usr/share/doc/${PF}/dwdoc.pdf
 	fi
 }