Remove the static-libs use flag, as upstream do not support static in a way that is suitable for Gentoo (it disables building the shared libraries). EAPI=5 with subslot depends to automatically rebuild cvc3 when isabelle is updated if the isabelle use flag is enabled.

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

3 files changed, 27 insertions, 21 deletions

diff --git a/sci-mathematics/cvc3/ChangeLog b/sci-mathematics/cvc3/ChangeLog
index 9a783903c1fa..bd38b7602e29 100644
--- a/sci-mathematics/cvc3/ChangeLog
+++ b/sci-mathematics/cvc3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/cvc3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.4 2012/11/29 11:41:29 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/ChangeLog,v 1.5 2012/12/05 10:18:57 gienah Exp $
+
+  05 Dec 2012; Mark Wright <gienah@gentoo.org> cvc3-2.4.1.ebuild:
+  Remove the static-libs use flag, as upstream do not support static in a way
+  that is suitable for Gentoo (it disables building the shared libraries).
+  EAPI=5 with subslot depends to automatically rebuild cvc3 when isabelle is
+  updated if the isabelle use flag is enabled.
 
   29 Nov 2012; Mark Wright <gienah@gentoo.org> cvc3-2.4.1.ebuild:
   Try to fix: bug 442228 - sci-mathematics/cvc3-2.4.1 - QA Notice:
diff --git a/sci-mathematics/cvc3/Manifest b/sci-mathematics/cvc3/Manifest
index 18d1e28174b6..1ca394c814cb 100644
--- a/sci-mathematics/cvc3/Manifest
+++ b/sci-mathematics/cvc3/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX 50cvc3-gentoo.el 164 SHA256 1fbca0f0a0556eb5fc1d8ba4361f2143bc7fe81b08c21c1da752121ea3d25b90 SHA512 bba873dfaeadc821ffc41168df51a0e0d5c0d038f60a36ba4f74c83d0ef8fb4ff3089cb587b680d5058c7fcddad2585c1e913cb25d8e2256cccda5872f017d07 WHIRLPOOL ba6691a596a47670d0b143e957f10112de18493df013c9ffa8f232f0e7450adcea184a60246a44286976ddc683954354ecd985481a0407df83359d8b5bb07ccb
 DIST cvc3-2.4.1.tar.gz 1196616 SHA256 d55b1d6006cfbac3f6d4c086964558902c3ed0efa66ac499cfb2193f3ee4acf7 SHA512 48e5cd82b3eb7506d762c2abc8db0c8fbc548575a1362dda53888075ac105a5bc0f0d58dfe01b60f207bc00ff8dfc39a5b3d9317784fe551658c884bb02e1ff2 WHIRLPOOL 9d39dacff010f093685191737d41760a84ac7d12246ddaafbb9f48c78c7bff5697c5e85c62ef44b7dc76f86a55c118c041323c3a1b1953f5c725447795375d93
