add camlp5 useflag to allow building coq with it, bug #434230 by Christian D.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 20 insertions, 10 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index e63069894921..e77afcde0c4c 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.73 2012/08/24 16:01:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.74 2012/10/06 21:07:26 aballier Exp $
+
+  07 Oct 2012; Alexis Ballier <aballier@gentoo.org> coq-8.4.ebuild,
+  metadata.xml:
+  add camlp5 useflag to allow building coq with it, bug #434230 by Christian D.
 
 *coq-8.4 (24 Aug 2012)
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index f53f90692bac..371745562aad 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -13,13 +13,13 @@ EBUILD coq-8.3_p1.ebuild 2142 SHA256 812c6ef68e6cbd4608eec74489e850c8349be6d7990
 EBUILD coq-8.3_p2.ebuild 3163 SHA256 c20212a95b2aa6cd7e9a889ae2f26c512ddc46322d487d5d87be31170edbed97 SHA512 0cc6f75c0cf02cded5e59069af0ce210567492ee15c9ec78a0f97a9169566f9599c3665e56f3d6ec7752522e1804e0e09f090542f767881c7ac2f4744b41ccac WHIRLPOOL 22365cc2f8f888204ac9b8a5ae99b6c96ef6ae4166946e6ecdfdb5b0acb3d845402bd0ee1a755b1c6674911c5635254dae945372ffb30f98e28182bedc39da81
 EBUILD coq-8.3_p3.ebuild 3163 SHA256 4e32cd0c79e31db0e3bae0d5bb758d29d27b1041831969e3e007b8dc6cfe7f14 SHA512 5facbea063bf01d0b7de3a57e60dac2b71c463ad6a825dd0f9bb6f82a6cd72541049bd47028e596fcdbc04636d9a962bfc06c6fa526397458603a17475300bcb WHIRLPOOL d268813788a1ccb8402f8ce1692ccd059dcdca8e6a740d254e1951f6a385f3b38fb365a3d6ecdedec85b19adfaf164dfca22e2a296afb217fcf8e8c174da6974
 EBUILD coq-8.3_p4.ebuild 2294 SHA256 ca624d78df0303cc800689a694245081b7eeae6cd9fa2c423136b8df5009175f SHA512 112b8f41fa918cd299ed1c14f4ddc07e99946c3bd8b67d5c90dca8e131554fba6050439fd6aa7f7b35ddde5ffc3170e897ec7c1135892e82eb3999788ca7451e WHIRLPOOL a06ac98ae5633a8ab9b89041e40ddc382eb4cb35fe3d24136da1dec685eff32d936c128a330fa921dd58b9ba4851dc3fbdf051a5170602309618bb39b3d38888
-EBUILD coq-8.4.ebuild 1999 SHA256 8163a804b9ee27286f8a0b81faaec4f41ff4c731720e6a9305cdff38698b0362 SHA512 b4ac49fadae394c5a79dc169e931062536c6b360fa0e42abda12d8eb19efd57002b4766dfa8495fc2d3798749cc7ecdc203f633fd3a65a62435e560295a93978 WHIRLPOOL 26d1528f47f0065adbfc33783dc657d35b77636ab24e50093530de93411d714337c29462e236013ab70a988804c2fdceb252b7e72d4a78260dffea4e18a3634d
-MISC ChangeLog 12039 SHA256 212a71df00ffbdd120812369e1859b39be1304eb9c65b9bfae3dc5b986c3a820 SHA512 d58753c556cbeb72a90b0a700bd8defa21cfd82568b57fcde674d00bde263383be423a71e8d48c0b5b6a31cf678dcccdf863cecdb9714914aced5876186c150c WHIRLPOOL 8e21646d6850e05018a811419f4ade97d72ae4203535e1e917b6343b353f3b13b964835218993ea2f4e8b96c78ec2a24369b581694d3183e7824b821503fc45c
-MISC metadata.xml 788 SHA256 5028003bf6d1ec17b51ce45c17bb565137f825a5eefcdf57de4a98c5c61d0626 SHA512 1db2cbc8d35aaa9d9cc196eae2b73bd43214c3e19ded7544fd74f48eeaa067fb653ca1635a07fbd5784250a6978c28b0e0b9eb0a29a524b97dcc0e6bf54ae2b4 WHIRLPOOL 872ddacf2c445c198fb939a673fd07a7ec5bb7ce6bf5c424863b85174e6a6e83c536e3c700de3b757e0060fe7ff27a31ad6300c0317f5a1e746f8ad4a3523b30
+EBUILD coq-8.4.ebuild 2148 SHA256 becaf917d68264f859cb816bc0662d78ca907e3ad1522b021d9da81d5c7b4599 SHA512 c76892e12a26d2335e0d6c542ff9a5258b5e73438988054bba17f904c93fe83d20b1fd9779ad930be82918c7048b83af5f0c48973e8899850bb7d2e894ff39cb WHIRLPOOL 5f1b4e839d0ae93cb1ab6cb7b4e15bffd51fe68a0a882cf762c11ba9957715abf69fa09c08b592e02768f01518036dca684ab28a4b2051ed1a6d8b4f7244afe5
+MISC ChangeLog 12204 SHA256 b1c5bd79a0e1008eec2d099958fc5b7f19668a8465158521c1552fadb74772ad SHA512 b60657df2e6def16dea40b05d52f1ba86c919deb991083e144f24882455b1062248d15f194113686bc66fec916b10ad2f9e8b17740a180f1e9ce8297c322f445 WHIRLPOOL 814dd9b90b3baea7845a20ebdd4752e6cd464fd4752c78827007ae2b57143206d3d9d9b40455e96cf35544c1d2595ad1d9037f97c7ec8c7270160281e66343bc
+MISC metadata.xml 899 SHA256 e0676f509aac30fee1d2f69dcbb0644d06e8e15d8dcc72295f67ce0d769c032e SHA512 7f203472451d8725a671b3460f68baf03637055cf7eac21197e930bac79d2924a5dc04d8111465afbd47c49def5cb2a12023d2d58855cb319436603387536d61 WHIRLPOOL d5490532c78ab704459b90e0a03547d13f62b058f5aa2e7817e7b13f43745782a1de74bb251108fc2dfe8f73d0b0aefbd1898f5769fc4337b7f0e2991fcad421
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA3pVUACgkQvFcC4BYPU0rMiACcDD4pNcAzPuBMmdXMsh55iBvO
-7pIAoL9D0Skd4mygzbaZstQ9m6vhEnz8
-=Jphn
+iEYEAREIAAYFAlBwx8AACgkQvFcC4BYPU0pizwCgvVYcY/p1Eon1oVdk+qzvgvXh
+gH0AoIRMAFyT22WOpUAUn1A8Sb9j+7wP
+=KSem
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.4.ebuild b/sci-mathematics/coq/coq-8.4.ebuild
index fca884d2e6ab..8e424ba1dd6d 100644
--- a/sci-mathematics/coq/coq-8.4.ebuild
+++ b/sci-mathematics/coq/coq-8.4.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/coq/coq-8.4.ebuild,v 1.1 2012/08/24 16:01:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4.ebuild,v 1.2 2012/10/06 21:07:26 aballier Exp $
 
 EAPI="2"
 
@@ -16,9 +16,10 @@ SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk debug +ocamlopt doc"
+IUSE="gtk debug +ocamlopt doc camlp5"
 
 RDEPEND=">=dev-lang/ocaml-3.11.2[ocamlopt?]
+	camlp5? ( >=dev-ml/camlp5-6.02.3[ocamlopt?] )
 	gtk? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
 DEPEND="${RDEPEND}
 	doc? (
@@ -47,7 +48,6 @@ src_configure() {
 		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
 		--docdir /usr/share/doc/${PF}
 		--configdir /etc/xdg/${PN}
-		--usecamlp4
 		--lablgtkdir ${ocaml_lib}/lablgtk2"
 
 	use debug && myconf="--debug $myconf"
@@ -62,6 +62,9 @@ src_configure() {
 	use ocamlopt || myconf="$myconf -byte-only"
 	use ocamlopt && myconf="$myconf --opt"
 
+	use camlp5 || myconf="$myconf --usecamlp4"
+	use camlp5 && myconf="$myconf --camlp5dir ${ocaml_lib}/camlp5"
+
 	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
 	./configure $myconf || die "configure failed"
 }
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 76cdd62b5c99..9bd447c9ac3d 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -16,4 +16,7 @@
   Constructions" extended by a modular development system for
   theories.
 </longdescription>
+<use>
+	<flag name='camlp5'>Build using camlp5. This is required for some plugins like Ssreflect.</flag>
+</use>
 </pkgmetadata>