Remove idiot batch USE-flag, bug 174021

Package-Manager: portage-2.1.2.3

4 files changed, 25 insertions, 25 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index f6fb7b8ec0f0..3613fbdba61e 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # 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.149 2007/04/08 13:14:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.150 2007/04/10 15:25:24 armin76 Exp $
+
+  10 Apr 2007; Raúl Porcel <armin76@gentoo.org> mldonkey-2.8.3.ebuild,
+  mldonkey-2.8.4.ebuild:
+  Remove idiot batch USE-flag, bug 174021
 
   08 Apr 2007; Raúl Porcel <armin76@gentoo.org>
   -files/mldonkey-2.8.2-avoid_dupl_sending.patch, -mldonkey-2.8.2-r1.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 6771a74b6949..0213cf03009b 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -20,18 +20,18 @@ RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
 DIST mldonkey-2.8.3.tar.bz2 2659818 RMD160 4dc9547584c2bcf4de93a2eee420528e6d7b7814 SHA1 6b824a657b08a2fcc030cf2b4f81af8cb181e500 SHA256 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f
 DIST mldonkey-2.8.4.tar.bz2 2665209 RMD160 729e8018bbf09c8707e37132f6827b469f59faac SHA1 1934efbf900a8a15f47108a27a985e2363b76ffc SHA256 71d069dff71649e98978391158140a54c4e72ad2545e40298d12de4440a98720
-EBUILD mldonkey-2.8.3.ebuild 4671 RMD160 6ac33a9ae456e23aee4e536d040992d2015df886 SHA1 0c8adb4d1955baa3c6c73e7e73ed0c02f70a744e SHA256 a860ab1f68d1e8cfe6a134b596d41ecb1e975ab8df90e276cb325d9fabea727b
-MD5 00f277ab98aa39848c803f10337841e3 mldonkey-2.8.3.ebuild 4671
-RMD160 6ac33a9ae456e23aee4e536d040992d2015df886 mldonkey-2.8.3.ebuild 4671
-SHA256 a860ab1f68d1e8cfe6a134b596d41ecb1e975ab8df90e276cb325d9fabea727b mldonkey-2.8.3.ebuild 4671
-EBUILD mldonkey-2.8.4.ebuild 4678 RMD160 167e431a0e8aabf3a525a5e60f53086e12d6ac60 SHA1 3fd300000cb7f2f08e82bed824a7b2b0e90d8bfe SHA256 872f5bfef7bd03dc0a0f9f8145e57bf6bc3a8c35a4d9a84421b7e2e7f7f27445
-MD5 42c33aa9b48a5853c097d381f8ed0db2 mldonkey-2.8.4.ebuild 4678
-RMD160 167e431a0e8aabf3a525a5e60f53086e12d6ac60 mldonkey-2.8.4.ebuild 4678
-SHA256 872f5bfef7bd03dc0a0f9f8145e57bf6bc3a8c35a4d9a84421b7e2e7f7f27445 mldonkey-2.8.4.ebuild 4678
-MISC ChangeLog 24333 RMD160 fcc9c33e9f1ef9bf889f057db9f4ab7fcfb44389 SHA1 a35c4e98194275c524802739922ca3978258ecaa SHA256 60dfa459eb7593791b24fb1fab67c842cf501c9c928a6f4e9ab0a6688115b7b2
-MD5 cbd5ea4e38670f5973f3a2fcf83de37d ChangeLog 24333
-RMD160 fcc9c33e9f1ef9bf889f057db9f4ab7fcfb44389 ChangeLog 24333
-SHA256 60dfa459eb7593791b24fb1fab67c842cf501c9c928a6f4e9ab0a6688115b7b2 ChangeLog 24333
+EBUILD mldonkey-2.8.3.ebuild 4548 RMD160 103d982306bbbb144d16b7cb573a6c80b39f854d SHA1 3e03a7efbdd3b5b4d9a26b4a8232baece6dad402 SHA256 58defd787625a7bd67cf2b848208e620b9dce583f48b06e7d64b2c62b87b0d0b
+MD5 b5e01e9d3febbfaa58a305f1dde5d342 mldonkey-2.8.3.ebuild 4548
+RMD160 103d982306bbbb144d16b7cb573a6c80b39f854d mldonkey-2.8.3.ebuild 4548
+SHA256 58defd787625a7bd67cf2b848208e620b9dce583f48b06e7d64b2c62b87b0d0b mldonkey-2.8.3.ebuild 4548
+EBUILD mldonkey-2.8.4.ebuild 4553 RMD160 257e326d9bd9ed6d5bdcf6b96879492462ab0248 SHA1 8ea7c64467ddaeaa53a0e160d5e0bf9cd0479ecc SHA256 7df22cae3c4aabe9d2e15586d4ff14677160edce1fc17a6aaee1f85c216c83ab
+MD5 c7276d4de698482a9661543e5ceeb0e8 mldonkey-2.8.4.ebuild 4553
+RMD160 257e326d9bd9ed6d5bdcf6b96879492462ab0248 mldonkey-2.8.4.ebuild 4553
+SHA256 7df22cae3c4aabe9d2e15586d4ff14677160edce1fc17a6aaee1f85c216c83ab mldonkey-2.8.4.ebuild 4553
+MISC ChangeLog 24473 RMD160 1da9c0c4bcffbb695097bce118b5408ffc9bf1cc SHA1 94287fbcf0d855709bf5ee0f1d4cfd5f6d1a721e SHA256 5b45d62b9d2e821286d81629a81ad9978c97f0ca5d92964c24b73f7e3bf81866
+MD5 84b5cc8ed8639bed614cec7f33a7e4b8 ChangeLog 24473
+RMD160 1da9c0c4bcffbb695097bce118b5408ffc9bf1cc ChangeLog 24473
+SHA256 5b45d62b9d2e821286d81629a81ad9978c97f0ca5d92964c24b73f7e3bf81866 ChangeLog 24473
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
diff --git a/net-p2p/mldonkey/mldonkey-2.8.3.ebuild b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild
index 3e41f255af7c..9c45c4be7288 100644
--- a/net-p2p/mldonkey/mldonkey-2.8.3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.8.3.ebuild
@@ -1,10 +1,10 @@
 # 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.7 2007/04/07 15:47:33 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.3.ebuild,v 1.8 2007/04/10 15:25:24 armin76 Exp $
 
 inherit flag-o-matic
 
