New revision bump without gtk2 flag. Also removing few older versions

(Portage version: 1.589-cvs)

16 files changed, 91 insertions, 680 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 494921d93065..239b1ea58763 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.98 2005/09/19 14:41:02 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.99 2005/09/20 17:38:13 mkay Exp $
+
+*mldonkey-2.6.4-r2 (20 Sep 2005)
+*mldonkey-2.6.0-r1 (20 Sep 2005)
+
+  20 Sep 2005; <mkay@gentoo.org> -files/2.5.28-config.patch,
+  -mldonkey-2.5.16-r10.ebuild, -mldonkey-2.5.27-r1.ebuild,
+  -mldonkey-2.5.28-r4.ebuild, +mldonkey-2.6.0-r1.ebuild,
+  -mldonkey-2.6.2.ebuild, -mldonkey-2.6.3.ebuild, -mldonkey-2.6.4.ebuild,
+  +mldonkey-2.6.4-r2.ebuild:
+  New revision bump without gtk2 flag. Also removing few older versions
 
   19 Sep 2005; <mkay@gentoo.org> mldonkey-2.6.2.ebuild,
   mldonkey-2.6.3.ebuild, mldonkey-2.6.4.ebuild, mldonkey-2.6.4-r1.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index a85f5425a5e8..d359fc30752a 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,25 +1,16 @@
 MD5 3da3e2cffaeb315f000794ce86de6ad8 ChangeLog 16369
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
-MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
 MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
 MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
-MD5 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
-MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
+MD5 78c827cb19a9d621753e8940c037003a mldonkey-2.6.0-r1.ebuild 3489
 MD5 d2f8ea7e805cc85802f99722ebf70981 mldonkey-2.6.0.ebuild 3562
-MD5 d167c5dbb88892994472ca9bd79df6d3 mldonkey-2.6.2.ebuild 5336
-MD5 d08a9b53df565d0ff6f3e3a57a99230f mldonkey-2.6.3.ebuild 5336
-MD5 a3160716b652d603f1b722adb3b53502 mldonkey-2.6.4.ebuild 5248
 MD5 07e3608c4c73905705df0dd123fd1354 mldonkey-2.6.4-r1.ebuild 5112
-MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
-MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
+MD5 a658007d54a17d46cd293544903490a7 mldonkey-2.6.4-r2.ebuild 4982
+MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4-r2 144
+MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0-r1 68
 MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
-MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
 MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
-MD5 67a885de61cad79c8770c9c6c136648b files/digest-mldonkey-2.6.2 204
-MD5 ba011b39cf2f1b424360ca9a38089064 files/digest-mldonkey-2.6.3 204
-MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4 144
 MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
