sci-mathematics/twelf: Punt base.eclass

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 58 insertions, 45 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/Manifest b/sci-mathematics/twelf/Manifest
index bb71a9c1cea1..6fe0fdde74f2 100644
--- a/sci-mathematics/twelf/Manifest
+++ b/sci-mathematics/twelf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50twelf-gentoo.el 104 SHA256 1d3382c18895a3f5a6b4c1aebc5d9fc2d2aa94a7c196d5b5ccc9a7bc27a1498d SHA512 b6bd1f73b2224c37f783d0b2cdb16cd4e5435280c7448fd7600398ab2806edb574ec4e811adf26bfc1fbc9d0c311dbb521022b2a9dacbfecfa1ffef488c764bb WHIRLPOOL dea650f36310f83a8b4d3ac51cebb19054e48279e589b4080fbd145f5678be2c0555f1594a28443eebe118873639abf933e58a5ac7f510b1c06397d8248876b5
 AUX twelf-1.7.1-Makefile.patch 1298 SHA256 77038dabdd5fc990d78cba18ce42f598a2ec5a94c85a38ff6e15b08b2517853a SHA512 ffc7c147790b180c50eb645b896ad86c35b771ad516d2a85998f8edfd0e1ff1db98d1880b6e8b02e4ddcf8f218761ab26ddfee9bd5ab876b3bd1caa6a3e0e78e WHIRLPOOL ef6e408c659284ea647692fd73dfb9512138ec1287364bd59fac255e7ae6fcec1ac94233c5fd2e695bf03ee73a7b2607d1e00437d97815f8fe3c4d6dc0bebcfa
@@ -8,13 +8,23 @@ AUX twelf-1.7.1-doc-guide-twelf-dot-texi.patch 386 SHA256 a21601d5ee953358fc155a
 AUX twelf-1.7.1-emacs-twelf-init.patch 813 SHA256 e3f2ffa9dc7e6c1d05a23ede172199a005411be3061e3d3dab65fcb126db4afe SHA512 b45415b57dee44da7a38ea1f40b58526f0f69d012a16c316ebd6c3c9c856bbffd270f034d172b4ddeb083b7289c87eabf805a96fc9475f501038fb6c85a0f571 WHIRLPOOL c48647209e071b8795fdfb8be44c8397ed814a219dba58801cccb82626025ea1b6132289f63b9d475162df3ab0365b88f38e6b797d557047872e1e9c1e0f6aff
 AUX twelf-1.7.1-emacs-twelf.patch 602 SHA256 30a8fca3da1b64d06ecb7572c62f832fba7cb2c329d73f86aa74714eba8527ef SHA512 e5fd550210b7107fdafc27906dcb22318d1b0b6044d2502cfb968fb3b5d4baca5535cd6ae995638f38395d08641e59f5b87c76eac190653a6dad89bf52eb1a97 WHIRLPOOL 647290f3c6a42e5075baa78e6683a496b6e0472e0346e4ad85d91978f09c1d1137864452f7993e2a6bb99a6b24f4615099c4e8d09aa95deb53af483de37a6006
 DIST twelf-src-1.7.1.tar.gz 1147610 SHA256 91b0d4d8c2e54452a042da0ff642f3b46b25efb36a84497aa8b96598f49a213a SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df WHIRLPOOL 231879beb66ff143acd3245c10b5e25a91994e67eb3b12aedd0e5a2378a94a2e1f3b29953b1ea24e98ca0063f27aff662cfdd1cea01163be435a6dbba1f0d2b9