-IUSE="batch doc fasttrack gd gnutella gtk guionly magic"
+IUSE="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/"
@@ -25,8 +25,7 @@ RDEPEND="dev-lang/perl
 
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58
-	!batch? ( >=dev-lang/ocaml-3.08.3 )
-	batch? ( net-misc/wget )"
+	>=dev-lang/ocaml-3.08.3"
 
 MLUSER="p2p"
 
@@ -68,7 +67,6 @@ src_compile() {
 
 	# 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
@@ -87,10 +85,10 @@ src_compile() {
 		--sharedstatedir=/var/mldonkey \
 		--localstatedir=/var/mldonkey \
 		--enable-checks \
+		--disable-batch \
 		$(use_enable fasttrack) \
 		$(use_enable gnutella) \
 		$(use_enable gnutella gnutella2) \
-		$(use_enable batch) \
 		$(use_enable gd) \
 		$(use_enable magic) \
 		${myconf} || die "econf failed"
diff --git a/net-p2p/mldonkey/mldonkey-2.8.4.ebuild b/net-p2p/mldonkey/mldonkey-2.8.4.ebuild
index 8a1c606147cb..31a0daa52ac2 100644
--- a/net-p2p/mldonkey/mldonkey-2.8.4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.8.4.ebuild
@@ -1,10 +1,10 @@
 # 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.4.ebuild,v 1.2 2007/04/04 12:30:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.4.ebuild,v 1.3 2007/04/10 15:25:24 armin76 Exp $
 
 inherit flag-o-matic
 
-IUSE="batch doc fasttrack gd gnutella gtk guionly magic"
+IUSE="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/"
@@ -25,8 +25,7 @@ RDEPEND="dev-lang/perl
 
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58
-	!batch? ( >=dev-lang/ocaml-3.08.3 )
-	batch? ( net-misc/wget )"
+	>=dev-lang/ocaml-3.08.3"
 
 MLUSER="p2p"
 
@@ -68,7 +67,6 @@ src_compile() {
 
 	# 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
@@ -87,10 +85,10 @@ src_compile() {
 		--sharedstatedir=/var/mldonkey \
 		--localstatedir=/var/mldonkey \
 		--enable-checks \
+		--disable-batch \
 		$(use_enable fasttrack) \
 		$(use_enable gnutella) \
 		$(use_enable gnutella gnutella2) \
-		$(use_enable batch) \
 		$(use_enable gd) \
 		$(use_enable magic) \
 		${myconf} || die "econf failed"