small fix0rs

9 files changed, 26 insertions, 199 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 7dd6c5340651..d3fbcfaec995 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.4 2002/12/15 17:07:27 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.5 2002/12/17 08:54:43 seemant Exp $
 
 *mldonkey-2.01-r1 (15 Dec 2002)
 
+  16 Dec 2002; Seemant Kulleen <seemant@gentoo.org> mldonkey-2.01.ebuild
+  mldonkey-2.01-r1.ebuild :
+
+  Moved 2.01 to stable, and changed the configure settings slightly.  Should
+  go into /var not /usr/var for the state stuff and use econf instead
+
   12 Dec 2002; Hannes Mehnert <hannes@mehnert.org> mldonkey-2.01-r1.ebuild:
   included patch from http://concept.free.free.fr/mldonkey/
 
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-1.16 b/net-p2p/mldonkey/files/digest-mldonkey-1.16
deleted file mode 100644
index ba9bc73f92bd..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83f34a815766b86bef84192f389bc625 mldonkey-1.16.shared.i686-Linux.tar.bz2 1032732
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.00 b/net-p2p/mldonkey/files/digest-mldonkey-2.00
deleted file mode 100644
index 2dfc244966aa..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.00
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55d96a4eecbb8831efe460610f2f492c mldonkey-2.00.shared.i686-Linux.tar.bz2 2648645
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.00-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.00-r1
deleted file mode 100644
index 9738719135d4..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.00-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2494ffeff8308f103a814b321019fdb mldonkey-2.00.sources.tar.gz 1173174
-MD5 06072ae1a0ff6580bc0315f6fa30da8e diff-2.00-2.00+2.patch.gz 253593
-MD5 03707521fa089baac2f94ed1232587e0 pango-20021208a.tar.gz 64222
diff --git a/net-p2p/mldonkey/mldonkey-1.16.ebuild b/net-p2p/mldonkey/mldonkey-1.16.ebuild
deleted file mode 100644
index 38850a361cf7..000000000000
--- a/net-p2p/mldonkey/mldonkey-1.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-1.16.ebuild,v 1.4 2002/10/05 05:39:24 drobbins Exp $
-
-IUSE="gtk"
-
-myarch=`uname -m`
-S="${WORKDIR}/${PN}-shared"
-DESCRIPTION="A new client for eDonkey, for file sharing."
-SRC_URI="http://freesoftware.fsf.org/download/mldonkey/${P}.shared.${myarch}-Linux.tar.bz2"
-HOMEPAGE="http://go.to/mldonkey"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="gtk? ( x11-libs/gtk+ )"
-
-src_compile() {
-	einfo "Nothing to compile for ${P}."
-}
-src_install () {
-	dodoc ChangeLog Readme.txt TODO
-	rm -f ${WORKDIR}/mldonkey-shared/ChangeLog
-	rm -f ${WORKDIR}/mldonkey-shared/Readme.txt
-	rm -f ${WORKDIR}/mldonkey-shared/TODO
-	rm -f ${WORKDIR}/mldonkey-shared/mldonkey_gui_started_for_macosx
-	dodir /opt/mldonkey
-	cp -r ${WORKDIR}/mldonkey-shared/* ${D}/opt/mldonkey
-	insinto /etc/env.d
-	doins ${FILESDIR}/97mldonkey
-}
-pkg_postinst () {
-	einfo "The client command is mldonkey."
-	einfo "The GUI needs GTK and the command is mldonkey_gui"
-	einfo "mldonkey read the config from the dir where you are, and"
-	einfo "create it if don't exist, so run the command ever in the"
-	einfo "ever in the same dir. I spear to solve it in next relase"
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.00-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.00-r1.ebuild
deleted file mode 100644
index 56b1f6f63a3e..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.00-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.00-r1.ebuild,v 1.4 2002/12/15 17:07:27 hannes Exp $
-
-IUSE="gtk"
-DESCRIPTION="edonkey, opennap,... client written in ocaml"
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/mldonkey/stable/${P}.sources.tar.gz
-	http://concept.free.free.fr/mldonkey/patches-against-CVS2.00+2/diff-2.00-2.00+2.patch.gz
-	http://concept.free.free.fr/mldonkey/patches-against-CVS2.00+2/pango-20021208a.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="x86"
-DEPEND="gtk? ( >=lablgtk-1.2.3 )
-        >=ocaml-3.06
-		>=perl-5.6.1"
-S="${WORKDIR}/mldonkey"
-
-src_unpack() {
-	unpack ${P}.sources.tar.gz
-	cd ${S}
-	cp ${DISTDIR}/diff-2.00-2.00+2.patch.gz ./
-	cp ${DISTDIR}/pango-20021208a.tar.gz ./
-	gunzip diff-2.00-2.00+2.patch.gz
-	tar -xzf pango-20021208a.tar.gz
-	patch -p0 <  diff-2.00-2.00+2.patch
-	patch -p0 -E -s < pango.patch 
-}
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/usr/var/mldonkey \
-		--localstatedir=/usr/var/mldonkey \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	into /usr
-	dobin mldonkey mlchat
-	for i in mldonkey_gui mldonkey_gui2 mldonkey_guistarter
-	do
-		if [[ -f ${i} ]]
-		then
-			dobin ${i}
-		fi
-	done
-
-	for i in AUTHORS BUGS COPYING ChangeLog Developers.txt ed2k_links.txt \
-			 Readme.txt TODO;
-	do
-		dodoc distrib/${i}
-	done
-
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	for i in kill_mldonkey mldonkey_command mldonkey_previewer;
-	do
-		doins distrib/${i}
-	done
-
-	insinto /usr/share/doc/${PF}/scripts/ed2k_submit
-	echo "Ignore CVS error:"
-	doins distrib/ed2k_submit/*
-
-	insinto /usr/share/doc/${PF}/distrib
-	for i in servers.ini directconnect.ini;
-	do
-		doins distrib/${i}
-	done
-}
-
-pkg_postinst() {
-	echo
-	echo
-	einfo "To start mldonkey, copy the contents of \$doc/distrib in a"
-	einfo "writable directory, and start mldonkey from there."
-	einfo "Eg: cp everything to /home/user1/mldonkey"
-	einfo "then: cd /home/user1/mldonkey && mldonkey >> mld.log &"
-	echo
-	echo
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.00.ebuild b/net-p2p/mldonkey/mldonkey-2.00.ebuild
deleted file mode 100644
index 362660387bd2..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.00.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.00.ebuild,v 1.1 2002/10/19 20:55:55 mjc Exp $
-
-IUSE="gtk"
-
-myarch=`uname -m`
-S="${WORKDIR}/${PN}-distrib-${PV}"
-DESCRIPTION="A new client for eDonkey, for file sharing."
-SRC_URI="http://savannah.nongnu.org/download/mldonkey/stable/${P}.shared.${myarch}-Linux.tar.bz2"
-HOMEPAGE="http://go.to/mldonkey"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="gtk? ( x11-libs/gtk+ )"
-
-src_compile() {
-	einfo "Nothing to compile for ${P}."
-}
-src_install () {
-	dodoc ChangeLog Readme.txt TODO
-	rm -f ${WORKDIR}/${PN}-distrib-${PV}/ChangeLog
-	rm -f ${WORKDIR}/${PN}-distrib-${PV}/Readme.txt
-	rm -f ${WORKDIR}/${PN}-distrib-${PV}/TODO
-	rm -f ${WORKDIR}/${PN}-distrib-${PV}/mldonkey_gui_started_for_macosx
-	dodir /opt/mldonkey
-	cp -r ${WORKDIR}/${PN}-distrib-${PV}/* ${D}/opt/mldonkey
-	insinto /etc/env.d
-	doins ${FILESDIR}/97mldonkey
-}
-pkg_postinst () {
-	einfo "The client command is mldonkey."
-	einfo "The GUI needs GTK and the command is mldonkey_gui"
-	einfo "mldonkey read the config from the dir where you are, and"
-	einfo "create it if don't exist, so run the command ever in the"
-	einfo "ever in the same dir. I spear to solve it in next relase"
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild
index 06aad27b0650..6f88efb9c268 100644
--- a/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild,v 1.1 2002/12/15 17:07:27 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.01-r1.ebuild,v 1.2 2002/12/17 08:54:43 seemant Exp $
 
 IUSE="gtk"
+
+S=${WORKDIR}/${PN}
 DESCRIPTION="edonkey, opennap,... client written in ocaml"
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/stable/${P}.sources.tar.gz
@@ -11,10 +13,10 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/stable/${P}.sources.tar.gz
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~x86"
+
 DEPEND="gtk? ( >=lablgtk-1.2.3 )
-        >=ocaml-3.06
-		>=perl-5.6.1"
-S="${WORKDIR}/${PN}"
+	>=dev-lang/ocaml-3.06
+	sys-devel/perl"
 
 src_unpack() {
 	unpack ${P}.sources.tar.gz
@@ -27,14 +29,10 @@ src_compile() {
 	use gtk || export GTK_CONFIG="no"
 
 	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/usr/var/mldonkey \
-		--localstatedir=/usr/var/mldonkey \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey
 
 	emake || die
 }
diff --git a/net-p2p/mldonkey/mldonkey-2.01.ebuild b/net-p2p/mldonkey/mldonkey-2.01.ebuild
index 494caf86f5f9..8ddc1b536c4d 100644
--- a/net-p2p/mldonkey/mldonkey-2.01.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.01.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.01.ebuild,v 1.2 2002/12/15 17:07:27 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.01.ebuild,v 1.3 2002/12/17 08:54:43 seemant Exp $
 
 IUSE="gtk"
+
+S=${WORKDIR}/${PN}
 DESCRIPTION="edonkey, opennap,... client written in ocaml"
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/stable/${P}.sources.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+
 DEPEND="gtk? ( >=lablgtk-1.2.3 )
-        >=ocaml-3.06
-		>=perl-5.6.1"
-S="${WORKDIR}/${PN}"
+	>=dev-lang/ocaml-3.06
+	sys-devel/perl"
 
 src_compile() {
 	use gtk || export GTK_CONFIG="no"
 
 	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/usr/var/mldonkey \
-		--localstatedir=/usr/var/mldonkey \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
 
 	emake || die
 }