-EBUILD cvc3-2.4.1.ebuild 4206 SHA256 4c830312baf09663ee7da1903d7d7dc98e3e7c1dc16e1ae643c0c6f9b20c0172 SHA512 4d24b66480013e5be663b2f46b22ec80725da8c752a184a66aa855cce4a0b52358b0e56c2c89d384b2d1be725ff4bf19c953460688e71d5efb43ef3c14d3fa73 WHIRLPOOL 72b57fbad552f6c3bfc56a068c0c7b74b31f6fa440f29bf3881410e2a19f61ee7cdf09ec0be690a169bfc1e539d66515d86f534dc0934075bd9c704f41837fbc
-MISC ChangeLog 898 SHA256 c56ab80bd423de01dfc71fe27f7b71d0a6a5dd3eb6504b8ab09d72e100ccebe9 SHA512 bdcb027651d8ddb5fd9eed51ec229c8a3b69b13496ec2e05dbe5a5f69c92a1d848aab592749b06c0173eb854bda2885139abc1951ed9b1b06777bcf1c65190b2 WHIRLPOOL 6fe6b4fd02bbf61c6df047788c47d663500552be9e0b0f52ba5661461285fec83d169c39cfdf7e39cd7135e4d95fc3256282519a7233ecc70b02b6de0b60dcb5
+EBUILD cvc3-2.4.1.ebuild 4362 SHA256 1055671c774e2f8ba48101aa0f7455799473416bc787de16d31662ced4de541c SHA512 6dcf5d028a0927a529848055ec2ac0219cbbabb32ba0e32342fe79fc8c5124fe110081a723a4d3d69f479e1443d396d70a543c88b9759aab03ffc39d2402721b WHIRLPOOL e1de4b2fe58211395bd4916a61a2b44e5a868b40c4d1d51c7255652b3ec5ba27e22f9adee4d7c1c6939fe05ef3757682fed2e92a74069b85e7ac71ba1f502978
+MISC ChangeLog 1242 SHA256 9cfe82de7fc9b688ea247c6866145d45f6a40819d59a856cd3d8863aae36fcd1 SHA512 6c48ca99d5a869b7f8d862d047e3baf74719b3ad59117d015896f0b178c6f1d06c3215fd45d8d18a7c2f659a4848e3761111d1e2cc9400768d101cc774df9694 WHIRLPOOL 95b677607531775f05b6ca8e2bda74ed3f9f10f9571bae6de2e5708ffccd2a6a8aad9e324eecbc8109488a728e648e90b27cfeef79d8575b268f98359aec086f
 MISC metadata.xml 1667 SHA256 1c3c45888ea6620c45bcb6a643c1699da002f7af1f4955cd728b497b09ac9902 SHA512 2b0f33935e7c6d896e0063f905a6c79e7e06e5e5966c1bdabea45256b18cdc1c54122d1c90d60c3ee896abf77b869d67de74de7d7f1613642a3a6674935224b0 WHIRLPOOL afdbf5ee60eede790fbb1c36b6d8307d2ff8fe0b8d0b737f73fd2541e981740d1799b996aa74deffe848bfc90a66ee21036d2778900fa184178a667ad1dca050
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlC3Se8ACgkQoBEVQmGOlx8qqwEAsqW1YPGZVQa7uyJ2xFbkirnA
-LECUv14MzN16OuJYXoQA+wUjAQTdqPpa0evMWXLUBwHidFAGfULWxrXsOZTsdplR
-=4FkG
+iF4EAREIAAYFAlC/H5gACgkQoBEVQmGOlx9a4QEAhuOOkYJu/3CrQHB/FY7a4a8p
+l5+zcjP4onWPsWFTdUUBAN7tgPs0tJHbPfHhXABF/kMzwrCPJ/7WlJWcEBsbgPZw
+=Fb6t
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild b/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
index c4f7adb884c2..23c48feb38a5 100644
--- a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
+++ b/sci-mathematics/cvc3/cvc3-2.4.1.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/cvc3/cvc3-2.4.1.ebuild,v 1.3 2012/11/29 11:41:29 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.4 2012/12/05 10:18:57 gienah Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit elisp-common
 
@@ -12,22 +12,21 @@ SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz"
 
 LICENSE="BSD MIT as-is zchaff? ( zchaff )"
 RESTRICT="mirror zchaff? ( bindist )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc emacs isabelle static-libs zchaff"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs isabelle test zchaff"
 
-RDEPEND=""
+RDEPEND="dev-libs/gmp
+		isabelle? (
+			>=sci-mathematics/isabelle-2011.1-r1:=
+		)"
 DEPEND="${RDEPEND}
-		>=dev-libs/gmp-5[static-libs?]
 		doc? (
 			app-doc/doxygen
 			media-gfx/graphviz
 		)
 		emacs? (
 			virtual/emacs
-		)
-		isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1
 		)"
 
 SITEFILE=50${PN}-gentoo.el
@@ -41,8 +40,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# --enable-static disables building of shared libraries, statically
+	# links /usr/bin/cvc3 and installs static libraries.
+	# --enable-static --enable-sharedlibs behaves the same as just --enable-static
 	econf \
-		$(use_enable static-libs static) \
+		--enable-dynamic \
 		$(use_enable zchaff)
 
 	if use test; then
@@ -100,9 +102,7 @@ src_install() {
 	if use isabelle; then
 		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
 			|| die "isabelle getenv ISABELLE_HOME failed"
-		if [[ -z "${ISABELLE_HOME}" ]]; then
-			die "ISABELLE_HOME empty"
-		fi
+		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
 		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
 		cat <<- EOF >> "${S}/settings"
 			CVC3_COMPONENT="\$COMPONENT"
@@ -148,7 +148,7 @@ pkg_postrm() {
 			if [ -f "${ROOT}etc/isabelle/components" ]; then
 				# Note: this sed should only match the version of this ebuild
 				# Which is what we want as we do not want to remove the line
-				# of a new E being installed during an upgrade.
+				# of a new CVC3 being installed during an upgrade.
 				sed -e "/contrib\/${PN}-${PV}/d" \
 					-i "${ROOT}etc/isabelle/components"
 			fi