Added patch to allow orpie to be compiled against ocaml-3.09.*. Thanks much to David Brown <gentoo@davidb.org> for the patch. This closes bug #160825.

Package-Manager: portage-2.1.2_rc4-r4

4 files changed, 36 insertions, 27 deletions

diff --git a/sci-calculators/orpie/ChangeLog b/sci-calculators/orpie/ChangeLog
index 3199f0b62eee..a346eac43f99 100644
--- a/sci-calculators/orpie/ChangeLog
+++ b/sci-calculators/orpie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/orpie
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/ChangeLog,v 1.6 2007/01/06 22:11:00 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/ChangeLog,v 1.7 2007/01/08 15:35:23 markusle Exp $
+
+  08 Jan 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/orpie-ocaml-gentoo.patch, orpie-1.4.3-r1.ebuild:
+  Added patch to allow orpie to be compiled against ocaml-3.09.*.
+  Thanks much to David Brown <gentoo@davidb.org> for the patch.
+  This closes bug #160825.
 
   06 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -orpie-1.4.1.ebuild,
   -orpie-1.4.3.ebuild:
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index 08b1211f7d61..7c057653c761 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1,19 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX orpie-1.4.3-quote-down-crash.patch 1103 RMD160 ef08f74d2e17f2339cdf7df5450c751229b163ec SHA1 5c4902699234eac9baa04904e3d63bcec04308ef SHA256 47c315cc016e4b5cab86cee9d78422bc23fa9e857e8161924d44bab7dcd7f457
 MD5 b96b5a05d7a41857de8cff887ef2e375 files/orpie-1.4.3-quote-down-crash.patch 1103
 RMD160 ef08f74d2e17f2339cdf7df5450c751229b163ec files/orpie-1.4.3-quote-down-crash.patch 1103
 SHA256 47c315cc016e4b5cab86cee9d78422bc23fa9e857e8161924d44bab7dcd7f457 files/orpie-1.4.3-quote-down-crash.patch 1103
+AUX orpie-ocaml-gentoo.patch 576 RMD160 d91839adfe507814fd3d94574059aab62f70d7f8 SHA1 d05a1930a2fe165b4a877724369b65bdd43fdc2b SHA256 ab41d3aad4d7694e43be62d80a87dcff2b11b6869bd257e663dc169b4b1cc4d2
+MD5 fe8450153778f31bfd44f08d745fa0a1 files/orpie-ocaml-gentoo.patch 576
+RMD160 d91839adfe507814fd3d94574059aab62f70d7f8 files/orpie-ocaml-gentoo.patch 576
+SHA256 ab41d3aad4d7694e43be62d80a87dcff2b11b6869bd257e663dc169b4b1cc4d2 files/orpie-ocaml-gentoo.patch 576
 DIST orpie-1.4.3.tar.gz 356721 RMD160 81a1cf45ea761dd67ca3eae75fa8ff670c2c6989 SHA1 068fd06467b20dea54c230933e2ee391cebe2616 SHA256 beb46341286a8b4c38ce21a2e93cbd9e32924c5d4bb5015baf2dbf756d6dafc3
