use dobin instead of exeinto /usr/bin/ && doexe; swicth from base eclass to epatch

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

3 files changed, 40 insertions, 21 deletions

diff --git a/sci-mathematics/twelf/ChangeLog b/sci-mathematics/twelf/ChangeLog
index ef3bb56b222c..a7dddc775bbd 100644
--- a/sci-mathematics/twelf/ChangeLog
+++ b/sci-mathematics/twelf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/twelf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/ChangeLog,v 1.6 2014/08/10 20:24:19 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/ChangeLog,v 1.7 2015/03/21 20:56:43 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> twelf-1.7.1.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; swicth from base eclass to
+  epatch
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> twelf-1.7.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/sci-mathematics/twelf/Manifest b/sci-mathematics/twelf/Manifest
index 05253a920623..bb0c6cb0d1c9 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
@@ -9,13 +9,25 @@ AUX twelf-1.7.1-emacs-twelf-init.patch 813 SHA256 e3f2ffa9dc7e6c1d05a23ede172199
 AUX twelf-1.7.1-emacs-twelf.patch 602 SHA256 30a8fca3da1b64d06ecb7572c62f832fba7cb2c329d73f86aa74714eba8527ef SHA512 e5fd550210b7107fdafc27906dcb22318d1b0b6044d2502cfb968fb3b5d4baca5535cd6ae995638f38395d08641e59f5b87c76eac190653a6dad89bf52eb1a97 WHIRLPOOL 647290f3c6a42e5075baa78e6683a496b6e0472e0346e4ad85d91978f09c1d1137864452f7993e2a6bb99a6b24f4615099c4e8d09aa95deb53af483de37a6006
 AUX twelf-1.7.1-mlton-mlb.patch 11244 SHA256 cde36be7fa9c21871926cc772b3b16fcf0a8b842ee55f9d78f3f875a0927491a SHA512 2d0f42399e444cbb736f38ad7bdc54f51322c17c010b273c365d9db9a1e6c045c19b872d4b5c1e50444559a981aa5569764ac859c7702c116c97c935fd959bfd WHIRLPOOL 1ca8368e5b4a96a0e175b496f8958782f1b4ecfcd4e49c024f8e6f2f711ac4e4db6e615431facc6b3d7a09137f0a6ac26de5fa690c4daaa9add8434d1579ad06
 DIST twelf-src-1.7.1.tar.gz 1147610 SHA256 91b0d4d8c2e54452a042da0ff642f3b46b25efb36a84497aa8b96598f49a213a SHA512 1b4baa0f385b6b605583a9da312f23c775aab43e7398c6e151833a6b95c74112492530f44fcb7b14f8288774e9b63e2f9618a5debfbc4d34737bc2588f5850df WHIRLPOOL 231879beb66ff143acd3245c10b5e25a91994e67eb3b12aedd0e5a2378a94a2e1f3b29953b1ea24e98ca0063f27aff662cfdd1cea01163be435a6dbba1f0d2b9
-EBUILD twelf-1.7.1.ebuild 2476 SHA256 dbe7d425b812bf9628edfb4171a9a5e95e77bb4006a6704950a68c072b9ee9c1 SHA512 ed347ae96f4d967bca249c594aa943eae1795b31ffc1b635213bbd07f52787f107ec3d261e6adcae8b1cdb6c28b4d33fd8ea087360d1d9d5360359544dd1aabf WHIRLPOOL 9a285e6bb0e7d9a7630523e0ddff9ffaa58d4b6d7b11a23d51d4d8d50abfdd7d0bfac6ae745bcdff8dbc56d10868835994ac7f586d25a729cd57b72304365401
-MISC ChangeLog 1326 SHA256 368b1ae1729fed6c7b5201fba42a9f014f4bc522a0c08faee39c3f69096f0624 SHA512 6fc867748a40e2a93fe577817146c11eb79ddf5f32793796b8b4ccd00fd9e7685c104ac4114565f3c25e12baabd2b798deeefb011cd3756fd5d73d81c7cb8ef1 WHIRLPOOL 30805b07c54603896561669d205c8df470231d20e68928c8fe4e3e9a2833419c7819e1db91e1216b18ce4e5b099b95f515c8add3a584734021bb819213b2affd
+EBUILD twelf-1.7.1.ebuild 2421 SHA256 0424e2600f9f37f3776644dbdfb1b540fa187b8a1ddd5127040613d9dae055cf SHA512 e0a21a16da2de093a0243d3336e270a1b53cae1a1e75945d9f3628a2e7774b308a7a1de8b5c409be7170596fd797b731fe98e277471a79a488a1c20dc3246a75 WHIRLPOOL 8dd2fef400ebd8b0715d7d2903cc9a3dbbad7f5cc145f0f7b3a2a04ee70766eda54a15d3a910f68fe6a8104c8a1645b5b9bf653d70be72fa4b54dfc76b107724
+MISC ChangeLog 1479 SHA256 85abc565d663b5e5f26929a0a48db1449bc698a9fa7d4d2a74e0d68e6943b85d SHA512 1de52ef8577cb4bf9e1b8d4b4431aa143643d9008110875a944ecf4a23154e63fa589479f62ea59578880ac66601e00a4b78214d71f0c7b119a1c35ddf7c7a5b WHIRLPOOL 8137d222cfb3d29763d257a5c821a21ec788da579019b3505a60cde24f1c79052994a772541b92f8b6e77228e14d6402928d8a666b0e052a1393ec914a7c3309
 MISC metadata.xml 432 SHA256 fe7e64b383fa755021211928438dab6d5b0ea57a79e1c2f8622193e54e853cb3 SHA512 690da042d9e01ae1d2c553cf368e2d17a2ab13bfc115b89eb9aa845e6c98ee95128bce35ada87e543e82027f125e9a0395b7adb93a697f31d773b307561dd8a5 WHIRLPOOL 4e4d201eb356c45ac7f32a644c5334c65cb081ff3ca7d67347e89393a918f1c86825154642e3a677801c8d6d7d10286edc2e11c52f2f04d11e100be3bf9b00a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn1PQACgkQcaHudmEf86qYhgCdF+woMF+sfdmOhgV5tQeRM+o0
