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.

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 54 insertions, 17 deletions

diff --git a/sci-mathematics/isabelle/ChangeLog b/sci-mathematics/isabelle/ChangeLog
index aeafc9161fa5..bf1ad02ebe5d 100644
--- a/sci-mathematics/isabelle/ChangeLog
+++ b/sci-mathematics/isabelle/ChangeLog
@@ -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:
diff --git a/sci-mathematics/isabelle/Manifest b/sci-mathematics/isabelle/Manifest
index dac57537a949..e3d4ec2426ed 100644
--- a/sci-mathematics/isabelle/Manifest
+++ b/sci-mathematics/isabelle/Manifest
@@ -14,15 +14,15 @@ DIST Isabelle2011-1.tar.gz 42239059 SHA256 48d77fe31a16b44f6015aa7953a60bdad8fce
 DIST Isabelle2012-doc-src.tar.gz 2688496 SHA256 e18965fe0f7f89b286d4707e38201f1edbea81f6b26aed59d63a633c03fec097 SHA512 5aaea56eb67e535d745d63314278b6ee8469e6d3bbf4ce4d7b3f5e04b24557783b56d50d905a5ad69187c42f44407023c95a9bfb6faab125c21edff7638ff21d WHIRLPOOL 278b63a243950b1596376ee04cbfddb7a93c747e9f6ee66c5b069ca0dae4ca8d10bef43e03069b6186a19c703f71a585633fc47c3c1a15de3a886ff468232127
 DIST Isabelle2012.tar.gz 49529865 SHA256 b86f957dee221041f92c9d4ced4758d45b4950339743d0d58b1ea6061e2b53f0 SHA512 1346f563233eba10bc14f7d140706b8bfba8e832f7ee5887316c829926136af07d700914a925272d8adc1275b0bdd682540518957910c136a15bfc60d61285a0 WHIRLPOOL 23b764a1a0044a9525d058e95da318f4425fadf7660edc8ab8f35b248f98dcff0dba2e533ff18d8bf47ea164cec12a9648642749de2a49887bbe84ed4e71a68b
 DIST jedit_build-20120414.tar.gz 7509120 SHA256 3c5840fd01b87013b05a92742d41f66f655df6fe9edef1525c6722f92d8f3e41 SHA512 2e2f0db4964a041ba54382a9c787246e1d433e43167019c6ea8d4cf6beb84ce438c0bc559d2588229b0166c91bac603bed39abc45d5d4267020f55eaba1aaa0c WHIRLPOOL 40b883943bde312b4c7adc43607ba4759e5ebe22cab3c922c81393375f917af21d4a8dc068e5692ffcf7bdfb1e7fe3081358dc8e346d1942582bf79e249b0cbb
-EBUILD isabelle-2011.1-r1.ebuild 7232 SHA256 3d209f9763ddc5a9f18c32770f681d6834e6184023402f272d2f609aa6809ed1 SHA512 cf8134d2156ee654bb2dc0492c8b9e13d48c3923536f27b4c7db33fdf50bbb59b38133ea325ff781da0b40c0b38d5c8face3bbd80d3ca405a2d14ec1cd599e7b WHIRLPOOL e591ca39de3ba588a1393c5c1ff7f507ca9a9f899ea5ec99196b5fd9c100adf8d99b251ffbc881bd032f9f3d491759bc6d8fe0231aaaf1ee56f93e9f6e025fd0
+EBUILD isabelle-2011.1-r1.ebuild 7991 SHA256 88d1ccabe263c435ccb712b2fe350cfd533270deb62557e8075d5fa22d91ae77 SHA512 11406ef5117a7819657f7dc9c84de4582062d8221063d0f03f2dc8d80eb997751d4196527528414cf5cbe6c92ad7809ce63d5e34700c29298bedd4207fd9cd6b WHIRLPOOL 3612e6491667a4724f02ff589f6d97b76ca7a7303b8b6beed5d1b652205d3e7a14998449a1f602afbf4f745b4169c57d7a3b7042208f32b480c1031b5144534c
 EBUILD isabelle-2011.1.ebuild 4036 SHA256 6063b32c39e50c42e81051197ce46a735bb16448c13b5ff1f8af5018f07b3020 SHA512 430524175bd5fbf4beb325a93ef746bf5df5c2beabc4b6d9536c1f7370e0c1babdd9bf00a617076a74ff892e5909ffe01f791a7121bdf3fb3cd817eb42f4bf66 WHIRLPOOL 3e3bcc27aa6ff8f4853fb142c0a4312bb7eeb908639a3fc826ae882a16fca60c03374387f4e06b19f4b079afb562d782d786c75c1c4a36c2cac2db47c0f04e18
