Patch for ocaml-3.09.2, may need to be backported to other mldonkey versions.

(Portage version: 2.0.54)

10 files changed, 42 insertions, 25 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 2586aa1a3710..629858db4c8b 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.119 2006/03/15 00:44:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.120 2006/04/27 19:24:26 mattam Exp $
+
+  27 Apr 2006; Matthieu Sozeau <mattam@gentoo.org>
+  +files/mldonkey-2.7.3-configure.patch, mldonkey-2.7.3.ebuild:
+  Patch for ocaml-3.09.2, may need to be backported.
 
   15 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> mldonkey-2.7.3.ebuild:
   Seems to work nice enough, deserves ~hppa
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index acaaf357f59b..71754c4692f0 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 034332aedc8a6cd77037c23a2b973dc7 ChangeLog 19243
 MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
@@ -16,6 +13,7 @@ MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
 MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
+MD5 e6ba1f14ca558c6834b6e0d47013e212 files/mldonkey-2.7.3-configure.patch 497
 MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263
 MD5 0308db20eac32dd62c1519106c6809a7 files/mldonkey.confd 770
 MD5 39035eb38db4becb71b58945466eeb95 files/mldonkey.initd 3063
@@ -30,11 +28,4 @@ MD5 f42930815313489969c08481c08603f2 mldonkey-2.6.7.ebuild 5029
 MD5 3586cd008283449062e3960e8b170ed8 mldonkey-2.7.0.ebuild 5093
 MD5 df713d2d96f28dc3a77f8af3d1581704 mldonkey-2.7.1.ebuild 4984
 MD5 07f1ca93a2181a341950e4474c45d237 mldonkey-2.7.2.ebuild 4979
-MD5 6e5e54b28c09d8819c280070b07d3d82 mldonkey-2.7.3.ebuild 4990
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEF2OUKRy60XGEcJIRAjTsAJ0YpveKndnZwOgpo5+E5WLKkb9bmACeOKnl
-x9i92CgG/OhWpsY7YtUvIc0=
-=8dUY
------END PGP SIGNATURE-----
+MD5 cbf27a7a85b47919b30a3bf416c9bc94 mldonkey-2.7.3.ebuild 5032
diff --git a/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch
new file mode 100644
index 000000000000..dd29f404bda2
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch
@@ -0,0 +1,20 @@
+--- configure.in.old	2006-04-27 20:46:37.000000000 +0200
++++ configure.in	2006-04-27 20:46:53.000000000 +0200
+@@ -331,7 +331,7 @@
+   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
+   case "$OCAMLVERSION" in
+     "$REQUIRED_OCAML"*) ;;
+-    3.09.0*) ;;
++    3.09.*) ;;
+     3.08.4*) ;;
+     3.08.3*) ;;
+     *)
+@@ -464,7 +464,7 @@
+ REBUILD_OCAML=no
+ case "$OCAMLVERSION" in
+     "$REQUIRED_OCAML"*) ;;
+-    3.09.0*) ;;
++    3.09.*) ;;
+     3.08.4*) ;;
+     3.08.3*) ;;
+     *)
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
index e3e81303e036..c829a20cc357 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild,v 1.4 2005/08/07 13:40:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild,v 1.5 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
index 78a0136d8e38..61a988f1cd87 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.9 2005/02/05 18:56:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.10 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
index c09e9010f94a..d3b918ae2aef 100644
--- a/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild,v 1.2 2005/10/15 10:14:10 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild,v 1.3 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.6.5.ebuild b/net-p2p/mldonkey/mldonkey-2.6.5.ebuild
index 78895f0e70c1..f20a38e0c92a 100644
--- a/net-p2p/mldonkey/mldonkey-2.6.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.5.ebuild,v 1.1 2005/10/14 19:12:07 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.5.ebuild,v 1.2 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.6.7.ebuild b/net-p2p/mldonkey/mldonkey-2.6.7.ebuild
index a719d99b295a..59bd2d5044c6 100644
--- a/net-p2p/mldonkey/mldonkey-2.6.7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.7.ebuild,v 1.2 2005/11/21 00:51:39 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.7.ebuild,v 1.3 2006/04/27 19:24:27 mattam Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.7.1.ebuild b/net-p2p/mldonkey/mldonkey-2.7.1.ebuild
index 83ea50648cee..25a725abe1ec 100644
--- a/net-p2p/mldonkey/mldonkey-2.7.1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.7.1.ebuild,v 1.1 2005/12/20 21:01:22 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.7.1.ebuild,v 1.2 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
diff --git a/net-p2p/mldonkey/mldonkey-2.7.3.ebuild b/net-p2p/mldonkey/mldonkey-2.7.3.ebuild
index c271ff585375..868c11d2ea68 100644
--- a/net-p2p/mldonkey/mldonkey-2.7.3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.7.3.ebuild,v 1.3 2006/03/15 00:44:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.7.3.ebuild,v 1.4 2006/04/27 19:24:27 mattam Exp $
 
 inherit eutils
 
@@ -63,6 +63,8 @@ pkg_setup() {
 src_compile() {
 	export WANT_AUTOCONF=2.5
 	cd ${S}/config
+	epatch ${FILESDIR}/${P}-configure.patch
+
 	autoconf
 
 	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway