Version bump, bug 166350

Package-Manager: portage-2.1.2-r9

5 files changed, 199 insertions, 12 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index e1aac900063a..4576a9b175f4 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.139 2007/02/06 13:03:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.140 2007/02/11 21:56:29 armin76 Exp $
+
+*mldonkey-2.8.3 (11 Feb 2007)
+
+  11 Feb 2007; Raúl Porcel <armin76@gentoo.org> +mldonkey-2.8.3.ebuild:
+  Version bump, bug 166350
 
   06 Feb 2007; Jeroen Roovers <jer@gentoo.org> mldonkey-2.8.2-r1.ebuild:
   Stable for HPPA (bug #165591).
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 9cc871789d31..20d924152422 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -35,7 +35,8 @@ MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
 DIST mldonkey-2.7.7.tar.bz2 2847137 RMD160 44c61e368354d961adf6e7b125d0036eb4bde946 SHA1 9cce5d072e8eae5440af7607c4557e1554dff276 SHA256 8759345bf699b3b349d6db944b36c4f60a5cedf7e314eabf6b3817b8f1052958
-DIST mldonkey-2.8.2.tar.bz2 2652074 RMD160 ce95184805ac8f4c690e37c75d418b5f7e265f92 SHA1 510fad86b4c83b54a7e8836cec3a3f30d67aed8a SHA256 51efc1c339b8cbafde93f4444f18e4243f41008b1c4107a41602542e9eeaa68e
+DIST mldonkey-2.8.2.tar.bz2 54944 RMD160 a682c84c85b2b7faee744daca3cbeaadff4b8b0e SHA1 bd5ae028607bc463ef77683981b6933775c87da3 SHA256 283dc58cf7eac479ff717fedfa067336af542f68d20b7bdfec0f911d744da6ca
+DIST mldonkey-2.8.3.tar.bz2 2659818 RMD160 4dc9547584c2bcf4de93a2eee420528e6d7b7814 SHA1 6b824a657b08a2fcc030cf2b4f81af8cb181e500 SHA256 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f
 EBUILD mldonkey-2.7.7.ebuild 4466 RMD160 3e325d9d2c8e219d397d0fec7f2e5f66221833cc SHA1 cfa95acb4cec3cd41fc17d1c3be985412117dd2a SHA256 018026187cdc62188dd728f561541cc25241edfbaebb13c2e61365219a6e0013
 MD5 0e94db2d4cbcf1aa73056f3f1cd85e2d mldonkey-2.7.7.ebuild 4466
 RMD160 3e325d9d2c8e219d397d0fec7f2e5f66221833cc mldonkey-2.7.7.ebuild 4466
@@ -44,10 +45,14 @@ EBUILD mldonkey-2.8.2-r1.ebuild 4747 RMD160 813d2864939f5a414c6719a7b7b15fb913f9
 MD5 72870d1a0bc2ef91c4f203ca49ba4cdb mldonkey-2.8.2-r1.ebuild 4747
 RMD160 813d2864939f5a414c6719a7b7b15fb913f9939b mldonkey-2.8.2-r1.ebuild 4747
 SHA256 ce151d55bd5c90aaa5f7638e78205c5fff0cef1c3c6dec7a51874de04e0a6a38 mldonkey-2.8.2-r1.ebuild 4747
-MISC ChangeLog 23026 RMD160 ae35f44febb63ec1c89c08b9a3a2d4c9b0cd62fa SHA1 440dcc06bf5354279d2072f6a5d95a1d327e2a7c SHA256 51c30ee6456ecddb510b7a212d983d87485cfb15b5f89c5c4b21358a7f44f642
-MD5 039bb2f56d27dcf6f29c462c26928d4b ChangeLog 23026
-RMD160 ae35f44febb63ec1c89c08b9a3a2d4c9b0cd62fa ChangeLog 23026
-SHA256 51c30ee6456ecddb510b7a212d983d87485cfb15b5f89c5c4b21358a7f44f642 ChangeLog 23026
+EBUILD mldonkey-2.8.3.ebuild 4637 RMD160 6f59ea23da75f7e25fb145fd2de270fe3291408c SHA1 68b5600ec2e8506cbf5b89052df513dd5916d874 SHA256 80dc5699821ad441bf1e7c3ca1b6900394a8581333ea7df0a9f34f36efae98b8
+MD5 9dc317c6f30fbff4cab6eb3369309674 mldonkey-2.8.3.ebuild 4637
+RMD160 6f59ea23da75f7e25fb145fd2de270fe3291408c mldonkey-2.8.3.ebuild 4637
+SHA256 80dc5699821ad441bf1e7c3ca1b6900394a8581333ea7df0a9f34f36efae98b8 mldonkey-2.8.3.ebuild 4637
+MISC ChangeLog 23162 RMD160 362833e54d0ca5fa223208164129ff0ec16d3206 SHA1 559170e42ae534c013fb1f8e822c969d4d4368be SHA256 368fb904031a0f98b4844096f16389323ee6d62e70222fa7581f3743cfe0e1f5
+MD5 b76d01ba1977a4cdd0f08022235e06fd ChangeLog 23162
+RMD160 362833e54d0ca5fa223208164129ff0ec16d3206 ChangeLog 23162
+SHA256 368fb904031a0f98b4844096f16389323ee6d62e70222fa7581f3743cfe0e1f5 ChangeLog 23162
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
@@ -55,6 +60,9 @@ SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 metadata
 MD5 ef2cdf6798b804e044d83871458dae1f files/digest-mldonkey-2.7.7 250
 RMD160 48727379719d82f599c405a75030e8ae42b14d4b files/digest-mldonkey-2.7.7 250
 SHA256 4259da6fad3ea758293a8795cbab96ebd293ac70b2bcca938385cb24f37343b7 files/digest-mldonkey-2.7.7 250
-MD5 7a49132cb0108ac570b978eb6000db45 files/digest-mldonkey-2.8.2-r1 250
-RMD160 4213be41a9c4db4d112e40396786dcd55f49436a files/digest-mldonkey-2.8.2-r1 250
-SHA256 cdb85c503837b524df40852095c65b6fe6211fdc48b803c4da5a92554e6286a1 files/digest-mldonkey-2.8.2-r1 250
+MD5 1df89e4a51ebe039e9666eb58f905177 files/digest-mldonkey-2.8.2-r1 244
+RMD160 af71544772c214a4cf06d6fa0468a1ae54e48da7 files/digest-mldonkey-2.8.2-r1 244
+SHA256 9ef15e699d176a538cf51530caa1d33ea2646df31443caf794a5fc91b2f87ea4 files/digest-mldonkey-2.8.2-r1 244
+MD5 c266459079754cd1f7cd94e25e20acef files/digest-mldonkey-2.8.3 250
+RMD160 047c3dd1309a7613612c337055ed7fa788ea02d3 files/digest-mldonkey-2.8.3 250
+SHA256 458be0c5dae9781c1236e54ac527e18977c81d6a3254545e6dab9f2568c5b50a files/digest-mldonkey-2.8.3 250
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.8.2-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.8.2-r1
index 04ea99d280aa..af053913357c 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.8.2-r1
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.8.2-r1
@@ -1,3 +1,3 @@
-MD5 123aeb79a3ca91a4943b59f044e98d4a mldonkey-2.8.2.tar.bz2 2652074
-RMD160 ce95184805ac8f4c690e37c75d418b5f7e265f92 mldonkey-2.8.2.tar.bz2 2652074
-SHA256 51efc1c339b8cbafde93f4444f18e4243f41008b1c4107a41602542e9eeaa68e mldonkey-2.8.2.tar.bz2 2652074
+MD5 06a5f5bfdc3d91a402161713cca5ed55 mldonkey-2.8.2.tar.bz2 54944
+RMD160 a682c84c85b2b7faee744daca3cbeaadff4b8b0e mldonkey-2.8.2.tar.bz2 54944
+SHA256 283dc58cf7eac479ff717fedfa067336af542f68d20b7bdfec0f911d744da6ca mldonkey-2.8.2.tar.bz2 54944
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.8.3 b/net-p2p/mldonkey/files/digest-mldonkey-2.8.3
new file mode 100644
index 000000000000..f22d2c9a6bdd
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.8.3
@@ -0,0 +1,3 @@
+MD5 415eec223b97f50e6bbc4126980b3836 mldonkey-2.8.3.tar.bz2 2659818
+RMD160 4dc9547584c2bcf4de93a2eee420528e6d7b7814 mldonkey-2.8.3.tar.bz2 2659818
+SHA256 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f mldonkey-2.8.3.tar.bz2 2659818
diff --git a/net-p2p/mldonkey/mldonkey-2.8.3.ebuild b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild
new file mode 100644
index 000000000000..6bf16febf2a6
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.3.ebuild,v 1.1 2007/02/11 21:56:29 armin76 Exp $
+
+inherit flag-o-matic
+
+IUSE="batch doc fasttrack gd gnutella gtk guionly magic"
+
+DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
+HOMEPAGE="http://mldonkey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~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 )
+	magic? ( sys-apps/file )"
+
+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}"
+
+	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
+	# 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 fasttrack) \
+		$(use_enable gnutella) \
+		$(use_enable gnutella gnutella2) \
+		$(use_enable batch) \
+		$(use_enable gd) \
+		$(use_enable magic) \
+		${myconf} || die "econf failed"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "emake failed"
+
+	if ! use guionly; then
+		emake utils || die "emake 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-2.8" mldonkey
+		fperms 600 /etc/conf.d/mldonkey
+		exeinto /etc/init.d; newexe "${FILESDIR}/mldonkey.initd-2.8-r1" mldonkey
+	fi
+
+	if use gtk; then
+		dobin mlgui mlguistarter
+		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 MLDonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+}