Version bump, #124199.

(Portage version: 2.1_rc1-r2)

7 files changed, 199 insertions, 4 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 629858db4c8b..6129f8688f52 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,18 @@
 # 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.120 2006/04/27 19:24:26 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.121 2006/05/18 17:49:44 squinky86 Exp $
+
+*mldonkey-2.7.5 (18 May 2006)
+
+  18 May 2006; Jon Hood <squinky86@gentoo.org>
+  -files/mldonkey-2.5.16-configure.patch,
+  -files/mldonkey-2.5.21-configure.patch,
+  -files/mldonkey-2.6.0-gtk2-gentoo.patch, +files/dp500.patch,
+  -mldonkey-2.6.0-r1.ebuild, -mldonkey-2.7.0.ebuild, -mldonkey-2.7.1.ebuild,
+  -mldonkey-2.7.2.ebuild, +mldonkey-2.7.5.ebuild:
+  Version bump, #124199. Thanks to Andreas Calvo <fflipy@hotmail.com>,
+  spiralvoice <spiralvoice@hotmail.com>, and many others in bug #124199 for
+  cleaning this up.
 
   27 Apr 2006; Matthieu Sozeau <mattam@gentoo.org>
   +files/mldonkey-2.7.3-configure.patch, mldonkey-2.7.3.ebuild:
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
index 4b5cb4eb8287..984f50fac6f9 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
@@ -1,2 +1,2 @@
 MD5 d969f81b51e194fcaf46790686269e3e mldonkey-2.6.4.tar.bz2 2669228
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
+MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.5 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.5
index 5557eda80f5e..a309b7e5ef47 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.5
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.5
@@ -1,2 +1,2 @@
 MD5 7f1d1809ca3147ad3eea5aec374dd42c mldonkey-2.6.5.tar.bz2 2756288
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
+MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.7 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.7
index 64696b20d9b1..101cf51b0f6e 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.7
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.7
@@ -1,2 +1,2 @@
 MD5 20e7e854092d553601149f60b73eb47e mldonkey-2.6.7.tar.bz2 2757906
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
+MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.5 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.5
new file mode 100644
index 000000000000..8e405fe36ff4
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.7.5
@@ -0,0 +1,3 @@
+MD5 3e6bcac8c49dd00a563199130aeaf185 mldonkey-2.7.5.tar.bz2 2815190
+RMD160 9e3363b16a8dfe680cbacb0be09a2fff7d8bde52 mldonkey-2.7.5.tar.bz2 2815190
+SHA256 dd3c521664cfbf67cb8c22aa6635c463333103e51c8152e0b191b92d7ebb38de mldonkey-2.7.5.tar.bz2 2815190
diff --git a/net-p2p/mldonkey/files/dp500.patch b/net-p2p/mldonkey/files/dp500.patch
new file mode 100644
index 000000000000..2814372cc7ad
--- /dev/null
+++ b/net-p2p/mldonkey/files/dp500.patch
@@ -0,0 +1,11 @@
+diff -a -x CVS -x Root -x Repository -x Tag -x Entries -x Entries.Log -x .svn -x '*.rej' -x '*.orig' -x .cvsignore -N -r -u ./config/Makefile.in ./config/Makefile.in
+--- ./config/Makefile.in	2006-04-09 02:27:03.000000000 +0200
++++ ./config/Makefile.in	2006-04-14 01:50:28.000000000 +0200
+@@ -734,6 +734,7 @@
+   $(COMMON)/guiProto.ml \
+   $(COMMON)/commonOptions.ml \
+   $(COMMON)/commonMessages.ml \
++  $(COMMON)/commonUserDb.ml \
+   $(COMMON)/commonGlobals.ml \
+   \
+   src/daemon/driver/driverLink.ml \
diff --git a/net-p2p/mldonkey/mldonkey-2.7.5.ebuild b/net-p2p/mldonkey/mldonkey-2.7.5.ebuild
new file mode 100644
index 000000000000..14d42b81e920
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.7.5.ebuild
@@ -0,0 +1,169 @@
+# 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.5.ebuild,v 1.1 2006/05/18 17:49:44 squinky86 Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="gtk guionly batch threads gd doc"
+
+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="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~x86"
+RESTRICT="nomirror"
+
+RDEPEND="dev-lang/perl
+	guionly? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gtk? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gd? ( >=media-libs/gd-2.0.28 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	!batch? ( >=dev-lang/ocaml-3.08.3 )
+	batch? ( net-misc/wget )"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	if use gtk; then
+		echo ""
+		einfo "If the compile with gui fails, and you have updated ocaml"
+		einfo "recently, you may have forgotten that you need to run"
+		einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+		einfo "to learn which ebuilds you need to recompile"
+		einfo "each time you update ocaml to a different version"
+		einfo "see the ocaml ebuild for details"
+		echo ""
+	fi
+
+	if use gtk && !(built_with_use dev-ml/lablgtk svg); then
+		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
+		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
+	fi
+
+	if use gd && !(built_with_use media-libs/gd truetype); then
+		eerror "media-libs/gd must be built with 'truetype' to compile"
+		eerror "mldonkey with gd support"
+		die "Recompile media-libs/gd with enabled truetype USE flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/dp500.patch
+
+	export WANT_AUTOCONF=2.5
+	cd ${S}/config
+	autoconf
+	cd ${S}
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+
+	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+
+	# batch 	Automatically download and build OCAML-3.08.3 for compiling itself
+	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
+	# onlygui	Disable all nets support, build only chosen GUI
+
+	if use gtk || use guionly; then
+		myconf="--enable-gui=newgui2"
+	else
+		myconf="--disable-gui"
+	fi
+
+	if use guionly; then
+		myconf="${myconf} --disable-multinet --disable-donkey"
+	fi
+
+	cd ${S}
+	econf \
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-checks \
+		`use_enable threads pthread` \
+		`use_enable batch` \
+		`use_enable gd` \
+		${myconf} || die "Configure Failed!"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "Make Failed"
+
+	if ! use guionly; then
+		emake utils || die "make utils failed"
+	fi;
+}
+
+src_install() {
+	if ! use guionly; then
+		dobin mlnet mld_hash get_range copysources make_torrent subconv
+		dobin ${FILESDIR}/mldonkey
+
+		insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
+		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+	fi
+
+	if use gtk; then
+		dobin mlgui mlguistarter mlchat mlim
+		domenu ${FILESDIR}/${PN}-gui.desktop
+		doicon ${FILESDIR}/${PN}.png
+	fi
+
+	if use doc ; then
+		cd ${S}/distrib
+		dodoc ChangeLog *.txt
+		dohtml *.html
+
+		insinto /usr/share/doc/${PF}/scripts
+		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
+
+		cd ${S}/docs
+		dodoc *.txt *.tex *.pdf
+		dohtml *.html
+
+		cd ${S}/docs/developers
+		dodoc *.txt *.tex
+
+		cd ${S}/docs/images
+		insinto /usr/share/doc/${PF}/html/images
+		doins *
+	fi
+}
+
+pkg_preinst() {
+	if ! use guionly; then
+		enewuser ${MLUSER} -1 /bin/bash /home/p2p users
+	fi
+}
+
+pkg_postinst() {
+	if ! use guionly; then
+		echo
+		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 "If you want to start mldonkey as a system service, use"
+		einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
+		einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
+		einfo "/etc/conf.d/mldonkey also."
+		echo
+		einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
+		einfo "will be problematic."
+		einfo "User settings (admin) are transferred to users.ini from "
+		einfo "downloads.ini"
+		einfo "Old ini files are automatically converted to the new format"
+		echo
+	else
+		echo
+		einfo "Simply run mlgui to start the chosen modonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+}