-EBUILD orpie-1.4.3-r1.ebuild 844 RMD160 8cd23f38aab2e928b9ff38c963d4444b8ddb8ae4 SHA1 5c60d0d067afb28cb590388ab78d7435f67f0405 SHA256 a3dac0498799e482bf14c5087ff1007386907a5661741fdf621efc8596223dff
-MD5 525243777c535d985c93da641cea28bc orpie-1.4.3-r1.ebuild 844
-RMD160 8cd23f38aab2e928b9ff38c963d4444b8ddb8ae4 orpie-1.4.3-r1.ebuild 844
-SHA256 a3dac0498799e482bf14c5087ff1007386907a5661741fdf621efc8596223dff orpie-1.4.3-r1.ebuild 844
-MISC ChangeLog 1276 RMD160 b5fd23aacf94cdf34709a014ecc0b710ac8897e6 SHA1 0f79929f1c38ab3a780c78909c686fb45ea87990 SHA256 2c2169be86aa987e8d763de10bc1f8c30e5880e16e634131eaafe011963f6dc3
-MD5 7e7f295b7870c1867e6afdc87b22eeee ChangeLog 1276
-RMD160 b5fd23aacf94cdf34709a014ecc0b710ac8897e6 ChangeLog 1276
-SHA256 2c2169be86aa987e8d763de10bc1f8c30e5880e16e634131eaafe011963f6dc3 ChangeLog 1276
+EBUILD orpie-1.4.3-r1.ebuild 836 RMD160 10ec3996bf6fcc7a92be1746b2adf13ca4ef7846 SHA1 75149d4fb35c69ef9069795973adb49e14c8c29f SHA256 e0dd0a8e4a77103277619bcafba25beb2b0dc2f3c3d62df2ffc603385e5f5760
+MD5 f18218883562d069518b8961400eec4e orpie-1.4.3-r1.ebuild 836
+RMD160 10ec3996bf6fcc7a92be1746b2adf13ca4ef7846 orpie-1.4.3-r1.ebuild 836
+SHA256 e0dd0a8e4a77103277619bcafba25beb2b0dc2f3c3d62df2ffc603385e5f5760 orpie-1.4.3-r1.ebuild 836
+MISC ChangeLog 1544 RMD160 4bee617f95169bb7fccdfbd7262e5bb83cf05df1 SHA1 8d8d261b7882b3c6c65ebc7724889558378fb310 SHA256 c6cad92442d125ca9152218d32c60031cab41db0202918f47b4a286842d037ec
+MD5 28bd9408b37cc58d991428f51a9bf63b ChangeLog 1544
+RMD160 4bee617f95169bb7fccdfbd7262e5bb83cf05df1 ChangeLog 1544
+SHA256 c6cad92442d125ca9152218d32c60031cab41db0202918f47b4a286842d037ec ChangeLog 1544
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -21,10 +22,3 @@ SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata
 MD5 e85c979ca850ec6d83fde7c11c191d2d files/digest-orpie-1.4.3-r1 235
 RMD160 5aa6137d79890bc3f18b842d7b38bddb09f83c20 files/digest-orpie-1.4.3-r1 235
 SHA256 b8c0bb4dc0c8860ee910496bed76d99812e3e57f66e7bffd311c3936a0f00ef2 files/digest-orpie-1.4.3-r1 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFoB6c5mJXAu5GbtIRAiruAJ40WdVLTjTIrORq0gOteJuUuN0PBgCfbJoD
-8bF1t3JLH9qrBD7YvwsON9M=
-=I6Ti
------END PGP SIGNATURE-----
diff --git a/sci-calculators/orpie/files/orpie-ocaml-gentoo.patch b/sci-calculators/orpie/files/orpie-ocaml-gentoo.patch
new file mode 100644
index 000000000000..856a46c15f06
--- /dev/null
+++ b/sci-calculators/orpie/files/orpie-ocaml-gentoo.patch
@@ -0,0 +1,13 @@
+diff -Naur orpie-1.4.3/gsl/mlgsl_error.c orpie-1.4.3-new/gsl/mlgsl_error.c
+--- orpie-1.4.3/gsl/mlgsl_error.c	2005-10-29 22:40:23.000000000 -0400
++++ orpie-1.4.3-new/gsl/mlgsl_error.c	2007-01-08 09:14:35.000000000 -0500
+@@ -43,7 +43,8 @@
+   exn_arg = alloc_small(2, 0);
+   Store_field(exn_arg, 0, Val_int(conv_err_code(gsl_errno)));
+   Store_field(exn_arg, 1, copy_string(ml_gsl_exn_msg));
+-  CAMLreturn(raise_with_arg(*ml_gsl_exn, exn_arg));
++  raise_with_arg(*ml_gsl_exn, exn_arg);
++  CAMLreturn0;
+ }
+ 
+ static void ml_gsl_error_handler(const char *reason, const char *file,
diff --git a/sci-calculators/orpie/orpie-1.4.3-r1.ebuild b/sci-calculators/orpie/orpie-1.4.3-r1.ebuild
index 86dd8a161c33..e76406d8ce74 100644
--- a/sci-calculators/orpie/orpie-1.4.3-r1.ebuild
+++ b/sci-calculators/orpie/orpie-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/orpie-1.4.3-r1.ebuild,v 1.1 2006/11/02 00:10:38 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/orpie/orpie-1.4.3-r1.ebuild,v 1.2 2007/01/08 15:35:23 markusle Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="~dev-lang/ocaml-3.08.4
+DEPEND="dev-lang/ocaml
 	sci-libs/gsl
 	sys-libs/ncurses"
 
@@ -21,11 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-quote-down-crash.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die
+	epatch "${FILESDIR}"/${PN}-ocaml-gentoo.patch
 }
 
 src_install() {