gentoo resync : 13.03.2018

4 files changed, 135 insertions, 6 deletions

diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index 822445dae902..974e439b52b8 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -4,7 +4,9 @@ AUX twelf-1.7.1-doc-guide-Makefile.patch 498 BLAKE2B 68b3831aefab24bb6b194e64092
 AUX twelf-1.7.1-doc-guide-twelf-dot-texi.patch 386 BLAKE2B 3ce663a6c06fc8af04f16cf190d76e0c113e41263fbdc9a74a61d9a4ea9c3067659b417569b0d11d50cf16baca9aa91bac66e74f75a681e2704d2c7fef969d30 SHA512 60741e8df6e2b200f22c435ccf2d092624b601ad71ffc1a3388e9ae1bca6ef0d92092940075d9786efed6218d82cf1a344d3a433eabbdabe2514ff985a6948b7
 AUX twelf-1.7.1-emacs-twelf-init.patch 813 BLAKE2B ab5708bc5c259ed940eb2d427e190a3f3ed2e0624745aef0f08cb3ba42ae6ed1d37668cff37752480de8e5e42b8ed5f786dc14d2aa6be3a522a51ca4d380d054 SHA512 b45415b57dee44da7a38ea1f40b58526f0f69d012a16c316ebd6c3c9c856bbffd270f034d172b4ddeb083b7289c87eabf805a96fc9475f501038fb6c85a0f571
 AUX twelf-1.7.1-emacs-twelf.patch 602 BLAKE2B b4b7572bd3b87013332e26096aa92a698e0a1a7648021b93cf0db2e4443da6fd43a6b8909703e21e748c37b774d5c93cd1bc6bcf342354ee47fc1d8b4c94084a SHA512 e5fd550210b7107fdafc27906dcb22318d1b0b6044d2502cfb968fb3b5d4baca5535cd6ae995638f38395d08641e59f5b87c76eac190653a6dad89bf52eb1a97
+AUX twelf-1.7.1-mlton-20180207.patch 310 BLAKE2B b372c7ca65b4bb12983d84e590d4e303e4b41308ad6f6ccb3f28101e78e18a7138cb5a65011eeec8f04ba990e29804ec02d3faf11e4c6ca998f40f419bca3472 SHA512 4d8044248a28d92e961baa1a935de8f6f52751218e65abd2cae9a264c66e446608d73d6a993df07671330b003735d2fee4e75653e9a324844a0042333b28fdd1
 AUX twelf-1.7.1-mlton-mlb.patch 11244 BLAKE2B e07adfd1520179a8ca3c292638689c8cc344b8d01ebcf2ba9f668cbf2afa5b5132a88d0521ca4123a9165d8fea49cdbab20b48b791bd3e78610d54b534e9e596 SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd
 DIST twelf-src-1.7.1.tar.gz 1147610 BLAKE2B 9fbb3c5a4823845a0c721112744330658be0e68784ef209a3d17fb72874ef50d7dbb434a7104704a5540f2f0bc30727bfe1ff602f986570f944454e77c24609d SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df
-EBUILD twelf-1.7.1.ebuild 2330 BLAKE2B 8098ac3d117e19c0fbdfbeca003e4235feaabbdd644b26392d8e47af33acd6c18e0aed5c6818912d7e83a2858ca61f87a842f65b8caec7fd1373a185e2849dc6 SHA512 e8554e14b6f5f87e1a7f810ec62d6e1e3e597944a98ee322fc022ce922331e1d0e39b7d910e1ec7ea8f6a2de079f6940f3e4dc7fc53fe5f4354dda3bba38b170
+EBUILD twelf-1.7.1-r1.ebuild 2428 BLAKE2B 5c7fc4a2d9d7df7526d5831a25d60add7187e871f17908a566d0089b023fede5001717876ecb3ad7e194e7aca0f9d68fad920a12e7c47c41f11d709e2e306331 SHA512 13352c5bc97c7827e8593f4c9f5c093385a039f4194a9ee78df525afb03254283f5a55b0e2abab7c35175433b078d5f648446bd9ae9a64331ca68f6b3fdefd08
+EBUILD twelf-1.7.1.ebuild 2356 BLAKE2B 7d1142527e925458868d2453c73a542f59419beb0752c7080475a04e3094cdad76ce0b34f378fc7b1ca66a0e05dfbac197fbaa1dcea9d38e443981af5e33ea47 SHA512 d34f450bed992b729272b78f61bb1cda0b0b88903331690d8d21d9a511300ddcf01a5f3c796798b4919c0040aabb30759ad08b003cf19c5820b55ac185a4edf9
 MISC metadata.xml 446 BLAKE2B 318daa8b8e87beff1553a9e49e7db737736b8bad6f157753f42dd8fcfa0941dd83273cab94c056ab4e9555019263f1356e99baea1ef4dbca1da2df3d8f096ec7 SHA512 7fcca73104456672c8e262129cdcc232073d6d0a4cd48d6593734646a3611ac6056325cc88be5c3a3585d67bc76fa9fb663a0171df7b84612c56c0ec93bc0e2e
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() {