commit: b9158c1f69eaa08468fb2a7bb40ca742773e1b20 Author: Mark Wright <gienah <AT> gentoo <DOT> org> AuthorDate: Sat Mar 10 23:58:41 2018 +0000 Commit: Mark Wright <gienah <AT> gentoo <DOT> org> CommitDate: Sat Mar 10 23:58:41 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9158c1f
sci-mathematics/twelf: Fix 622848 in 1.7.1-r1 by requiring mlton 20180207. Fix 630782. Thanks to Toralf Forster for reporting. Closes: https://bugs.gentoo.org/622848 Closes: https://bugs.gentoo.org/630782 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../twelf/files/twelf-1.7.1-mlton-20180207.patch | 11 +++++++++++ .../{twelf-1.7.1.ebuild => twelf-1.7.1-r1.ebuild} | 19 +++++++++++-------- sci-mathematics/twelf/twelf-1.7.1.ebuild | 12 +++++++----- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/sci-mathematics/twelf/files/twelf-1.7.1-mlton-20180207.patch b/sci-mathematics/twelf/files/twelf-1.7.1-mlton-20180207.patch new file mode 100644 index 00000000000..823d3e37a8d --- /dev/null +++ b/sci-mathematics/twelf/files/twelf-1.7.1-mlton-20180207.patch @@ -0,0 +1,11 @@ +--- twelf-orig/Makefile 2018-03-06 23:30:35.055598250 +1100 ++++ twelf/Makefile 2018-03-06 23:24:44.403762472 +1100 +@@ -11,7 +11,7 @@ + polyml = poly + smlnj = sml + oldnj = sml +-mlton = mlton -default-ann 'nonexhaustiveMatch ignore' ++mlton = mlton -disable-ann nonexhaustiveMatch + make = make + + twelfdir = `pwd` diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild similarity index 86% copy from sci-mathematics/twelf/twelf-1.7.1.ebuild copy to sci-mathematics/twelf/twelf-1.7.1-r1.ebuild index 02712b874f0..56b41fcc37e 100644 --- a/sci-mathematics/twelf/twelf-1.7.1.ebuild +++ b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit elisp-common eutils multilib @@ -21,7 +21,7 @@ IUSE="doc emacs examples" RESTRICT="test" RDEPEND=" - dev-lang/mlton + >=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html @@ -42,10 +42,11 @@ PATCHES=( "${FILESDIR}/${PN}-1.7.1-emacs-twelf-init.patch" "${FILESDIR}/${PN}-1.7.1-Makefile.patch" "${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch" + "${FILESDIR}/${PN}-1.7.1-mlton-20180207.patch" ) src_prepare() { - epatch "${PATCHES[@]}" + default sed \ -e "s@/usr/bin@${ROOT}usr/bin@g" \ -e "s@/usr/share@${ROOT}usr/share@" \ @@ -91,10 +92,12 @@ src_install() { ins_example_dir examples-delphin fi dobin bin/twelf-server - dohtml doc/html/index.html - doinfo doc/guide/twelf.info - dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf - dohtml doc/guide/twelf/* + if use doc; then + local DOCS=( doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf ) + local HTML_DOCS=( doc/html/index.html doc/guide/twelf/. ) + doinfo doc/guide/twelf.info + einstalldocs + fi } pkg_postinst() { diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild index 02712b874f0..f9334067c38 100644 --- a/sci-mathematics/twelf/twelf-1.7.1.ebuild +++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -91,10 +91,12 @@ src_install() { ins_example_dir examples-delphin fi dobin bin/twelf-server - dohtml doc/html/index.html - doinfo doc/guide/twelf.info - dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf - dohtml doc/guide/twelf/* + if use doc; then + dohtml doc/html/index.html + doinfo doc/guide/twelf.info + dodoc doc/guide/twelf.dvi doc/guide/twelf.ps doc/guide/twelf.pdf + dohtml doc/guide/twelf/* + fi } pkg_postinst() {
