gentoo resync : 10.04.2018

4 files changed, 13 insertions, 162 deletions

diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index f0a26a8e4828..3a0a35e0f5c3 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -6,11 +6,8 @@ AUX gcl-readline-6.3.patch 656 BLAKE2B 5e8fab31dacab80c1a01cbbf17de6d346556aa741
 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.11-fedora.tar.bz2 680715 BLAKE2B e4ac5c857c6782016b50fbd55fdbfd5f8b89d451518666216d8c2b2b197ebf85cd89bc7cb38ff096eeef3add4bd62f8c25f16548c90a0d46ba5a022c8bae50e5 SHA512 a38e92571c0558aebe1f36613afb6da29338b9c1b779df2db6b6e5ad5b79758523a2036dc4d29d192a19a1a71103c42022f165e1a138e469338afcc117599eb9
-DIST gcl-2.6.11.tar.gz 7047082 BLAKE2B 0fc843a7dc563c24d50a47d5f656c41cdab1aea8d8d1a9ed618b5a0b947e82bd05a98c0daa532988505501e7edd16780c33400b749f89c567664c3ad43e9151e SHA512 0cec0e0e138ec13bccd5e52b2f803ccc6be5afc3c284c26550abb4392488fd8cf0085d5c3a99d9a6aba24dc2f7160341c98741003d8d09728e99da1cd909b325
 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
-EBUILD gcl-2.6.10.ebuild 3915 BLAKE2B e989b79a2f261d8453803a2af7f1da641d5bd82a5d2a3d132f84969202e018ae2b582b5ebf09f6993c653a9cfbdb9115e74c96f7fcfd60079dd8d2077935d8e1 SHA512 fde90b244bbd20d2e5516637a6752cc1f1b5252dc4c582f4ee0e8ab782acb352ff0c88baf1eb029e992b03e88fccd6c6c9dd8469e52de5b457c24e82775aa348
-EBUILD gcl-2.6.11.ebuild 3756 BLAKE2B 035eca3372b0b3f033b3730718d0be60ac5ea99fbf50e53740a04f5c2c6f168eeff7f31c2abb3ff9a69d233699e88e8eff8ac27f5183843d32f8cf89f515a3eb SHA512 33b245fc258040e5307bb5af1ca6ac0e372ccbe1c128d29be56167a3257e5266f78aed48f30eeb7d61e880dbbccc888fd659d4d39626e7d7b701062913cca6fc
-EBUILD gcl-2.6.12.ebuild 3772 BLAKE2B a0620559515471c3ae856c9a943f981cb5bf4c30d6ee4de8c5e832423ca9595eb4fd94198a7f32c32c3d7758c17465b4684b8ccf34b15d178bdfbf9980be80f7 SHA512 753ad34500e1dbd4d9123728ba0613912e3e8f96b655e79499563d9e7082e2e5417dd063bc1afe38746508bc7b69c28a783063056e58648706ae7472c244897d
+EBUILD gcl-2.6.10.ebuild 3947 BLAKE2B 0cada794a497b2fea395346d15817a5927786ef88e128c8f2a4c71e1766790e96180041eafe121500ff0b4d30ea3f2fea5d887e85d1d2693903d94af601e4ead SHA512 873736e85fa7441a10f88909794932e7455e257cc38e757ab932137769c685dc8fd2258e2b5595f10016b732c14f3346a63ee42460cb20601a5acfc258d1b6c9
+EBUILD gcl-2.6.12.ebuild 3803 BLAKE2B e9e9e7cba81de6b7420a4416f015626af2648668570df173c886783b72fa995158f3f3344672251a1a67f618bd56cc419706d5204572b234c8c6d07ae70290b5 SHA512 3e249212546cbee31c91244cb7dc8d4a723a8fbf5417ff22760b3aac86643951c6897446e8c0b509de8761ee94e9b31d14cf6842371240a1bd780a0eba5a43a2
 MISC metadata.xml 721 BLAKE2B d1c370152589e9d172b4d5efaf7e20a546bba837e91671aa1ac2c3443905a129a97a9a0df10fb7a277e86ddd07fa00562004ed31f2fc0deb65000853729adb2d SHA512 b1517bb263ce834d3c98f3a24e9defbfc96b29c781624456b3967eef81d5586c4bc4c6d8d6fec3b392a4de4d81b9d60f5418ed6d00065f644db57c9613e4cd2a
diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
index 6b2fd2d6d601..55fc3ee2e422 100644
--- a/dev-lisp/gcl/gcl-2.6.10.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.10.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 inherit elisp-common eutils flag-o-matic
 
 DESCRIPTION="GNU Common Lisp"
@@ -17,10 +18,10 @@ IUSE="+ansi athena emacs +readline tk X"
 RESTRICT="strip"
 
 RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:= )
 	athena? ( x11-libs/libXaw )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
+	>=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}
@@ -85,7 +86,7 @@ src_configure() {
 
 src_compile() {
 	emake -j1
-	emake -C info gcl.info
+	VARTEXFONTS="${T}"/fonts emake -C info gcl.info
 	if use athena; then
 		pushd xgcl-2 > /dev/null
 		pdflatex dwdoc.tex
diff --git a/dev-lisp/gcl/gcl-2.6.11.ebuild b/dev-lisp/gcl/gcl-2.6.11.ebuild
deleted file mode 100644
index a49d2af852f7..000000000000
--- a/dev-lisp/gcl/gcl-2.6.11.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit elisp-common eutils 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"
-
-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? ( virtual/emacs )
-	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"
-
-S="${WORKDIR}"/${PN}
-
-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/selinux.patch
-	epatch "${WORKDIR}"/fedora/rename.patch
-	epatch "${WORKDIR}"/fedora/getcwd.patch
-	epatch "${WORKDIR}"/fedora/plt.patch
-	epatch "${WORKDIR}"/fedora/ellipsis.patch
-	epatch "${WORKDIR}"/fedora/reloc-type.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/largefile.patch
-	epatch "${WORKDIR}"/fedora/arm.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
-	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
-	rm -rf "${D}"usr/share/doc
-	rm -rf "${D}"usr/share/emacs
-
-	rm 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
-
-	insinto /usr/share/doc/${PF}
-	doins info/*.pdf
-	if use athena; then
-		pushd xgcl-2 > /dev/null
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild
index 1d4449e6009a..b8fee9e3528f 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,10 +17,10 @@ IUSE="+ansi athena emacs +readline tk X"
 RESTRICT="strip"
 
 RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:= )
 	athena? ( x11-libs/libXaw )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
+	>=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}
@@ -82,7 +82,7 @@ src_configure() {
 
 src_compile() {
 	emake -j1
-	emake -C info gcl.info
+	VARTEXFONTS="${T}"/fonts emake -C info gcl.info
 	if use athena; then
 		pushd xgcl-2 > /dev/null
 		pdflatex dwdoc.tex