-EBUILD isabelle-2012.ebuild 10131 SHA256 651a2e844fb14110f4f60fb06772cfdc05892ed8a7ef2babf90f378e88ad2c1d SHA512 249f3c8001f85a883cacd50713816a0e0887ac7ec4727b873df7d475a3519d90ca3997842242c811fc8b00eb2da9b4cc5c78db1b2cdd43e3e8e10d2ed0187e2b WHIRLPOOL 7de3aa5571b2b565c2967a92f1e122fe6b38e9df1c3df22b0026bac06c3909b45b77bc853fd9238c00924c9f0b037ec4e2cb8af0b394f5f5c15a6497b1d65ef1
-MISC ChangeLog 2321 SHA256 2a9971388c8fec9a74c7eed0b368b17df1bdaa6925af0d1a1711ea01495a5464 SHA512 f384285ca5d7fdd887d34cabaf38f1f2b199631b30e19a23adb4dab3c0d5fbc12fa1b2b0cd65472d3d3031d65b098cb0e09a2620b0662ad40ca66d619c7c1e1d WHIRLPOOL 6d0f06c99766344750bc21c683a2b97bb1217b774dfd42b78ecdb543b83b3b37592e4db326d66f09b73f5c0db05266b47959ea8e71027d097155b91265b154ca
+EBUILD isabelle-2012.ebuild 10890 SHA256 37c8df06398b1077669c4f9e6b952213031c121ffde345f7aef25d68ac72afeb SHA512 cc98dcf9240e2d51ea95fc17d8ffecbe59f4ca3bdf42752e8bbbe56cdaa02d90a92deffce2a457beda18f63aabc4186f9c6c5835db9e1ab121c0392b5a12519b WHIRLPOOL d55ae68030bb1d0ac5481ffde74f31390afae19037eafa61753a2ba9f2ef9ad5379b75c55d23dd24718f8cfd476ac3fbb28592f1620a3d6b61382d7512196b00
+MISC ChangeLog 2727 SHA256 f2d80d571db2b3e172293342bc083a2d582fb3cf485a4cc76a65a65213f63013 SHA512 6291ec2aefb839883526430c22f9c02288fe3e1599542bafec6e7444918216be264b612db3c87c8cb3cae97b6095cba96d278cb89c75a3716b6ab36489264d7d WHIRLPOOL 839ece9a3c78b4a41eac3dbc5eb3f9bbc0b7c9969bae6970434a52d0c44f5b153771757116b3acb9ae2a8618c5933b47abab6af2fe2fc5d6257daf09cdb97ab1
 MISC metadata.xml 2157 SHA256 bdcce608d1d69f75e4aa0c809f85885dd025cd9ed2c1a12552a446033c4a7fa6 SHA512 68420728ce6789fdd6f4813d53b4ccbabe08d4a66b5c8ef17eed1a107fb48cb2abe121dbc4be606bff7b8430b2ac8a3f2f6dcf63b7f061e4c91b48df70b12d8c WHIRLPOOL 95bc13a50a4fdbd470dd7de4c64fcaf02f523ea3660d95adb5278968c64da7b3a0d3f448c4aa4a0558e3fd4ae85cd7ad020bc9f81295b1ac277fbf1aac372602
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBbFSoACgkQoBEVQmGOlx+oogEApvPX8Hnp9qVRtPYwyEAIOC0o
-hxqCkusafT0EtwVljjAA/jkLASd/6HBL0HgVivBBxSFSHRPIWf7uTRi7AYmiV+jQ
-=lOeB
+iF4EAREIAAYFAlC/HWMACgkQoBEVQmGOlx/fBgD/Z8+m7Cnew0bejBN9L3w0A4nq
+AgOjucxSxOLDo+ylhqUBAI4L6H+3Z//XhvzD6wCmD/L2BvOL6viX1o6fac5wM3PR
+=ibcV
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild b/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
index fda73d4abfad..0eb7f06c3637 100644
--- a/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
@@ -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 @@ HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/isabelle/index.html"
 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 @@ IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline +proofgeneral test"
 #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 @@ src_install() {
 }
 
 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 @@ pkg_postinst() {
 	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"
 }
diff --git a/sci-mathematics/isabelle/isabelle-2012.ebuild b/sci-mathematics/isabelle/isabelle-2012.ebuild
index e4bcc69fe269..aa4bd69bd633 100644
--- a/sci-mathematics/isabelle/isabelle-2012.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2012.ebuild
@@ -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 @@ SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz
 		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 @@ IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline pide +proofgeneral test"
 #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 @@ src_install() {
 }
 
 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 @@ pkg_postinst() {
 	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"
 }