diff --git a/net-p2p/mldonkey/files/2.5.28-config.patch b/net-p2p/mldonkey/files/2.5.28-config.patch
deleted file mode 100644
index 70846fb052af..000000000000
--- a/net-p2p/mldonkey/files/2.5.28-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./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/files/digest-mldonkey-2.5.16-r10 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r10
deleted file mode 100644
index bbc2de9baa31..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 139611fd8cfeecad675a3291936f6c0a patch_16_16v.bz2 95916
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.27-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.27-r1
deleted file mode 100644
index 37f4cafb075a..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.27-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a555065d37ce02f6414014d3ac69f7a3 mldonkey-2.5.27.tar.bz2 2728731
-MD5 e27c2a8860b04113e621cd366055ce93 patch_pack27c.gz 21664
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r4 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r4
deleted file mode 100644
index a428fd1e7a6c..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5b5128ec570ec065992db25d9a434285 mldonkey-2.5.28.tar.bz2 2760339
-MD5 28b3977cff499f8fc9f9b5713ebbf9c8 patch_pack28h.gz 57739
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1
new file mode 100644
index 000000000000..73a1ed2e83ae
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1
@@ -0,0 +1 @@
+MD5 3d9aff8eb7d44240950475ea1499ae75 mldonkey-2.6.0.tar.bz2 2622242
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.2 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.2
deleted file mode 100644
index 661bcb7999c8..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9d7c0bdf332c656086d2c0bcbe8cb28d mldonkey-2.6.2.tar.bz2 2655334
-MD5 f13b5374f675a54cc4c8ae128163ad52 mld_hash.patch.gz 6703
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.3 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.3
deleted file mode 100644
index 5f51e784c931..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5a71317970b0c5c2a50d3d4e98c14f41 mldonkey-2.6.3.tar.bz2 2660337
-MD5 fce6b934145907b5e452c0f4802273ca mld_hash.patch.gz 6703
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
index 4b5cb4eb8287..4b5cb4eb8287 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r10.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r10.ebuild
deleted file mode 100644
index e8f1cf7de5b0..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r10.ebuild,v 1.3 2005/05/06 21:35:02 kloeri Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-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
-	http://knocker.dyndns.org/2.5.16v/patch_16_16v.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~hppa ~amd64"
-
-RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	epatch ${DISTDIR}/patch_16_16v.bz2 || die
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-
-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-batch \
-		--enable-checks \
-		--enable-pthread || die
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	if use gtk; then
-		dobin mlchat mlgui mlguistarter mlim mlnet+gui
-		doicon ${FILESDIR}/mldonkey.png
-		make_desktop_entry mlgui "MLDonkey" mldonkey.png "Network"
-	fi
-	dobin ${FILESDIR}/mldonkey
-
-	dodoc ChangeLog Copying.txt Developers.txt Install.txt
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt
-	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
-	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 *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-}
-
-pkg_preinst() {
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	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
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild
deleted file mode 100644
index f411ae8b3a1a..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild,v 1.2 2005/02/05 18:56:50 luckyduck Exp $
-
-inherit eutils
-
-IUSE="gtk gtk2"
-
-PATCHPACK="patch_pack27c.gz"
-
-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://ftp.berlios.de/pub/mldonkey/spiralvoice/cvs/${P}.tar.bz2
-	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/${PATCHPACK}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
-
-RDEPEND=">=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget
-	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
-	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/${PATCHPACK}
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-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-batch \
-		--enable-checks \
-		--enable-pthread \
-		`use_enable gtk2` || die
-	export OCAMLRUNPARAM="l=256M"
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	dodoc ChangeLog Copying.txt Developers.txt Install.txt
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt Changelog_spiralvoice
-	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
-	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 *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-}
-
-pkg_preinst() {
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	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
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.28-r4.ebuild b/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
index 6902fd2d3803..7b65fe699750 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.28-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
@@ -1,61 +1,79 @@
 # Copyright 1999-2005 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-r4.ebuild,v 1.2 2005/02/05 18:56:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild,v 1.1 2005/09/20 17:38:13 mkay Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2"
-
-PATCHPACK="patch_pack28h.gz"
+IUSE="gd gtk"
 
 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://download.berlios.de/pub/mldonkey/spiralvoice/cvs/${P}.tar.bz2
-	http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/${PATCHPACK}"
+SRC_URI="http://savannah.nongnu.org/download/mldonkey/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
 
-RDEPEND=">=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget
-	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
-	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
+RDEPEND="dev-lang/perl
+		net-misc/wget
+		>=dev-lang/ocaml-3.08.3
+		gtk? ( >=gnome-base/librsvg-2.4.0
+				>=dev-ml/lablgtk-2.4 )
+		gd? ( >=media-libs/gd-2.0.28 )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58"
 
 MLUSER="p2p"
 
+pkg_setup() {
+	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 ""
+	if use gtk; then
+		built_with_use dev-ml/lablgtk svg || \
+	die "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
+	fi
+}
+
 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 ..
+	use gtk && epatch ${FILESDIR}/${P}-gtk2-gentoo.patch
 }
 
 src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+	myconf="";
+	if use gtk; then
+		myconf="--enable-gui"
+	fi;
 	econf \
 		--sysconfdir=/etc/mldonkey \
 		--sharedstatedir=/var/mldonkey \
 		--localstatedir=/var/mldonkey \
-		--enable-batch \
 		--enable-checks \
+		--disable-batch \
 		--enable-pthread \
-		`use_enable gtk2` || die
+		`use_enable gtk gtk2` \
+		`use_enable gd` \
+		${myconf} || die "Configure Failed!"
+
 	export OCAMLRUNPARAM="l=256M"