-EBUILD twelf-1.7.1.ebuild 2425 SHA256 7096d15d012ca2f1d8195f7fa6de607a7aa36ebeacf84eee0edc0de649253e34 SHA512 1a592ebb11662239593bf24977a829e5af2c40ca14ce6271a61c13ec0a18b6b629f3e74ed0000b349d30b4bfd61281e21d19ed06227687da6a2827d3d5833aee WHIRLPOOL 7ce71e14687feeb59b01162b0054299f2515efc072ab8d4097b01bdb594092124343056695b2a300af455e32a49db32f156df769831e954bf503a931c9739bfe
-MISC ChangeLog 863 SHA256 40baaaab14437c6af96dad627f5a386ad8b1a6344a0e73e370fb97ff7998893a SHA512 26f0595a5be5d37729ad23ef5f34d36ff73ae74718d8373c2487055ca6840804d1b6996bc0c4ee20e430bc038790f5f21942f5db30543a1adff03bd15b2e8e78 WHIRLPOOL 0fe47bfc0263f3ce3c9bfdab5b5d178f902dacac9706b653bc5af5bad4153e220fc0d1dbfb8a9958ce51483aff6d5c48aafc6fede9bb8635ddf4c3a915e7e8df
-MISC metadata.xml 422 SHA256 095d37f2dbcb940225786f3551d22fbea8c255059098561e11a823af336b45e1 SHA512 fdfced11b9be43fcca2e2f09181c545a038c30df83a7372f2a8eceb20de7410d9684299111c90c8f360beb62e749bb225e295283b39331e73fa4e0d8e84b2dac WHIRLPOOL ce25499639ee73c8d5a2147c2768329c3ff7e273cf385146896b8b2e84004707570b936ac378c519928bc7ab372134fd8b6c495b9ced7ce4da581735c030f62f
+EBUILD twelf-1.7.1.ebuild 2432 SHA256 9238e5fdb6b7479dc3b4820fbe7b36578cfe455103ec6ba362809b1fe5cd5eb6 SHA512 32ce2ff7d023448d02fa9a76e4442cdc913b6c236a9b73ccb1bf1dc03ae6092f7db4253566570d626b2c944fe45838f7fbb3eb00198abeed579c5cecdfc1d85d WHIRLPOOL 7633a733a4054e07ae25a28f864e60531bd70136b128b70d3fc9482f8a7696e50a3f8441f887c5128cdd69bb463b96456d8cee5fed6a68a64b469fc54dd82cde
+MISC ChangeLog 964 SHA256 6d2b2684a32499d0c3a29dbc2dbd66d0abcff67f4ba9ad5b59775549ae374194 SHA512 7b6d88de2fa75fa80c999258bba242e41232b992a05c608904d70733390ef44e63e8cf3d9786f549dbc78abe9f6c90ec9c17ef83068b6f1cb5786832eb3fbb2d WHIRLPOOL 276271c0785adc0cdc38b995da0f753f663bcef6c0b621ec9cb055999755d561d45dd226fc16fa1deca22060f9d1c35ed962ffdce0a4a2e47db91dd8a2663a52
+MISC metadata.xml 432 SHA256 fe7e64b383fa755021211928438dab6d5b0ea57a79e1c2f8622193e54e853cb3 SHA512 690da042d9e01ae1d2c553cf368e2d17a2ab13bfc115b89eb9aa845e6c98ee95128bce35ada87e543e82027f125e9a0395b7adb93a697f31d773b307561dd8a5 WHIRLPOOL 4e4d201eb356c45ac7f32a644c5334c65cb081ff3ca7d67347e89393a918f1c86825154642e3a677801c8d6d7d10286edc2e11c52f2f04d11e100be3bf9b00a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlGe/1YACgkQoBEVQmGOlx8RrwEA3LnPbm3qJHqGADBSt/qKnRtz
-mjT2nJG1Tes1lacuwZgA/19loHn+0NSQJUDT4SPAJ/kQSlDcMlXx0ZK+TvqbyEH3
-=4iHU
+iQIcBAEBCgAGBQJSyr0gAAoJELnU8jG9FVircxIQAIgOr0jvolYKQuGFKYxRl4ko
+2UqJITvrLZXy4zCrxt99QB651H2MlOKOMH6kgpVzy06uy6PoquajNkBVODGvW1Pm
+eo9RACUxB4A5NWnRJf4/6nKTWY373pARwsCMe2ROZ+i7gvImBQwCzNrdsmf3VC41
+eWtIb3Ltu+0n1IX6XuJwtFtekvjlsTlMl2EYm+ONcagvtjuxXTIZjnh9PpjJQhVL
++AlKDKyvzP8+2pgHIcVI4Ez+GtC1oIUDGPzqRv9yiWu/bOExyAb3RTZwcEvIvUle
+mbLg4OrhYyTNfz8S0LPvw7TNPXdPGt3HN3ODKrPCJ/2OJ3BBcs/O/SF+UKeJ6ZeK
+alzow61u68K3rUfBc2h8nh+U89r79wR/kRNYXvrJM1cNQQf61069jGoaxkavvyPe
+oT8rdB8r9DwYqz8Vy6ZQ9iZI1dgTxeB1FH63IJ8O16nASkKUB/ynBqt7lHhM9mq8
+RT6jgIKImefUaP5VwvkyPIAjEr2cBScrJlVOveD5/o2RYK5anfeeqeHGVEtz72Zz
+tcRX6UIg+4qN3mHHlJ+By2/8QiIJacyPpU7CcBmjDV0cxN373NXytIElztRRtMS0
+RXnP2rOl4bJhCeOfnnL8AIdD7iuZgUEN4UD8NyYFFjjP0IrmC2exukxra4q15yAU
+4YdSlJeGphWA/wgeoJBI
+=VAID
 -----END PGP SIGNATURE-----
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
 }