sci-mathematics/twelf: Punt base.eclass

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 40 insertions, 37 deletions

diff --git a/sci-mathematics/twelf/ChangeLog b/sci-mathematics/twelf/ChangeLog
index fccde8be218d..81e2415c8824 100644
--- a/sci-mathematics/twelf/ChangeLog
+++ b/sci-mathematics/twelf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/twelf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/ChangeLog,v 1.3 2013/05/24 05:51:46 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/ChangeLog,v 1.4 2014/01/06 14:26:39 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> twelf-1.7.1.ebuild,
+  metadata.xml:
+  Punt base.eclass
 
   24 May 2013; Mark Wright <gienah@gentoo.org> metadata.xml:
   fix bug 466776 - typo in email address
diff --git a/sci-mathematics/twelf/metadata.xml b/sci-mathematics/twelf/metadata.xml
index 6276cbc1b189..aa2d0983be79 100644
--- a/sci-mathematics/twelf/metadata.xml
+++ b/sci-mathematics/twelf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>gienah@gentoo.org</email>
-  <name>Mark Wright</name>
-</maintainer>
-<longdescription lang='en'>
+  <maintainer>
+    <email>gienah@gentoo.org</email>
+    <name>Mark Wright</name>
+  </maintainer>
+  <longdescription lang="en">
 Twelf is an implementation of the logical framework LF. It is used for
 logic programming and for the formalization of programming language
 theory.
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index 317eab7b26e4..827219ba8459 100644
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.2 2012/12/12 13:12:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.3 2014/01/06 14:26:39 jlec Exp $
 
-EAPI="5"
+EAPI=5
 
-inherit base elisp-common multilib
+inherit elisp-common eutils multilib
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="Twelf is an implementation of the logical framework LF."
+DESCRIPTION="Implementation of the logical framework LF"
 HOMEPAGE="http://twelf.org/"
 SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz"
 
@@ -17,31 +17,32 @@ 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
-	doc? (
-		virtual/latex-base
-	)
-	emacs? (
-		virtual/emacs
-	)"
+RDEPEND="
+	dev-lang/mlton
+	doc? ( virtual/latex-base )
+	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")
+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
+	)
 
 src_prepare() {
-	base_src_prepare
-	sed -e "s@/usr/bin@${ROOT}usr/bin@g" \
+	epatch ${PATCHES[@]}
+	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"
@@ -50,26 +51,25 @@ src_prepare() {
 src_compile() {
 	emake mlton CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
+		pushd "${S}/emacs" > /dev/null || 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
+		popd > /dev/null
 	fi
 	if use doc; then
-		pushd doc/guide
+		pushd doc/guide > /dev/null || die
 		emake all
-		popd
+		popd > /dev/null
 	fi
 }
 
 ins_example_dir() {
-	dodir "/usr/share/${PN}/examples/${1}"
 	insinto "/usr/share/${PN}/examples/${1}"
-	pushd "${S}/${1}"
+	pushd "${S}/${1}" > /dev/null || die
 	doins -r *
 	popd
 }
@@ -85,8 +85,7 @@ src_install() {
 		ins_example_dir examples-clp
 		ins_example_dir examples-delphin
 	fi
-	exeinto /usr/bin
-	doexe bin/twelf-server
+	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
@@ -96,9 +95,9 @@ src_install() {
 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"))'
+		elog "For twelf emacs, add this line to ~/.emacs"
+		echo ""
+		elog '(load (concat twelf-root "/twelf-init.el"))'
 	fi
 }