summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Hood <squinky86@gentoo.org>2004-08-24 17:31:32 +0000
committerJon Hood <squinky86@gentoo.org>2004-08-24 17:31:32 +0000
commitd00cbdcaa92258d1f4d4acff25895bdbb2380cb5 (patch)
treeb6b4034a4ee50d2f14703a390ad325c832f814b9 /net-p2p
parentdigest fixer upper for new theme used (diff)
downloadgentoo-2-d00cbdcaa92258d1f4d4acff25895bdbb2380cb5.tar.gz
gentoo-2-d00cbdcaa92258d1f4d4acff25895bdbb2380cb5.tar.bz2
gentoo-2-d00cbdcaa92258d1f4d4acff25895bdbb2380cb5.zip
do not install lablgtk from the internet if it's not available
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/mldonkey/ChangeLog6
-rw-r--r--net-p2p/mldonkey/files/2.5.28-config.patch14
-rw-r--r--net-p2p/mldonkey/mldonkey-2.5.28.ebuild5
3 files changed, 21 insertions, 4 deletions
diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 4cb8c179e398..a07523c6c64e 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/mldonkey
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.70 2004/08/22 11:30:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.71 2004/08/24 17:31:32 squinky86 Exp $
+
+ 24 Aug 2004; Jon Hood <squinky86@gentoo.org> +files/2.5.28-config.patch,
+ mldonkey-2.5.28.ebuild:
+ Add configure patch to not install lablgtk if it is not available, #61425.
22 Aug 2004; Travis Tilley <lv@gentoo.org> mldonkey-2.5.28.ebuild:
added ~amd64 keyword
diff --git a/net-p2p/mldonkey/files/2.5.28-config.patch b/net-p2p/mldonkey/files/2.5.28-config.patch
new file mode 100644
index 000000000000..70846fb052af
--- /dev/null
+++ b/net-p2p/mldonkey/files/2.5.28-config.patch
@@ -0,0 +1,14 @@
+--- ./config/configure.in 2004-08-24 12:12:07.384416608 -0500
++++ ./config/configure.in 2004-08-24 12:11:02.455287336 -0500
+@@ -626,9 +626,8 @@
+ echo "probably forgot to call 'make opt' before 'make install'."
+ echo "--------------------------------"
+ else
+- echo "Do you want this script to try to download and install lablgtk"
+- echo "LOCALLY in mldonkey directory ?"
+- if test "$BATCH" = "no"; then read i; else i=yes; fi
++ echo "Disabling lablgtk support."
++ if test "$BATCH" = "no"; then read i; else i=no; fi
+ case "$i" in
+ y* | Y*)
+
diff --git a/net-p2p/mldonkey/mldonkey-2.5.28.ebuild b/net-p2p/mldonkey/mldonkey-2.5.28.ebuild
index 0766f625c188..1ee2b36da733 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.28.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.28.ebuild,v 1.3 2004/08/24 03:34:44 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.28.ebuild,v 1.4 2004/08/24 17:31:32 squinky86 Exp $
inherit eutils
@@ -17,11 +17,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-#remove !gtk? line as soon as gui is optional
RDEPEND=">=dev-lang/ocaml-3.08
dev-lang/perl
net-misc/wget
- !gtk? ( =dev-ml/lablgtk-1.2.7* )
gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
@@ -34,6 +32,7 @@ src_unpack() {
unpack ${P}.tar.bz2
cd ${S}
# epatch ${DISTDIR}/${PATCHPACK}
+ use gtk || epatch ${FILESDIR}/${PV}-config.patch
export WANT_AUTOCONF=2.5
cd config; autoconf; cd ..
}