-1FkAn1d18u8AclIOKRsKUd82W7EZzklr
-=Vlsw
+iQJ8BAEBCgBmBQJVDdsMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirqOYP/iAXv5oVU4UJeeiI3xKltWnF
+aO73T4wRDJaAF3TKxIBNqbxAP6GuQKJlZoVr4MGlObjfywKHZQU1D+idmKiX1xmY
+R/A5QedAyzCUn5ECRbkGqDBIrs8HfgAUSOrfquU8THh8Na5z7WzS6wpwqMdr3l0j
+TNJsfzPdiITlsnTNZQ2EaZJuPQBc/Wmptk3IW5MTqjuvZQ49YuyFVPfRbZ3vQAv2
+q4jLp4ap/dVRRvk79p4/GorisJqAP5wS0xM2+FsYncYQdpXwjQfwHgEnm1Df9j/Q
+oesg4Z6oeEAGAh2FjTlCaP7V0NDvlEXaMhUlTeSJBv4UPK3dzYzxZ6X+bhoQRgdY
+z6iWwurGCnW3OKGLUSFHrizjlDB9ycJYeySUe5ayNrHK7eE1gmzS76o3szBGJpi0
+TZzUJhYnkXtYyekTmPqwOo0oIWUgw5I6h7RTQXecaNZQb2pQsmPXcliOkqkfloK2
+zdAQ4nvSkWfyCJFP6Zw0SQSCtni7XcD7Acl6qOEU/Yh4QbVn4s7OtYnVksK7idWT
+K+S/vJ2+mfkkpToNuupoVlv9GTSSqhRoWKNHkiWNI3yv2n5d0PbgNHRjqhTmLqxo
+EuOyqatRHMkoKxmAybLshqI/Ht9K5QBXWF5CLC7D9i/Wn/uZrc5LNOTYQfD9LuD1
+wojjbeiOF1P5kr3ub7jB
+=Sw0r
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index 19edebe52e46..60579a649606 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-2014 Gentoo Foundation
+# Copyright 1999-2015 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.5 2014/08/10 20:24:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.6 2015/03/21 20:56:43 jlec Exp $
 
 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,10 +17,12 @@ 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
+RDEPEND="
+	dev-lang/mlton
 	doc? (
 		virtual/latex-base
 	)
@@ -33,16 +35,19 @@ S=${WORKDIR}/${PN}
 
 SITEFILE=50${PN}-gentoo.el
 
-PATCHES=("${FILESDIR}/${PN}-1.7.1-doc-guide-twelf-dot-texi.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"
-	"${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch")
+	"${FILESDIR}/${PN}-1.7.1-mlton-mlb.patch"
+	)
 
 src_prepare() {
-	base_src_prepare
-	sed -e "s@/usr/bin@${ROOT}usr/bin@g" \
+	epatch ${PYTCHES[@]}
+	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"
@@ -68,7 +73,6 @@ src_compile() {
 }
 
 ins_example_dir() {
-	dodir "/usr/share/${PN}/examples/${1}"
 	insinto "/usr/share/${PN}/examples/${1}"
 	pushd "${S}/${1}"
 	doins -r *
@@ -86,8 +90,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