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

3 files changed, 132 insertions, 5 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 000000000000..823d3e37a8d8
--- /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-r1.ebuild b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..56b41fcc37e9
--- /dev/null
+++ b/sci-mathematics/twelf/twelf-1.7.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp-common eutils multilib
+
+MY_PN="${PN}-src"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementation of the logical framework LF"
+HOMEPAGE="http://twelf.org/"
+SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2"
+IUSE="doc emacs examples"
+
+# tests reference non-existing directory TEST
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-lang/mlton-20180207
+	doc? (
+		virtual/latex-base
+		app-text/texi2html
+	)
+	emacs? (
+		virtual/emacs
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.patch"
+	"${FILESDIR}/${PN}-1.7.1-doc-guide-Makefile.patch"
+	"${FILESDIR}/${PN}-1.7.1-emacs-twelf.patch"
+	"${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() {
+	default
+	sed \
+		-e "s@/usr/bin@${ROOT}usr/bin@g" \
+		-e "s@/usr/share@${ROOT}usr/share@" \
+		-i "${S}"/emacs/twelf-init.el \
+		|| die "Could not set ROOT in ${S}/emacs/twelf-init.el"
+}
+
+src_compile() {
+	emake mlton CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -fno-PIE"
+	if use emacs ; then
+		pushd "${S}/emacs" || die "Could change directory to emacs"
+		elisp-compile \
+			auc-menu.el \
+			twelf-font.el \
+			twelf-init.el \
+			twelf.el \
+			|| die "emacs elisp compile failed"
+		popd
+	fi
+	if use doc; then
+		pushd doc/guide
+		emake all
+		popd
+	fi
+}
+
+ins_example_dir() {
+	insinto "/usr/share/${PN}/examples/${1}"
+	pushd "${S}/${1}"
+	doins -r *
+	popd
+}
+
+src_install() {
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.{el,elc}
+		cp "${FILESDIR}"/${SITEFILE} "${S}"
+		elisp-site-file-install ${SITEFILE}
+	fi
+	if use examples; then
+		ins_example_dir examples
+		ins_example_dir examples-clp
+		ins_example_dir examples-delphin
+	fi
+	dobin bin/twelf-server
+	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() {
+	if use emacs; then
+		elisp-site-regen
+		ewarn "For twelf emacs, add this line to ~/.emacs"
+		ewarn ""
+		ewarn '(load (concat twelf-root "/twelf-init.el"))'
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index 02712b874f0f..f9334067c389 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() {