-	emake || die
+	emake || die "Make Failed"
 }
 
 src_install() {
 	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
+	if use gtk ; then
+		dobin mlchat mlgui mlguistarter mlim mlnet+gui
+	fi
 	dobin ${FILESDIR}/mldonkey
 
 	dodoc ChangeLog Copying.txt Developers.txt Install.txt
@@ -98,4 +116,10 @@ pkg_postinst() {
 	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
 }
diff --git a/net-p2p/mldonkey/mldonkey-2.6.2.ebuild b/net-p2p/mldonkey/mldonkey-2.6.2.ebuild
deleted file mode 100644
index 6b5623d132e0..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.6.2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.2.ebuild,v 1.5 2005/09/19 14:41:02 mkay Exp $
-
-inherit eutils
-
-IUSE="gtk gtk2 oldgtk guionly batch threads gd doc mozilla"
-
-MOZVER="1.7"
-
-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/mldonkey/${P}.tar.bz2
-	mirror://gentoo/mld_hash.patch.gz
-	mozilla? ( http://www.informatik.uni-oldenburg.de/~dyna/${PN}/${MOZVER}/mldonkey_protocol_handler-${MOZVER}.xpi )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-
-RDEPEND="dev-lang/perl
-	gtk2? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.4 )
-	gtk? ( =dev-ml/lablgtk-1.2.7* )
-	oldgtk? ( =dev-ml/lablgtk-1.2.7* )
-	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() {
-	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 ""
-
-	if (use gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
-		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
-		die "Choose only one GUI"
-	fi
-
-	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
-		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
-		die "You have guionly enabled, but you haven't chosen any of GUIs"
-	fi
-
-	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2 mld_hash.patch.gz
-	cd ${S}
-
-	epatch ${WORKDIR}/mld_hash.patch
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	cd ${S}/config
-	autoconf
-
-	# 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 gtk2; then
-		myconf="--enable-gui=newgui2"
-	elif use gtk; then
-		myconf="--enable-gui=newgui1"
-	elif use oldgtk; then
-		myconf="--enable-gui=oldgui"
-	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 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 gtk2 || use gtk || use oldgtk); then
-		dobin mlgui mlguistarter mlchat mlim mlprogress
-
-		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
-
-	if use mozilla; then
-		insinto /usr/share/${PN}
-		doins ${DISTDIR}/mldonkey_protocol_handler-${MOZVER}.xpi
-	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
-
-	if use mozilla; then
-		echo
-		einfo "xpi handler was placed in /usr/share/${PN} directory."
-		einfo "Open it in your favorite web browser (mozilla / firefox)"
-		einfo "to install extension"
-		echo
-	fi;
-}
-
diff --git a/net-p2p/mldonkey/mldonkey-2.6.3.ebuild b/net-p2p/mldonkey/mldonkey-2.6.3.ebuild
deleted file mode 100644
index 863bbb3586de..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.6.3.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.3.ebuild,v 1.4 2005/09/19 14:41:02 mkay Exp $
-
-inherit eutils
-
-IUSE="gtk gtk2 oldgtk guionly batch threads gd doc mozilla"
-
-MOZVER="1.7"
-
-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/mldonkey/${P}.tar.bz2
-	mirror://gentoo/mld_hash.patch.gz
-	mozilla? ( http://www.informatik.uni-oldenburg.de/~dyna/${PN}/${MOZVER}/mldonkey_protocol_handler-${MOZVER}.xpi )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-
-RDEPEND="dev-lang/perl
-	gtk2? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.4 )
-	gtk? ( =dev-ml/lablgtk-1.2.7* )
-	oldgtk? ( =dev-ml/lablgtk-1.2.7* )
-	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() {
-	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 ""
-
-	if (use gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
-		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
-		die "Choose only one GUI"
-	fi
-
-	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
-		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
-		die "You have guionly enabled, but you haven't chosen any of GUIs"
-	fi
-
-	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2 mld_hash.patch.gz
-	cd ${S}
-
-	epatch ${WORKDIR}/mld_hash.patch
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	cd ${S}/config
-	autoconf
-
-	# 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 gtk2; then
-		myconf="--enable-gui=newgui2"
-	elif use gtk; then
-		myconf="--enable-gui=newgui1"
-	elif use oldgtk; then
-		myconf="--enable-gui=oldgui"
-	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 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 gtk2 || use gtk || use oldgtk); then
-		dobin mlgui mlguistarter mlchat mlim mlprogress
-
-		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
-
-	if use mozilla; then
-		insinto /usr/share/${PN}
-		doins ${DISTDIR}/mldonkey_protocol_handler-${MOZVER}.xpi
-	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
-
-	if use mozilla; then
-		echo
-		einfo "xpi handler was placed in /usr/share/${PN} directory."
-		einfo "Open it in your favorite web browser (mozilla / firefox)"
-		einfo "to install extension"
-		echo
-	fi;
-}
-
diff --git a/net-p2p/mldonkey/mldonkey-2.6.4.ebuild b/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild
index 3a7e2a19358b..846b107de9be 100644
--- a/net-p2p/mldonkey/mldonkey-2.6.4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.4.ebuild,v 1.2 2005/09/19 14:41:02 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild,v 1.1 2005/09/20 17:38:13 mkay Exp $
 
 inherit eutils
 
-IUSE="gtk gtk2 oldgtk guionly batch threads gd doc mozilla"
+IUSE="gtk guionly batch threads gd doc mozilla"
 
 MOZVER="1.7"
 
@@ -18,10 +18,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
 
 RDEPEND="dev-lang/perl
-	gtk2? ( >=gnome-base/librsvg-2.4.0
+	gtk? ( >=gnome-base/librsvg-2.4.0
 			>=dev-ml/lablgtk-2.4 )
-	gtk? ( =dev-ml/lablgtk-1.2.7* )
-	oldgtk? ( =dev-ml/lablgtk-1.2.7* )
 	gd? ( >=media-libs/gd-2.0.28 )"
 
 DEPEND="${RDEPEND}
@@ -32,34 +30,33 @@ DEPEND="${RDEPEND}
 MLUSER="p2p"
 
 pkg_setup() {
-	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 ""
-
-	if (use gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
-		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
-		die "Choose only one GUI"
+	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 guionly && !(use gtk2 || use gtk || use oldgtk); then
-		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
-		die "You have guionly enabled, but you haven't chosen any of GUIs"
+	if use guionly && ! use gtk ; then
+		echo
+		eerror "You have guionly enabled, but gtk flag is disabled"
+		die
 	fi
 
-	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
+	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
-}
 
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
+	if use gd && !(built_with_use media-libs/gd truetype); then
+		eerror "media-libs/gd must be built with the 'truetype' to compile"
+		eerror "mldonkey with gd support"
+		die "Recompile media-libs/gd with enabled truetype USE flag"
+	fi
 }
 
 src_compile() {
@@ -73,13 +70,10 @@ src_compile() {
 	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
 	# onlygui	Disable all nets support, build only chosen GUI
 
-	if use gtk2; then
+	if use gtk; then
 		myconf="--enable-gui=newgui2"
-	elif use gtk; then
-		myconf="--enable-gui=newgui1"
-	elif use oldgtk; then
-		myconf="--enable-gui=oldgui"
-	else myconf="--disable-gui"
+	else
+		myconf="--disable-gui"
 	fi
 
 	if use guionly; then
@@ -100,13 +94,13 @@ src_compile() {
 	export OCAMLRUNPARAM="l=256M"
 	emake || die "Make Failed"
 
-	if !(use guionly); then
+	if ! use guionly; then
 		emake utils || die "make utils failed"
 	fi;
 }
 
 src_install() {
-	if !(use guionly); then
+	if ! use guionly; then
 		dobin mlnet mld_hash get_range copysources make_torrent subconv
 		dobin ${FILESDIR}/mldonkey
 
@@ -114,9 +108,8 @@ src_install() {
 		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
 	fi
 
-	if (use gtk2 || use gtk || use oldgtk); then
+	if use gtk; then
 		dobin mlgui mlguistarter mlchat mlim mlprogress
-
 		domenu ${FILESDIR}/${PN}-gui.desktop
 		doicon ${FILESDIR}/${PN}.png
 	fi
@@ -148,13 +141,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	if !(use guionly); then
+	if ! use guionly; then
 		enewuser ${MLUSER} -1 /bin/bash /home/p2p users
 	fi
 }
 
 pkg_postinst() {
-	if !(use guionly); then
+	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,"