My 2.5 ebuild didn't work quite right - trying this fix (from bug 20884)

5 files changed, 100 insertions, 1 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 547d838a9ab2..5d3c2be9d1dd 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.13 2003/05/28 13:59:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.14 2003/06/02 18:51:41 caleb Exp $
+
+*mldonkey-2.5-r1 (02 Jun 2003)
+
+  02 Jun 2003; Caleb Tennis <caleb@gentoo.org> mldonkey-2.5-r1.ebuild, mldonkey:
+  New revision based on the fact the old ebuild (2.5) didn't work 100% properly.
+  Thanks to Gregorio Guidi for the submission - closes bug #20884.
 
 *mldonkey-2.5 (28 May 2003)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 35bd176b5896..6239583168cf 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,8 +1,11 @@
+MD5 d43be525ca710d573811bf91c27ded08 mldonkey-2.5-r1.ebuild 1763
 MD5 e5094a1dcf4979cf15ba78d435da09c7 mldonkey-2.02-r1.ebuild 2217
 MD5 30816597e1a86056add83a1894e2c683 mldonkey-2.04_rc1.ebuild 1870
 MD5 f33f9830309f58c58ef81baf58091827 ChangeLog 2242
 MD5 73773e015826112913003dbfe0ab8e6a mldonkey-2.5.ebuild 1900
 MD5 42fb9dc4604cbd74f00ef7e9528533fe files/digest-mldonkey-2.04_rc1 77
+MD5 d7470a0d99aae3be1ce3859c14e51b2b files/digest-mldonkey-2.5-r1 75
 MD5 d7470a0d99aae3be1ce3859c14e51b2b files/digest-mldonkey-2.5 75
 MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
+MD5 d9f838448fda4db6ac2d244804c8d664 files/mldonkey 307
 MD5 a3754baf66ab9ac99f566b5f762b0c91 files/digest-mldonkey-2.02-r1 142
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1
new file mode 100644
index 000000000000..01f363a21ce7
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1
@@ -0,0 +1 @@
+MD5 bd9866a1b42cff6022d2322b4d65158c mldonkey-2.5-0.sources.tar.gz 2544129
diff --git a/net-p2p/mldonkey/files/mldonkey b/net-p2p/mldonkey/files/mldonkey
new file mode 100644
index 000000000000..65d61e9ee118
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -d ${HOME}/.mldonkey ] ; then
+	echo "Creating subdirectory \".mldonkey\" in your home"
+	echo "to store config files and downloaded files..."
+	
+	if ! mkdir ${HOME}/.mldonkey ; then
+		echo "Creation of subdirectory failed! Exiting..."
+		exit 1
+	fi
+fi
+
+cd ${HOME}/.mldonkey && /usr/bin/mlnet
diff --git a/net-p2p/mldonkey/mldonkey-2.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5-r1.ebuild
new file mode 100644
index 000000000000..0a6079e70beb
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.5-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/06/02 18:51:41 caleb Exp $
+
+IUSE="gtk"
+
+S="${WORKDIR}/${PN}"
+MY_PV="2.5"
+MY_PR="0"
+
+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}/release-${MY_PV}/official/${PN}-${MY_PV}-${MY_PR}.sources.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="gtk? ( >=lablgtk-1.2.4 )
+	>=dev-lang/ocaml-3.06
+	dev-lang/perl"
+
+src_compile() {
+	use gtk || export GTK_CONFIG="no"
+
+	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+	econf \
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-ocamlver=3.06
+
+	emake || die
+}
+
+src_install() {
+	dobin mlnet
+	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
+	dobin ${FILESDIR}/mldonkey
+
+	dodoc Developers.txt
+	
+	cd ${S}/distrib
+	dodoc AUTHORS BUGS COPYING ChangeLog ed2k_links.txt TODO
+	dohtml FAQ.html
+
+	insinto /usr/share/doc/${PF}/scripts
+	doins kill_mldonkey mldonkey_command mldonkey_previewer;
+
+	insinto /usr/share/doc/${PF}/distrib
+	doins directconnect.ini;
+
+	cd ${S}/docs/users
+	dodoc *
+
+	cd ${S}/docs/developers
+	dodoc *.txt *.tex
+
+	cd ${S}/docs/networks
+	dodoc *.txt *.pdf
+	dohtml *.html
+	
+	docinto Gnutella
+	dodoc Gnutella/*
+
+	insinto /usr/share/doc/${PF}/html/images
+	doins images/*
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
+	einfo "If you want to start mldonkey in a particular working directory,"
+	einfo "use the \`mlnet' command."
+	einfo ""
+}