* [gentoo-commits] gentoo-x86 commit in sci-mathematics/isabelle: isabelle-2011.1-r1.ebuild isabelle-2012.ebuild ChangeLog
@ 2012-09-20 13:07 Mark Wright (gienah)
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2012-09-20 13:07 UTC (permalink / raw
To: gentoo-commits
gienah 12/09/20 13:07:43
Modified: isabelle-2011.1-r1.ebuild isabelle-2012.ebuild
ChangeLog
Log:
isabelle doc requires a symlink
(Portage version: 2.1.11.18/cvs/Linux x86_64)
Revision Changes Path
1.2 sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?r1=1.1&r2=1.2
Index: isabelle-2011.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isabelle-2011.1-r1.ebuild 30 May 2012 00:45:06 -0000 1.1
+++ isabelle-2011.1-r1.ebuild 20 Sep 2012 13:07:43 -0000 1.2
@@ -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-r1.ebuild,v 1.1 2012/05/30 00:45:06 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v 1.2 2012/09/20 13:07:43 gienah Exp $
EAPI="4"
@@ -189,6 +189,9 @@
docompress -x /usr/share/doc/${PF}
dodoc -r doc
+ if use doc; then
+ dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
+ fi
dodir /etc/isabelle
insinto /etc/isabelle
1.3 sci-mathematics/isabelle/isabelle-2012.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?r1=1.2&r2=1.3
Index: isabelle-2012.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isabelle-2012.ebuild 15 Jun 2012 14:10:40 -0000 1.2
+++ isabelle-2012.ebuild 20 Sep 2012 13:07:43 -0000 1.3
@@ -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-2012.ebuild,v 1.2 2012/06/15 14:10:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v 1.3 2012/09/20 13:07:43 gienah Exp $
EAPI="4"
@@ -160,7 +160,10 @@
doins -r src
doins -r lib
+ docompress -x /usr/share/doc/${PF}
+ dodoc -r doc
if use doc; then
+ dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
# The build of sci-mathematics/haskabelle with use doc requires
# sci-mathematics/isabelle[doc?]. The haskabelle doc build requires
# the doc-src directory stuff in the isabelle package. Which is not
@@ -246,9 +249,6 @@
doexe ${i}
done
- docompress -x /usr/share/doc/${PF}
- dodoc -r doc
-
dodir /etc/isabelle
insinto /etc/isabelle
doins -r etc/*
1.6 sci-mathematics/isabelle/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 15 Jun 2012 14:10:40 -0000 1.5
+++ ChangeLog 20 Sep 2012 13:07:43 -0000 1.6
@@ -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.5 2012/06/15 14:10:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.6 2012/09/20 13:07:43 gienah Exp $
+
+ 20 Sep 2012; Mark Wright <gienah@gentoo.org> isabelle-2011.1-r1.ebuild,
+ isabelle-2012.ebuild:
+ isabelle doc requires a symlink
15 Jun 2012; Mark Wright <gienah@gentoo.org>
+files/isabelle-2012-redundant-equations-in-function-definitions-error.patch,
@@ -40,4 +44,3 @@
+files/isabelle-2011.1-graphbrowser.patch,
+files/isabelle-2011.1-proofgeneral-gentoo-path.patch, +metadata.xml:
New ebuild, thanks Mr. Anderson for earlier version, fixes #397995
-
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-mathematics/isabelle: isabelle-2011.1-r1.ebuild isabelle-2012.ebuild ChangeLog
@ 2012-12-05 10:09 Mark Wright (gienah)
0 siblings, 0 replies; 2+ messages in thread
From: Mark Wright (gienah) @ 2012-12-05 10:09 UTC (permalink / raw
To: gentoo-commits
gienah 12/12/05 10:09:32
Modified: isabelle-2011.1-r1.ebuild isabelle-2012.ebuild
ChangeLog
Log:
EAPI=5 with subslot depends to automatically rebuild isabelle when polyml is updated. It is necessary to remove any non-existing directories from /etc/isabelle/components, as otherwise isabelle getenv ISABELLE_HOME fails, which causes reverse dependent packages of sci-mathematics/isabelle to fail.
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path
1.3 sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild?r1=1.2&r2=1.3
Index: isabelle-2011.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isabelle-2011.1-r1.ebuild 20 Sep 2012 13:07:43 -0000 1.2
+++ isabelle-2011.1-r1.ebuild 5 Dec 2012 10:09:32 -0000 1.3
@@ -1,8 +1,8 @@
# 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-r1.ebuild,v 1.2 2012/09/20 13:07:43 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v 1.3 2012/12/05 10:09:32 gienah Exp $
-EAPI="4"
+EAPI="5"
inherit eutils java-pkg-2 multilib versionator
@@ -15,7 +15,7 @@
SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~x86 ~amd64"
ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline +proofgeneral test"
@@ -24,7 +24,7 @@
#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[-portable]
+ >=dev-lang/polyml-5.4.1:=[-portable]
>=dev-lang/perl-5.8.8-r2"
RDEPEND="dev-perl/libwww-perl
@@ -217,13 +217,26 @@
}
pkg_postinst() {
+ # If any of the directories in /etc/isabelle/components do not exist, then
+ # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
+ # to delete any non-existing directories. If an old Isabelle version was
+ # installed with component ebuilds like sci-mathematics/e, then the
+ # Isabelle version is upgraded, then the contrib directories will not
+ # exist initially, it is necessary to delete them from /etc/isabelle/components.
+ # Then these components are rebuilt (creating these directories) using the
+ # EAPI=5 subslot depends.
+ for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
+ do
+ if [ ! -d /usr/share/Isabelle2012/${i} ]; then
+ sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
+ fi
+ done
if use ledit && use readline; then
elog "Both readline and ledit use flags specified. The default setting"
elog "if both are installed is to use readline (rlwrap), this can be"
elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
elog "${ROOT}/etc/isabelle/settings"
fi
- elog "You will need to re-emerge Isabelle after emerging polyml."
elog "Please ensure you have a pdf viewer installed, for example:"
elog "As root: emerge app-text/zathura-pdf-poppler"
elog "Please configure your preferred pdf viewer, something like:"
@@ -233,4 +246,6 @@
elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
elog "To improve sledgehammer performance, consider installing:"
elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
+ elog "For nitpick it is necessary to install:"
+ elog "emerge sci-mathematics/kodkodi"
}
1.4 sci-mathematics/isabelle/isabelle-2012.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild?r1=1.3&r2=1.4
Index: isabelle-2012.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- isabelle-2012.ebuild 20 Sep 2012 13:07:43 -0000 1.3
+++ isabelle-2012.ebuild 5 Dec 2012 10:09:32 -0000 1.4
@@ -1,8 +1,8 @@
# 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-2012.ebuild,v 1.3 2012/09/20 13:07:43 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v 1.4 2012/12/05 10:09:32 gienah Exp $
-EAPI="4"
+EAPI="5"
inherit eutils java-pkg-2 multilib versionator
@@ -21,7 +21,7 @@
pide? ( http://www4.in.tum.de/~wenzelm/test/${JEDIT_P}.tar.gz )"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~x86 ~amd64"
ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline pide +proofgeneral test"
@@ -30,7 +30,7 @@
#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[-portable]
+ >=dev-lang/polyml-5.4.1:=[-portable]
>=dev-lang/perl-5.8.8-r2"
RDEPEND="dev-perl/libwww-perl
@@ -283,13 +283,26 @@
}
pkg_postinst() {
+ # If any of the directories in /etc/isabelle/components do not exist, then
+ # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
+ # to delete any non-existing directories. If an old Isabelle version was
+ # installed with component ebuilds like sci-mathematics/e, then the
+ # Isabelle version is upgraded, then the contrib directories will not
+ # exist initially, it is necessary to delete them from /etc/isabelle/components.
+ # Then these components are rebuilt (creating these directories) using the
+ # EAPI=5 subslot depends.
+ for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
+ do
+ if [ ! -d /usr/share/Isabelle2012/${i} ]; then
+ sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
+ fi
+ done
if use ledit && use readline; then
elog "Both readline and ledit use flags specified. The default setting"
elog "if both are installed is to use readline (rlwrap), this can be"
elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
elog "${ROOT}/etc/isabelle/settings"
fi
- elog "You will need to re-emerge Isabelle after emerging polyml."
elog "Please ensure you have a pdf viewer installed, for example:"
elog "As root: emerge app-text/zathura-pdf-poppler"
elog "Please configure your preferred pdf viewer, something like:"
@@ -299,4 +312,6 @@
elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
elog "To improve sledgehammer performance, consider installing:"
elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
+ elog "For nitpick it is necessary to install:"
+ elog "emerge sci-mathematics/kodkodi"
}
1.7 sci-mathematics/isabelle/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/isabelle/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 20 Sep 2012 13:07:43 -0000 1.6
+++ ChangeLog 5 Dec 2012 10:09:32 -0000 1.7
@@ -1,6 +1,13 @@
# 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.6 2012/09/20 13:07:43 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/ChangeLog,v 1.7 2012/12/05 10:09:32 gienah Exp $
+
+ 05 Dec 2012; Mark Wright <gienah@gentoo.org> isabelle-2011.1-r1.ebuild,
+ isabelle-2012.ebuild:
+ EAPI=5 with subslot depends to automatically rebuild isabelle when polyml is
+ updated. It is necessary to remove any non-existing directories from
+ /etc/isabelle/components, as otherwise isabelle getenv ISABELLE_HOME fails,
+ which causes reverse dependent packages of sci-mathematics/isabelle to fail.
20 Sep 2012; Mark Wright <gienah@gentoo.org> isabelle-2011.1-r1.ebuild,
isabelle-2012.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-05 10:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-20 13:07 [gentoo-commits] gentoo-x86 commit in sci-mathematics/isabelle: isabelle-2011.1-r1.ebuild isabelle-2012.ebuild ChangeLog Mark Wright (gienah)
-- strict thread matches above, loose matches on Subject: below --
2012-12-05 10:09 Mark Wright (gienah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox