Fix ./configure with make >= 3.82 wrt #341187 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 30 insertions, 19 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index e1fe41f51aa5..53c584e57fdf 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.53 2010/09/27 04:31:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.54 2010/10/18 18:30:07 ssuominen Exp $
+
+  18 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> coq-8.2_p2.ebuild,
+  +files/coq-8.2_p2-make-3.82.patch:
+  Fix ./configure with make >= 3.82 wrt #341187 by Diego E. Pettenò.
 
 *coq-8.2_p2 (27 Sep 2010)
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 46105f9d7630..2535a9047343 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX coq-8.2_p2-make-3.82.patch 293 RMD160 4b6d9126c93f9ff882a3aea7518529a09fdd2e69 SHA1 288b77f8ba94791c800a6395260273d96cf582e4 SHA256 9630602f54509704e447c8a306d7153a54937ae523ae7d06aeb3618a53cd1f21
 AUX coqide.desktop 233 RMD160 3f9d112d7f55454f72c42b427005b37971c6e928 SHA1 40571b86c25793e7d4e9bef80f637d7440b03704 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac
 DIST coq-8.2pl1.tar.gz 3600620 RMD160 dd5758a94bb3de49967cec76baa33eb5169659ce SHA1 4aed3302adc2edbaa5d97984512c1c13014bd649 SHA256 7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c
 DIST coq-8.2pl2.tar.gz 3649761 RMD160 7ecd8a63d8c6f43c0f4c18737895d656f2275913 SHA1 97e1f3d458845cb2934fa0573521fa517994295a SHA256 0e66c2576150bf18828bfff94df50e3405acda6c728ad01a4906fdbdc6de0236
 EBUILD coq-8.2_p1-r1.ebuild 2023 RMD160 6040854d288bf7b9887c36dfffa961a13efccaeb SHA1 d1463fe96e2b5202edb0770af67a77288686db01 SHA256 d81f9be041f55de003b83574c52abc2bea9a119c99cd022b732756170758b26f
-EBUILD coq-8.2_p2.ebuild 2019 RMD160 74bae30da7b6eaa7d5d01cdb4831130d5daea25d SHA1 934a112b960cafb2d1aedff8da1c265ee6830361 SHA256 69b98043e15462c95a5eb19b6393dfee64bcd257bb491cda0cf7cb1f322d993c
-MISC ChangeLog 8695 RMD160 87878a599c8879d1dc6986d90a14c17b6d864f20 SHA1 768af8745e57f3b656e6105aeeed40cdad4a4caa SHA256 5153352ef92af6a7a61fc5af86862afebdce30923defaf3304518cf553d6a274
+EBUILD coq-8.2_p2.ebuild 2073 RMD160 371d44698f755955dfe4abd14d2f6182a86c0d8d SHA1 3d3dca779635d40aa2a3262a18a1f3c7b287ff0f SHA256 0c6c587f5ef5bc422da5885e842ee7309b9ae5700bfb30f611437ec83ab11f23
+MISC ChangeLog 8877 RMD160 de206d3e319dd108fe2445ac3eb86b3747ad2002 SHA1 e7a1d53dd6255dec433bba14a47805a913cbe4d5 SHA256 a4a3b1d3d1d0db681da7f71e40987a89d0b5dbeb9aaf7364371c896bf590f15b
 MISC metadata.xml 978 RMD160 87ac5db98680ca1eef0b2d5fbdb2963b182a35cb SHA1 cef1c29019652dbe87c3ba5daeeaec63e0bb5e2d SHA256 dd2767eb316b5bf7c1c66c555f3b54b9d812f22631ab8d27151a1ce13b54d203
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkygHkkACgkQ1ycZbhPLE2BqfwCfdGQ0tysj2ZmmpOW+V6rQOC5D
-dHkAn1jvoJ19mk8drglneuhhxwWeW5mO
-=jyWa
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.2_p2.ebuild b/sci-mathematics/coq/coq-8.2_p2.ebuild
index 087137cc57fe..c414565740bc 100644
--- a/sci-mathematics/coq/coq-8.2_p2.ebuild
+++ b/sci-mathematics/coq/coq-8.2_p2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.2_p2.ebuild,v 1.1 2010/09/27 04:31:52 bicatali Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.2_p2.ebuild,v 1.2 2010/10/18 18:30:07 ssuominen Exp $
 
+EAPI=2
 inherit eutils multilib
 
-MY_PV="${PV/_p/pl}"
-MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Coq is a proof assistant written in O'Caml"
 HOMEPAGE="http://coq.inria.fr/"
@@ -31,7 +30,11 @@ DEPEND="${RDEPEND}
 		|| ( dev-texlive/texlive-mathextra app-text/ptex )
 		)"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-3.82.patch
+}
 
 src_configure() {
 	ocaml_lib=`ocamlc -where`
diff --git a/sci-mathematics/coq/files/coq-8.2_p2-make-3.82.patch b/sci-mathematics/coq/files/coq-8.2_p2-make-3.82.patch
new file mode 100644
index 000000000000..af46977b932c
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.2_p2-make-3.82.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/341187
+
+--- configure
++++ configure
+@@ -327,6 +327,8 @@
+   case $MAKEVERSION in
+     "GNU Make 3.81") 
+       echo "You have GNU Make 3.81. Good!";;
++    "GNU Make 3.82")
++      echo "You have GNU Make 3.82. Good!";;
+     *)
+       OK="no"
+       if [ -x ./make ]; then