[gentoo-commits] proj/lisp:master commit in: dev-lisp/alexandria/, dev-lisp/alexandria/files/

[gentoo-commits] proj/lisp:master commit in: dev-lisp/alexandria/, dev-lisp/alexandria/files/

[José María Alonso]

commit:     486aa5c849f596fa48e3a475b3b972ef55a6927c
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 23:15:33 2016 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 23:15:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=486aa5c8

dev-lisp/alexandria: Fixes docs generation

 dev-lisp/alexandria/alexandria-9999.ebuild         | 16 ++++++------
 .../files/alexandria-fix-docstrings.patch          | 29 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/dev-lisp/alexandria/alexandria-9999.ebuild b/dev-lisp/alexandria/alexandria-9999.ebuild
index 9bd375f..255b8d9 100644
--- a/dev-lisp/alexandria/alexandria-9999.ebuild
+++ b/dev-lisp/alexandria/alexandria-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit common-lisp-3 git-2
+inherit common-lisp-3 git-r3 eutils
 
 DESCRIPTION="A collection of public domain utilities."
 HOMEPAGE="http://common-lisp.net/project/alexandria/"
@@ -17,20 +17,18 @@ IUSE="doc"
 DEPEND="doc? ( sys-apps/texinfo )"
 RDEPEND=""
 
-builddoc() {
-	if use doc ; then
-		cd doc || die
-		emake
-	fi
+src_prepare() {
+	default
+	epatch "${FILESDIR}/${PN}-fix-docstrings.patch"
 }
 
 src_compile() {
-	use doc && builddoc
+	use doc && emake -C doc
 }
 
 src_install() {
 	common-lisp-install-sources -t all *.lisp LICENCE
 	common-lisp-install-asdf
 	dodoc README AUTHORS
-	use doc && doinfo doc/${PN}.info && dohtml doc/${PN}.html && dodoc doc/${PN}.pdf
+	use doc && doinfo doc/${PN}.info && dodoc doc/{"${PN}.html","${PN}.pdf"}
 }

diff --git a/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch b/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch
new file mode 100644
index 0000000..747c9e3
--- /dev/null
+++ b/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch
@@ -0,0 +1,29 @@
+diff -Nuar a/doc/docstrings.lisp b/doc/docstrings.lisp
+--- a/doc/docstrings.lisp	2016-12-11 00:04:21.272877121 +0100
++++ b/doc/docstrings.lisp	2016-12-11 00:05:03.752876882 +0100
+@@ -718,7 +718,7 @@
+             ;; sbcl.texinfo defines macros that expand @&key and friends to &key.
+             (mapcar (lambda (name)
+                       (if (member name lambda-list-keywords)
+-                          (format nil "@~A" name)
++                          (format nil "~A" name)
+                           name))
+                     (lambda-list doc)))))
+ 
+@@ -833,11 +833,11 @@
+   (flet ((macro (name)
+                  (let ((string (string-downcase name)))
+                    (format *texinfo-output* "@macro ~A~%~A~%@end macro~%" string string))))
+-    (macro '&allow-other-keys)
+-    (macro '&optional)
+-    (macro '&rest)
+-    (macro '&key)
+-    (macro '&body)))
++    (macro 'allow-other-keys)
++    (macro 'optional)
++    (macro 'rest)
++    (macro 'key)
++    (macro 'body)))
+ 
+ (defun generate-includes (directory packages &key (base-package :cl-user))
+   "Create files in `directory' containing Texinfo markup of all