Fixed lablgtk DEPEND to accept any 1.x version but not the 2.x versions... bug #44227.

5 files changed, 20 insertions, 21 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index a23f5a5d180b..b31fcbef7b6b 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.31 2004/03/10 00:07:55 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.32 2004/03/12 12:18:29 eradicator Exp $
+
+  12 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mldonkey-2.5.11.ebuild, mldonkey-2.5.12.ebuild, mldonkey-2.5.16.ebuild:
+  Fixed lablgtk DEPEND to accept any 1.x version but not the 2.x versions... bug
+  #44227.
 
 *mldonkey-2.5.16 (10 Mar 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 9ac07c04f250..b6f2d700f7bd 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,14 +1,14 @@
-MD5 210edb74bb3a0a052eeeacaa1943cca2 ChangeLog 5257
-MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
 MD5 e342293e49968c21e3765deae18df7b1 mldonkey-2.5.4.ebuild 2382
-MD5 569045db318da322491934f9f6308a90 mldonkey-2.5.11.ebuild 2244
-MD5 b7142c7822e438682b412112a94908ff mldonkey-2.5.12.ebuild 2335
-MD5 62749abfa19693a1148e1e21ad26b042 mldonkey-2.5.16.ebuild 2308
-MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
-MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
-MD5 932032bf437e5a18a40dc61e80393929 files/mldonkey 312
+MD5 00776cc28732247f34bd15159abf12c0 mldonkey-2.5.12.ebuild 2308
+MD5 c6c6065b73f21488c6e113b9134b6d9b ChangeLog 5485
+MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
+MD5 7292d5c54f9060d0f8f0749b0751f0d3 mldonkey-2.5.16.ebuild 2289
+MD5 ad71ed2ad86083cb59a5794371f0fe69 mldonkey-2.5.11.ebuild 2220
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 1303cbe40541d28705186aedce157de5 files/mldonkey.initd 1913
 MD5 dae23fdba15565dd81c5bd2b0fef7278 files/digest-mldonkey-2.5.11 68
 MD5 86743f63e50d672062cad31e52ac357b files/digest-mldonkey-2.5.12 68
 MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16 68
+MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
+MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
+MD5 932032bf437e5a18a40dc61e80393929 files/mldonkey 312
diff --git a/net-p2p/mldonkey/mldonkey-2.5.11.ebuild b/net-p2p/mldonkey/mldonkey-2.5.11.ebuild
index 30771445e10a..438315d32ac7 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.11.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.11.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.11.ebuild,v 1.2 2004/02/24 11:20:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.11.ebuild,v 1.3 2004/03/12 12:18:29 eradicator Exp $
 
 inherit eutils
 
 IUSE="gtk"
 
-S="${WORKDIR}/${P}"
-
 DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
@@ -17,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 
 
-DEPEND="gtk? ( =dev-ml/lablgtk-1.2.5 )
+DEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06
 	dev-lang/perl"
 RDEPEND="net-misc/wget"
diff --git a/net-p2p/mldonkey/mldonkey-2.5.12.ebuild b/net-p2p/mldonkey/mldonkey-2.5.12.ebuild
index 09dee0ff75aa..7c9821bd5a49 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.12.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.12.ebuild,v 1.3 2004/02/24 11:20:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.12.ebuild,v 1.4 2004/03/12 12:18:29 eradicator Exp $
 
 inherit eutils
 
@@ -8,8 +8,6 @@ IUSE="gtk"
 
 MY_P=${P//./-}
 
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${MY_P}.tar.gz"
@@ -19,7 +17,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 
 
-DEPEND="gtk? ( =dev-ml/lablgtk-1.2.5 )
+DEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06
 	dev-lang/perl"
 RDEPEND="net-misc/wget"
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16.ebuild
index eb8d31026b34..5968a6b69062 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16.ebuild,v 1.1 2004/03/10 00:07:56 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16.ebuild,v 1.2 2004/03/12 12:18:29 eradicator Exp $
 
 inherit eutils
 
 IUSE="gtk"
 
-S="${WORKDIR}/${P}"
-
 DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
@@ -17,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 
 
-DEPEND="gtk? ( =dev-ml/lablgtk-1.2.5 )
+DEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06
 	dev-lang/perl"
 RDEPEND="net-misc/wget"