From 4fd9cae04eb91d99219197391bfb9764202b187c Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Mon, 9 Jan 2012 13:49:21 +0000 Subject: Thanks to few_ and xarthisius for reviewing, remove pdf use flag, add || die to cd/pushd and tests. Require polyml with -portable. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- sci-mathematics/isabelle/ChangeLog | 6 +++- sci-mathematics/isabelle/Manifest | 10 +++---- sci-mathematics/isabelle/isabelle-2011.1.ebuild | 40 +++++++++++-------------- 3 files changed, 27 insertions(+), 29 deletions(-) (limited to 'sci-mathematics') diff --git a/sci-mathematics/isabelle/ChangeLog b/sci-mathematics/isabelle/ChangeLog index 759d5478e73d..c5bb9e0742e8 100644 --- a/sci-mathematics/isabelle/ChangeLog +++ b/sci-mathematics/isabelle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/isabelle # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.1 2012/01/08 12:35:43 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.2 2012/01/09 13:49:21 gienah Exp $ + + 09 Jan 2012; Mark Wright isabelle-2011.1.ebuild: + Thanks to few_ and xarthisius for reviewing, remove pdf use flag, add || die + to cd/pushd and tests. Require polyml with -portable. *isabelle-2011.1 (08 Jan 2012) diff --git a/sci-mathematics/isabelle/Manifest b/sci-mathematics/isabelle/Manifest index 75dbaf4960fe..d3bbf11f9652 100644 --- a/sci-mathematics/isabelle/Manifest +++ b/sci-mathematics/isabelle/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 AUX isabelle-2011.1-graphbrowser.patch 358 RMD160 debe029504aad72c611f783569ca6e5e07d6fcfa SHA1 5067aa4f60a9185d6b7ca2e4d9511dd93ed6f239 SHA256 3c4a1567e06ea062f3064a7fb4555a645591732dc2d77daf7b4c49de6f640115 AUX isabelle-2011.1-proofgeneral-gentoo-path.patch 1265 RMD160 9060454ab5480056b931b7a663137c80efa73b42 SHA1 e447977ddfbf08de46695f7b63e0ce2af3b55ac5 SHA256 08f6dae3f3157331ac83a3204f95e75838725175994c54f25b5f71715836556a DIST Isabelle2011-1.tar.gz 42239059 RMD160 70dadeaf38ae71ff9871f8c5b9ba823c4d5cbcc7 SHA1 2f514bc2cff7e7f7c75a3cb15c71ea71009f8df7 SHA256 48d77fe31a16b44f6015aa7953a60bdad8fcec9e60847630dc7b98c053edfc08 -EBUILD isabelle-2011.1.ebuild 4086 RMD160 b338eb3274078232ecb028f5b7690e1de2655b57 SHA1 331131526dde18c8d81e050ed66d3e5033a57124 SHA256 29e1c504ccb2a930abcc0b9317eb9cb6a71dbf4a260b70cc8da84e1c6756b464 -MISC ChangeLog 512 RMD160 cd98157922b80efa0078f449340f9d4f297b020e SHA1 b8f1ddfc5e1f32a294170e72767adabd8ea5418d SHA256 7199fdb19f50c41a442d47bd23a2eba424fd317c077b120bcc089321ae94fb53 +EBUILD isabelle-2011.1.ebuild 4034 RMD160 04e86aaa19d53abea7f95026f571cb43a3149be8 SHA1 746cf8f99a8c766982604000fe983a0bd7bae50e SHA256 172afc21e4f6a30b7f4cd583278c1b424d6ae2d166cf286986bcaae6ab786f3c +MISC ChangeLog 719 RMD160 50d862c57fdb0235e9bb50a162223b15551eadc7 SHA1 0f63dc9cd44992ea4680abc0cc6ad52ced353bf0 SHA256 31adf8c2b7e31a98f2e504923c71438d0c44889fe593aa3b589551636267850a MISC metadata.xml 1865 RMD160 6da50a4518e0bc23b6e6e5e540d8c4d47e71d74f SHA1 2e018687c48c173777159b28921d7d01a69b4ab9 SHA256 1a9f11e26050e0236ff9017d14b67ef7fd1a440cd4e865dbdf0b6cf1ddb2ff82 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk8Jja4ACgkQoBEVQmGOlx/1gQD/XP627XJ5PAtsbDQx11Tg3/AJ -f9KYwd0coxlGu8XW76YA/iISKM6zT8o3ebKFUVolyl02TtuCOShmj0min0bytK2S -=lMg2 +iF4EAREIAAYFAk8K8G8ACgkQoBEVQmGOlx+RywD/R8qR/b+t17Q3CmXZ6wblhF4h +9SEjxovPgJ8cm/NplbEA/1oMbDhj7oaiUeTvyfjyzZKche4c4hYpmmDJwcZ9HZVR +=qw+d -----END PGP SIGNATURE----- diff --git a/sci-mathematics/isabelle/isabelle-2011.1.ebuild b/sci-mathematics/isabelle/isabelle-2011.1.ebuild index 534db9147e52..fc9f3b056c53 100644 --- a/sci-mathematics/isabelle/isabelle-2011.1.ebuild +++ b/sci-mathematics/isabelle/isabelle-2011.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild,v 1.1 2012/01/08 12:35:43 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1.ebuild,v 1.2 2012/01/09 13:49:21 gienah Exp $ EAPI="4" @@ -8,7 +8,6 @@ JAVA_PKG_OPT_USE="graphbrowsing" inherit eutils java-pkg-opt-2 multilib versionator MY_PN="Isabelle" -typeset -u MY_PV MY_PV=$(replace_all_version_separators '-') MY_P="${MY_PN}${MY_PV}" @@ -20,26 +19,19 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~x86 ~amd64" ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents" -IUSE="${ALL_LOGICS} doc graphbrowsing +pdf +proofgeneral" +IUSE="${ALL_LOGICS} doc graphbrowsing +proofgeneral test" #upstream says #bash 2.x/3.x, Poly/ML 5.x, Perl 5.x, #for document preparation: complete LaTeX DEPEND=">=app-shells/bash-3.0 - >=dev-lang/polyml-5.4.1 + >=dev-lang/polyml-5.4.1[-portable] >=dev-lang/perl-5.8.8-r2" RDEPEND="doc? ( virtual/latex-base dev-tex/rail ) - pdf? ( || ( app-text/xpdf - app-text/gv - app-text/gsview - app-text/epdfview - app-text/acroread - app-text/zathura ) - ) proofgeneral? ( app-emacs/proofgeneral ) @@ -67,9 +59,11 @@ src_prepare() { polymlver=$(poly -v | cut -d' ' -f2) polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1) sed -e "s@5.4.0@${polymlver}@g" \ - -i "${S}/etc/settings" || die "Could not configure polyml version in etc/settings" + -i "${S}/etc/settings" \ + || die "Could not configure polyml version in etc/settings" sed -e "s@x86_64@${polymlarch}@g" \ - -i "${S}/etc/settings" || die "Could not configure polyml arch in etc/settings" + -i "${S}/etc/settings" \ + || die "Could not configure polyml arch in etc/settings" fi if use graphbrowsing; then epatch "${FILESDIR}/${PN}-2011.1-graphbrowser.patch" @@ -88,16 +82,18 @@ src_compile() { ./bin/isabelle makeall || die "isabelle makeall failed" if use graphbrowsing then - rm -f "${S}/lib/browser/GraphBrowser.jar" || die "failed cleaning graph browser directory" - cd "${S}/lib/browser" + rm -f "${S}/lib/browser/GraphBrowser.jar" \ + || die "failed cleaning graph browser directory" + pushd "${S}/lib/browser" \ + || die "Could not change directory to lib/browser" ./build || die "failed building the graph browser" - cd "${S}" + popd fi } src_test() { einfo "Running tests. A test run can take up to several hours!" - ./build -b -t + ./build -b -t || die "tests failed" } src_install() { @@ -139,10 +135,8 @@ src_install() { pkg_postinst() { elog "You will need to re-emerge Isabelle after emerging polyml." - if use pdf; then - einfo "Please configure your preferred pdf viewer by editing" - einfo "the PDF_VIEWER variable in the system settings file" - einfo "/etc/conf/isabelle and/or the user settings file" - einfo "\$HOME/.isabelle/${MY_P}" - fi + elog "Please configure your preferred pdf viewer by editing" + elog "the PDF_VIEWER variable in the system settings file" + elog "/etc/isabelle/settings and/or the user settings file" + elog "\$HOME/.isabelle/${MY_P}/etc/settings" } -- cgit v1.2.3-65-gdbad