Drop old , add new initd script and confd, thanks to Christian Schlotter <again at gmx at de>, bug 141177

Package-Manager: portage-2.1.2-r2

16 files changed, 215 insertions, 1095 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index ab01098e3e6d..30584b3eb260 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,15 @@
 # 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.136 2007/01/13 11:59:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.137 2007/01/24 17:40:27 armin76 Exp $
+
+  24 Jan 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/mldonkey-2.7.3-configure.patch, -files/mldonkey-2.7.6-magic.patch,
+  +files/mldonkey.confd-2.8, -files/mldonkey.initd-2.8,
+  +files/mldonkey.initd-2.8-r1, -mldonkey-2.6.4-r2.ebuild,
+  -mldonkey-2.7.3.ebuild, -mldonkey-2.7.6-r1.ebuild, -mldonkey-2.8.2.ebuild,
+  mldonkey-2.8.2-r1.ebuild:
+  Drop old , add new initd script and confd, thanks to Christian Schlotter
+  <again at gmx at de>, bug 141177
 
   13 Jan 2007; Raúl Porcel <armin76@gentoo.org> mldonkey-2.7.7.ebuild,
   mldonkey-2.8.2-r1.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index f4a128638663..22dd154dc5a8 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -6,14 +6,6 @@ AUX mldonkey 336 RMD160 e12f193088e91ddb02baa63533115075abea0dae SHA1 11af8f2912
 MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
 RMD160 e12f193088e91ddb02baa63533115075abea0dae files/mldonkey 336
 SHA256 38392622dd39cd8d73e9a6944593e82e45ec0d12cc0134fb736d443a9b17f3d7 files/mldonkey 336
-AUX mldonkey-2.7.3-configure.patch 497 RMD160 3a339c5e660cb9e9dfd0b159e20b77f0f694689a SHA1 1439caeec53b1a8bc5783348de1ed91dde1abb05 SHA256 85380d0d908cbfcdf4e6e2245d50d8361a2db6d9519e35ddad7eecedcb8aadb5
-MD5 e6ba1f14ca558c6834b6e0d47013e212 files/mldonkey-2.7.3-configure.patch 497
-RMD160 3a339c5e660cb9e9dfd0b159e20b77f0f694689a files/mldonkey-2.7.3-configure.patch 497
-SHA256 85380d0d908cbfcdf4e6e2245d50d8361a2db6d9519e35ddad7eecedcb8aadb5 files/mldonkey-2.7.3-configure.patch 497
-AUX mldonkey-2.7.6-magic.patch 6693 RMD160 96097de4fc7c2f17218da07df13a082f113e9ad1 SHA1 78db099391396ff61b79bec41872a5e5217daa95 SHA256 f95040c125e41c65381e90c124993a7769a5be0daa0790895f8e503a1d97304a
-MD5 69a5142bc9dc243dbb8ae121b5dc5505 files/mldonkey-2.7.6-magic.patch 6693
-RMD160 96097de4fc7c2f17218da07df13a082f113e9ad1 files/mldonkey-2.7.6-magic.patch 6693
-SHA256 f95040c125e41c65381e90c124993a7769a5be0daa0790895f8e503a1d97304a files/mldonkey-2.7.6-magic.patch 6693
 AUX mldonkey-2.8.2-avoid_dupl_sending.patch 6027 RMD160 1264bbc07351ee770a905ebdc2d3f317f3c25529 SHA1 5d02ee1105716158bd889ec3f413a1dd49c7301e SHA256 c40a3f7a50b86cbb141ab242b57bd257e5ed59e06158adefdc7aac9205632567
 MD5 f99565d33e2f1b174129123816070f2f files/mldonkey-2.8.2-avoid_dupl_sending.patch 6027
 RMD160 1264bbc07351ee770a905ebdc2d3f317f3c25529 files/mldonkey-2.8.2-avoid_dupl_sending.patch 6027
@@ -26,71 +18,43 @@ AUX mldonkey.confd 770 RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad SHA1 17f8
 MD5 0308db20eac32dd62c1519106c6809a7 files/mldonkey.confd 770
 RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad files/mldonkey.confd 770
 SHA256 21e2b01ba6c709a898a5192ac070be5643422fb5330cf04d96320921fc59cd42 files/mldonkey.confd 770
+AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1 28000a260fe9b7c216112ba877f55835a09aabd7 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e
+MD5 936ea40c208c5c3f294bd39080f966f1 files/mldonkey.confd-2.8 887
+RMD160 0575b16320fc74fbe417150315d2247a536259d1 files/mldonkey.confd-2.8 887
+SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e files/mldonkey.confd-2.8 887
 AUX mldonkey.initd 3063 RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a SHA1 67f5130da5198897280942506793ca9d6fb811b2 SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055
 MD5 39035eb38db4becb71b58945466eeb95 files/mldonkey.initd 3063
 RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a files/mldonkey.initd 3063
 SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055 files/mldonkey.initd 3063
-AUX mldonkey.initd-2.8 3064 RMD160 dc786b129a6d08f7f0b7fc9267b664bc266d6b0b SHA1 bca5aaab25d1d8661b4ac4ea64b0013da0bf470a SHA256 2bf1cf0225564ab189c6737a66b2df61b7e0585038b43ad5d3302ce8dbbd6088
-MD5 2f3832b13fb1b89eca797146349d1f69 files/mldonkey.initd-2.8 3064
-RMD160 dc786b129a6d08f7f0b7fc9267b664bc266d6b0b files/mldonkey.initd-2.8 3064
-SHA256 2bf1cf0225564ab189c6737a66b2df61b7e0585038b43ad5d3302ce8dbbd6088 files/mldonkey.initd-2.8 3064
+AUX mldonkey.initd-2.8-r1 3349 RMD160 a635e180513fffbbd4779e81412bebdc70b34ad1 SHA1 a50f6d360b4e77e79a181b18a594fd684ff2f7e7 SHA256 24d2139a45dee18d8ddecb1dab58d2cea57b41cc6ff9590bd4f566db54904a4a
+MD5 5a72e96798c0f8250010272c68e0fbe5 files/mldonkey.initd-2.8-r1 3349
+RMD160 a635e180513fffbbd4779e81412bebdc70b34ad1 files/mldonkey.initd-2.8-r1 3349
+SHA256 24d2139a45dee18d8ddecb1dab58d2cea57b41cc6ff9590bd4f566db54904a4a files/mldonkey.initd-2.8-r1 3349
 AUX mldonkey.png 6835 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 SHA1 bf61199ffd324558f49940a5ca6a68a36f4656b2 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798
 MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
-DIST mldonkey-2.6.4.tar.bz2 2669228
-DIST mldonkey-2.7.3.tar.bz2 2807272
-DIST mldonkey-2.7.6.tar.bz2 2835134 RMD160 8989e86e26b6b4ed4fc8f783093c6e187b6d5051 SHA1 330c5b9c56f5fc09f2ca8a66090d96148253a2de SHA256 ec5e5723cc54c4ac3ef93e0b78ed9da58c4e75ca09fa4b2de4c9a58740085fa8
 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_protocol_handler-1.7.xpi 5502
-EBUILD mldonkey-2.6.4-r2.ebuild 4979 RMD160 ca04f2bf99c531a0bea16c920d7ee5e1203b6c49 SHA1 f018cf55642387441e7085924626eea7631bed8e SHA256 3ed7bd55a56a1036ac3825648453def8b460a4d7d5f1f576604629bfdd79514b
-MD5 495438c7dda651104095d4d53e6662c6 mldonkey-2.6.4-r2.ebuild 4979
-RMD160 ca04f2bf99c531a0bea16c920d7ee5e1203b6c49 mldonkey-2.6.4-r2.ebuild 4979
-SHA256 3ed7bd55a56a1036ac3825648453def8b460a4d7d5f1f576604629bfdd79514b mldonkey-2.6.4-r2.ebuild 4979
-EBUILD mldonkey-2.7.3.ebuild 5030 RMD160 948720d0b9d30e99717b4000dd28a2e71e96b312 SHA1 6e68cb89bc1f23720c2d42506d3bbc0ba79d09ce SHA256 6561ef5f4d7eaf158319f90c154b5c91b23358c98dc5f0044fdfe4ad22d7fa2e
-MD5 d49149ecf3e46e7abb3fac63f9c4cabf mldonkey-2.7.3.ebuild 5030
-RMD160 948720d0b9d30e99717b4000dd28a2e71e96b312 mldonkey-2.7.3.ebuild 5030
-SHA256 6561ef5f4d7eaf158319f90c154b5c91b23358c98dc5f0044fdfe4ad22d7fa2e mldonkey-2.7.3.ebuild 5030
-EBUILD mldonkey-2.7.6-r1.ebuild 4513 RMD160 aa675033dd9f9c93910738981e7988ee9addc562 SHA1 724e10eeab869186b81db99a561d3c3d3c17df43 SHA256 6fb03bec5710d57db2d2f15dd9ee5e4e2b32eeef9a1eb73d7aa6eb90d691886d
-MD5 78b2496f5b487e8addc83abc36c9c3cf mldonkey-2.7.6-r1.ebuild 4513
-RMD160 aa675033dd9f9c93910738981e7988ee9addc562 mldonkey-2.7.6-r1.ebuild 4513
-SHA256 6fb03bec5710d57db2d2f15dd9ee5e4e2b32eeef9a1eb73d7aa6eb90d691886d mldonkey-2.7.6-r1.ebuild 4513
 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
 SHA256 018026187cdc62188dd728f561541cc25241edfbaebb13c2e61365219a6e0013 mldonkey-2.7.7.ebuild 4466
-EBUILD mldonkey-2.8.2-r1.ebuild 4710 RMD160 2b45555bcb272150468ffc9ac96fbf981ff1fd19 SHA1 05ec193ced5371428b7ba8869f8f9bcd48c2ae8e SHA256 3b73621511f8328e4cb00af469d36e2d017580a20810e0e309dca0712b52ec2b
-MD5 af36579846dd2ce905356422e2b6d9f3 mldonkey-2.8.2-r1.ebuild 4710
-RMD160 2b45555bcb272150468ffc9ac96fbf981ff1fd19 mldonkey-2.8.2-r1.ebuild 4710
-SHA256 3b73621511f8328e4cb00af469d36e2d017580a20810e0e309dca0712b52ec2b mldonkey-2.8.2-r1.ebuild 4710
-EBUILD mldonkey-2.8.2.ebuild 4602 RMD160 8a6e64088e2c86fab474089d767985a5f91eeed3 SHA1 45f96cdd8c3d572b1fc72d95d4276a458b26303f SHA256 ba707eb5a085eb4ae7c3d61b58b7a0cec5d2d340d22450922f22f3a4ee79ef31
-MD5 35057848aee18f2370eab075a510794f mldonkey-2.8.2.ebuild 4602
-RMD160 8a6e64088e2c86fab474089d767985a5f91eeed3 mldonkey-2.8.2.ebuild 4602
-SHA256 ba707eb5a085eb4ae7c3d61b58b7a0cec5d2d340d22450922f22f3a4ee79ef31 mldonkey-2.8.2.ebuild 4602
-MISC ChangeLog 22363 RMD160 9700e996199eac35a58c4033c540d8e05ba33e65 SHA1 8d3417e2e36bd71665ac3906fbf9a80d6f0568bd SHA256 5481376e684064e48859afbc472fe9fa90aece41c7e432ac109369201c491bf5
-MD5 2cb7a3631b015c055bff51577ef942ce ChangeLog 22363
-RMD160 9700e996199eac35a58c4033c540d8e05ba33e65 ChangeLog 22363
-SHA256 5481376e684064e48859afbc472fe9fa90aece41c7e432ac109369201c491bf5 ChangeLog 22363
+EBUILD mldonkey-2.8.2-r1.ebuild 4753 RMD160 78aa6a191c9a3c14c64b65a0a9c2dc4b640a6d4d SHA1 98f6fb5aeda992a779438114e1751186f875f802 SHA256 c38abe24dd1ec1d4177f0adf29d3ae3b7cfe74b0b9b8f6a07b1efef919f1bc33
+MD5 fa52dd25eb8d87515ec947580bdea352 mldonkey-2.8.2-r1.ebuild 4753
+RMD160 78aa6a191c9a3c14c64b65a0a9c2dc4b640a6d4d mldonkey-2.8.2-r1.ebuild 4753
+SHA256 c38abe24dd1ec1d4177f0adf29d3ae3b7cfe74b0b9b8f6a07b1efef919f1bc33 mldonkey-2.8.2-r1.ebuild 4753
+MISC ChangeLog 22819 RMD160 8e9bb4cb20bec5ed648bd01ab79d0f995e0eb9a1 SHA1 25414fab6170db6ecb3a1c72a7a5f7f23f14264f SHA256 c63819f9acc2ef62636a8d4ee9a26da12cd29d31d8d7515baec26668047f28a0
+MD5 ff942ad8ba5d8ec3941733ff09b88002 ChangeLog 22819
+RMD160 8e9bb4cb20bec5ed648bd01ab79d0f995e0eb9a1 ChangeLog 22819
+SHA256 c63819f9acc2ef62636a8d4ee9a26da12cd29d31d8d7515baec26668047f28a0 ChangeLog 22819
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 metadata.xml 242
-MD5 180b211069bda96a04457a3f59535809 files/digest-mldonkey-2.6.4-r2 144
-RMD160 09ce69dc7211d8d32b8249c3a1b501da0e4caeb1 files/digest-mldonkey-2.6.4-r2 144
-SHA256 2ffac1e4209c3aed6e702a99bd3f3e0bda2f0a126bfe86718aa0ebd971eb1c14 files/digest-mldonkey-2.6.4-r2 144
-MD5 1beda07a92ca951192a55a1331894510 files/digest-mldonkey-2.7.3 144
-RMD160 b49ae2e0c1533c6a7829f65a489531ee22a4078d files/digest-mldonkey-2.7.3 144
-SHA256 b770761dd8501fd3bbb6f4f12aa79937ad0d9df9137a9e73d7381ca41f353420 files/digest-mldonkey-2.7.3 144
-MD5 c916f61ac13be36cb0b88e7891ac537d files/digest-mldonkey-2.7.6-r1 250
-RMD160 a0114e8011e4a9fb2ebaf10f8e85561d68dcd9f1 files/digest-mldonkey-2.7.6-r1 250
-SHA256 c8a5f39b5b0615d37786156a034015a57a0a79531ab30b57054ed1ab640055a0 files/digest-mldonkey-2.7.6-r1 250
 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 250
-RMD160 4213be41a9c4db4d112e40396786dcd55f49436a files/digest-mldonkey-2.8.2 250
-SHA256 cdb85c503837b524df40852095c65b6fe6211fdc48b803c4da5a92554e6286a1 files/digest-mldonkey-2.8.2 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
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
deleted file mode 100644
index 984f50fac6f9..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d969f81b51e194fcaf46790686269e3e mldonkey-2.6.4.tar.bz2 2669228
-MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.3 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.3
deleted file mode 100644
index 8a6b4c6e1979..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f6c7c183fda53a9e9c26a09f8cdefda7 mldonkey-2.7.3.tar.bz2 2807272
-MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.6-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.6-r1
deleted file mode 100644
index 51aedc0ddf3d..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08e3cccce6fe65f5437a309276fe2c68 mldonkey-2.7.6.tar.bz2 2835134
-RMD160 8989e86e26b6b4ed4fc8f783093c6e187b6d5051 mldonkey-2.7.6.tar.bz2 2835134
-SHA256 ec5e5723cc54c4ac3ef93e0b78ed9da58c4e75ca09fa4b2de4c9a58740085fa8 mldonkey-2.7.6.tar.bz2 2835134
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.8.2 b/net-p2p/mldonkey/files/digest-mldonkey-2.8.2
deleted file mode 100644
index 04ea99d280aa..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch
deleted file mode 100644
index dd29f404bda2..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-2.7.3-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.in.old	2006-04-27 20:46:37.000000000 +0200
-+++ configure.in	2006-04-27 20:46:53.000000000 +0200
-@@ -331,7 +331,7 @@
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
--    3.09.0*) ;;
-+    3.09.*) ;;
-     3.08.4*) ;;
-     3.08.3*) ;;
-     *)
-@@ -464,7 +464,7 @@
- REBUILD_OCAML=no
- case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
--    3.09.0*) ;;
-+    3.09.*) ;;
-     3.08.4*) ;;
-     3.08.3*) ;;
-     *)
diff --git a/net-p2p/mldonkey/files/mldonkey-2.7.6-magic.patch b/net-p2p/mldonkey/files/mldonkey-2.7.6-magic.patch
deleted file mode 100644
index 04c570c360f8..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-2.7.6-magic.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -uwNr ./org/src/daemon/common/commonFile.ml ./mldonkey-2.7.6/src/daemon/common/commonFile.ml
---- src/daemon/common/commonFile.ml	2006-05-20 01:43:54.000000000 +0200
-+++ src/daemon/common/commonFile.ml	2006-06-13 21:50:56.000000000 +0200
-@@ -450,6 +450,18 @@
-     None -> ()
-   | Some magic -> (as_file_impl file).impl_file_magic <- Some (HashMagic.merge files_magic magic)
-     
-+let check_magic file =
-+  let check file =
-+    match Magic.M.magic_fileinfo (file_disk_name file) false with
-+      None -> ()
-+    | Some magic -> set_file_magic file (Some magic)
-+  in
-+  let magic = file_magic file in
-+    match magic with
-+      None -> check file
-+    | Some magic when magic = "data" || magic = "empty" -> check file
-+    | _ -> ()
-+
- let set_file_last_seen file age =
-   let impl = as_file_impl file in
-   impl.impl_file_last_seen <- age
-diff -uwNr ./org/src/daemon/common/commonFile.mli ./mldonkey-2.7.6/src/daemon/common/commonFile.mli
---- src/daemon/common/commonFile.mli	2006-05-12 23:08:30.000000000 +0200
-+++ src/daemon/common/commonFile.mli	2006-06-13 21:50:56.000000000 +0200
-@@ -119,7 +119,7 @@
- val file_comment : CommonTypes.file -> string
- val file_magic : CommonTypes.file -> string option
- val set_file_magic : CommonTypes.file -> string option -> unit
--  
-+val check_magic : CommonTypes.file -> unit  
- val recover_bytes : CommonTypes.file -> (int64 * int64) list
- val file_write : CommonTypes.file -> int64 -> string -> int -> int -> unit
- val file_verify : CommonTypes.file ->
-diff -uwNr ./org/src/daemon/common/commonSwarming.ml ./mldonkey-2.7.6/src/daemon/common/commonSwarming.ml
---- src/daemon/common/commonSwarming.ml	2006-05-20 01:43:54.000000000 +0200
-+++ src/daemon/common/commonSwarming.ml	2006-06-13 21:52:52.000000000 +0200
-@@ -1073,6 +1073,7 @@
- let set_verified_chunk t i =
-   t.t_nverified_blocks <- t.t_nverified_blocks + 1;
-   t.t_converted_verified_bitmap.[i] <- '3';
-+  if i = 0 && !Autoconf.magic_works then check_magic t.t_file;
-   let s = t.t_s in
-   if t.t_primary then begin
-     (* The primary is supposed to propagate verified chunks to the file *)
-diff -uwNr ./org/src/daemon/driver/driverInteractive.ml ./mldonkey-2.7.6/src/daemon/driver/driverInteractive.ml
---- src/daemon/driver/driverInteractive.ml	2006-05-21 09:50:05.000000000 +0200
-+++ src/daemon/driver/driverInteractive.ml	2006-06-13 21:50:56.000000000 +0200
-@@ -123,23 +123,6 @@
-     close_log ()
-   end
- 
--let file_magic_check () =
--  if !Autoconf.magic_works then begin
--    if !verbose then lprintf_nl "computing file magic values";
--    let check_magic file =
--      match Magic.M.magic_fileinfo (file_disk_name file) false with
--        None -> ()
--      | Some magic -> set_file_magic file (Some magic)
--    in
--    List.iter (fun file ->
--      let magic = file_magic file in
--      match magic with
--        None -> check_magic file
--      | Some magic when magic = "data" -> check_magic file
--      | _ -> ()
--    ) !!files
--  end
--
- (* ripped from gui_downloads *)
- 
- let calc_file_eta f =
-diff -uwNr ./org/src/daemon/driver/driverMain.ml ./mldonkey-2.7.6/src/daemon/driver/driverMain.ml
---- src/daemon/driver/driverMain.ml	2006-05-20 01:43:54.000000000 +0200
-+++ src/daemon/driver/driverMain.ml	2006-06-13 21:50:56.000000000 +0200
-@@ -68,7 +68,6 @@
- 
- let minute_timer () =
-   DriverInteractive.hdd_check ();
--  DriverInteractive.file_magic_check ();
-   CommonShared.shared_check_files ();
-   CommonUploads.upload_credit_timer ();
-   CommonInteractive.force_download_quotas ();
-@@ -436,7 +435,6 @@
- 
- (*  lprintf "(1) CommonComplexOptions.load\n"; *)
-   CommonComplexOptions.load ();
--  DriverInteractive.file_magic_check ();
-   CommonUploads.load ();
- 
- (*  lprintf "(2) CommonComplexOptions.load done\n"; *)
-diff -uwNr ./org/src/networks/bittorrent/bTInteractive.ml ./mldonkey-2.7.6/src/networks/bittorrent/bTInteractive.ml
---- src/networks/bittorrent/bTInteractive.ml	2006-05-20 01:43:54.000000000 +0200
-+++ src/networks/bittorrent/bTInteractive.ml	2006-06-13 21:50:56.000000000 +0200
-@@ -256,14 +256,24 @@
- 	  end in
-   print_first_tracker file.file_trackers;
- 
-+  let check_magic file =
-+    match Magic.M.magic_fileinfo file false with
-+      None -> None
-+    | Some s -> Some (HashMagic.merge CommonGlobals.files_magic s)
-+  in
-   let cntr = ref 0 in
--  List.iter (fun (filename, size, magic) ->
-+  List.iter (fun (filename, size, _) ->
-     Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" (html_mods_cntr ());
-     let fs = Printf.sprintf "File %d" !cntr in
-     let magic_string =
--      match magic with
-+      if !Autoconf.magic_works then
-+	begin
-+          let subfile = Filename.concat (file_disk_name file) filename in
-+          match check_magic subfile with
-         None -> ""
-       | Some magic -> Printf.sprintf " / %s" magic
-+	end
-+      else ""
-     in
-     html_mods_td buf [
-       (fs, "sr br", fs);
-@@ -623,32 +633,6 @@
-           lprintf_nl "ft_retry: exception %s" (Printexc2.to_string e)
-   ) ft_by_num
- 
--let file_magic_check () =
--  if !Autoconf.magic_works then begin
--    if !verbose then lprintf_nl "computing sub_file magic values";
--    let check_magic file = 
--      match Magic.M.magic_fileinfo file false with
--        None -> None
--      | Some s -> Some (HashMagic.merge CommonGlobals.files_magic s)
--    in
--    Hashtbl.iter (fun _ file ->
--      let updated = ref false in
--      let new_file_files = ref [] in
--      List.iter (fun (filename, size, magic) ->
--        let subfile = Filename.concat (file_disk_name file) filename in
--        let new_magic =
--          match magic with
--            None -> check_magic subfile
--          | Some magic when magic = "data" || magic = "empty" -> check_magic subfile
--          | _ -> magic
--        in
--        if new_magic <> magic then updated := true;
--        new_file_files := (filename, size, new_magic) :: !new_file_files
--        ) file.file_files;
--        if !updated then file.file_files <- !new_file_files
--    ) files_by_uid
--  end
--
- let load_torrent_from_web r ft =
-   if !verbose then
-       lprintf_nl "Loading torrent from web";
-diff -uwNr ./org/src/networks/bittorrent/bTMain.ml ./mldonkey-2.7.6/src/networks/bittorrent/bTMain.ml
---- src/networks/bittorrent/bTMain.ml	2006-05-20 01:43:54.000000000 +0200
-+++ src/networks/bittorrent/bTMain.ml	2006-06-13 21:50:56.000000000 +0200
-@@ -115,7 +115,6 @@
-     BTClients.recover_files ();
-     add_session_timer enabler 60.0 (fun timer ->
-         BTClients.recover_files ();
--        BTInteractive.file_magic_check ()
-     );
- 
-     add_session_timer enabler 120.0 (fun timer ->
-@@ -131,7 +130,6 @@
- 	      ) !current_files;
-   );
- 
--  BTInteractive.file_magic_check ();
-   BTClients.listen ();
-   ()
- 
diff --git a/net-p2p/mldonkey/files/mldonkey.confd-2.8 b/net-p2p/mldonkey/files/mldonkey.confd-2.8
new file mode 100644
index 000000000000..1d1f282234f7
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey.confd-2.8
@@ -0,0 +1,39 @@
+# /etc/conf.d/mldonkey
+# Config file for mldonkey control script
+
+# Change the following vars only if you know
+# what you're doing, there's no checking for
+# invalid data yet!
+
+# owner of mlnet process (don't change, must be existing)
+USER="p2p"
+
+# mldonkey's working dir (must be existing)
+MLDONKEY_DIR="/home/p2p/mldonkey"
+
+# logfile (/dev/null for nowhere)
+LOG="/var/log/mldonkey.log"
+
+# set to true, if you have enabled logging to syslog in MLDonkey with
+#     set log_to_syslog true
+USE_LOGGER=false
+
+# bandwidth control, values in kb/s
+LOW_DOWN="6"
+LOW_UP="2"
+HIGH_DOWN="30"
+HIGH_UP="10"
+
+# nice level, 0<x<19, more nice -> less cpuspeed consumed
+NICE="19"
+
+# mldonkey server ip, usually localhost
+SERVER="localhost"
+
+# port for webinterface, usually 4080
+PORT="4080"
+
+# to enable password restricted access,
+# uncomment and set BOTH following vars:
+#USERNAME="admin"
+#PASSWORD=""
diff --git a/net-p2p/mldonkey/files/mldonkey.initd-2.8 b/net-p2p/mldonkey/files/mldonkey.initd-2.8
deleted file mode 100644
index e3f8548a9f8a..000000000000
--- a/net-p2p/mldonkey/files/mldonkey.initd-2.8
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop restart slow fast info"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting mldonkey"
-	result=0
-
-	if [ -z "${MLDONKEY_DIR}" ]; then
-		ewarn "mldonkey's start script has been changed. You should remove"
-		ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set MLDONKEY_DIR"
-		ewarn "to the correct value (you probably want"
-		ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})"
-		MLDONKEY_DIR=${BASEDIR}/${SUBDIR}
-		einfo "Using ${MLDONKEY_DIR} as working directory"
-	fi
-	
-	if [ ! -d ${MLDONKEY_DIR} ]; then
-		einfo "Directory ${MLDONKEY_DIR} not existing, trying to create..."
-		if `mkdir -p ${MLDONKEY_DIR} 2>/dev/null`; then 
-			chown ${USER}:users ${MLDONKEY_DIR}
-		else
-           	eerror "Directory ${MLDONKEY_DIR} could not be created!"
-           	((result++))
-		fi
-	fi
-	
-	cd ${MLDONKEY_DIR}
-	env MLDONKEY_DIR=${MLDONKEY_DIR} start-stop-daemon --quiet --start \
-		-c ${USER} -N ${NICE} -x /usr/bin/mlnet &>${LOG} &
-	sleep 5
-	if ! pgrep -u ${USER} mlnet >/dev/null
-	then
-		eerror "MLDonkey could not be started! Check logfile: ${LOG}"
-		((result++))
-	fi
-	eend $result
-}
-
-stop() {
-	BASE="http://"
-	if [[ -n ${USERNAME} && -n ${PASSWORD} ]]
-	then
-		BASE=${BASE}${USERNAME}:${PASSWORD}@
-	fi
-	BASE=${BASE}${SERVER}:${PORT}
-	ebegin "Stopping mldonkey - please wait"
-	wget --spider ${BASE}/submit?q=close_fds -q 
-	wget --spider ${BASE}/submit?q=save -q 
-	wget --spider ${BASE}/submit?q=kill -q 
-	# give it a chance to die:
-	local timeout=10
-	while [ $timeout -gt 0 ] && pgrep -u ${USER} mlnet &>/dev/null; do
-		sleep 1
-		let 'timeout--'
-	done
-	start-stop-daemon --oknodo --stop -x /usr/bin/mlnet &>/dev/null
-	eend $?
-}
-
-restart() {
-	svc_stop
-	sleep 5
-	svc_start
-}
-
-slow() {
-	if ! service_started mldonkey
-	then
-		start_service mldonkey
-	fi
-	ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
-
-	BASE="http://"
-	if [[ -n ${USERNAME} && -n ${PASSWORD} ]]
-	then
-		BASE=${BASE}${USERNAME}:${PASSWORD}@
-	fi
-	BASE=${BASE}${SERVER}:${PORT}
-
-	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q 
-
-	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q 
-
-	eend $?
-}
-
-fast() {
-	if ! service_started mldonkey
-	then
-		start_service mldonkey
-	fi
-	ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
-
-	BASE="http://"
-	if [[ -n ${USERNAME} && -n ${PASSWORD} ]]
-	then
-		BASE=${BASE}${USERNAME}:${PASSWORD}@
-	fi
-	BASE=${BASE}${SERVER}:${PORT}
-
-	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q 
-
-	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q 
-
-	eend $?
-}
-
-
-info() {
-	if service_started mldonkey 
-	then
-		BASE="http://"
-		if [[ -n ${USERNAME} && -n ${PASSWORD} ]]
-		then
-			BASE=${BASE}${USERNAME}:${PASSWORD}@
-		fi
-
-		BASE=${BASE}${SERVER}:${PORT}
-		VALUE=$(/usr/bin/wget -O - ${BASE}/submit?q=vo 2> /dev/null| /bin/grep  -C1 max_hard_upload|/bin/grep value=\" |/bin/cut -d\" -f2)
-		if [[ ${VALUE} -eq ${LOW_UP} ]]
-		then
-			INFO="mldonkey runs slow"
-		else
-			INFO="mldonkey runs fast"
-		fi
-	else
-		INFO="mldonkey is not running"
-	fi
-	einfo "$INFO"
-}
diff --git a/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1 b/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1
new file mode 100644
index 000000000000..d80cf7f4bce7
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1
@@ -0,0 +1,146 @@
+#!/sbin/runscript
+
+opts="start stop restart reload slow fast info"
+
+MLDONKEY_BINARY=${MLDONKEY_BINARY:-/usr/bin/mlnet}
+MLDONKEY_TIMEOUT=${TIMEOUT:-10}
+
+depend() {
+	need net
+	${USE_LOGGER} && use logger
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -z "${MLDONKEY_DIR}" ]; then
+		ewarn "mldonkey's start script has been changed. You should remove"
+		ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set MLDONKEY_DIR"
+		ewarn "to the correct value (you probably want"
+		ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})"
+		MLDONKEY_DIR=${BASEDIR}/${SUBDIR}
+		einfo "Using ${MLDONKEY_DIR} as working directory"
+	fi
+
+	local result=0
+	if [ ! -d ${MLDONKEY_DIR} ]; then
+		einfo "Directory ${MLDONKEY_DIR} not existing, trying to create..."
+		if `mkdir -p ${MLDONKEY_DIR} 2>/dev/null`; then
+			chown ${USER}:users ${MLDONKEY_DIR}
+		else
+			eerror "Directory ${MLDONKEY_DIR} could not be created!"
+			((result++))
+		fi
+	fi
+
+	cd ${MLDONKEY_DIR}
+	env MLDONKEY_DIR=${MLDONKEY_DIR} start-stop-daemon --quiet --start \
+		-c ${USER} -N ${NICE} -x ${MLDONKEY_BINARY} &>${LOG} &
+	sleep 5
+
+	if ! pgrep -u ${USER} mlnet >/dev/null; then
+		eerror "${SVCNAME} could not be started! Check logfile: ${LOG}"
+		((result++))
+	fi
+
+	eend $result
+}
+
+setup_uri() {
+	BASE="http://"
+	if [[ -n ${USERNAME} && -n ${PASSWORD} ]]; then
+		BASE=${BASE}${USERNAME}:${PASSWORD}@
+	fi
+	BASE=${BASE}${SERVER}:${PORT}
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME} -- please wait"
+
+	setup_uri
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=close_fds -q
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=save -q
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=kill -q
+
+	# give it a chance to die:
+	local timeout=${MLDONKEY_TIMEOUT}
+	while [ $timeout -gt 0 ] && pgrep -u ${USER} mlnet &>/dev/null; do
+		sleep 1
+		((timeout--))
+	done
+
+	start-stop-daemon --oknodo --stop -x ${MLDONKEY_BINARY} &>${LOG}
+
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 5
+	svc_start
+}
+
+reload() {
+	if ! service_started ${SVCNAME}; then
+		eerror "${SVCNAME} is not started"
+		return 0
+	fi
+
+	ebegin "Reloading ${SVCNAME}"
+
+	start-stop-daemon --stop --signal HUP --oknodo \
+		--exec ${MLDONKEY_BINARY} &>${LOG}
+
+	eend $?
+}
+
+slow() {
+	if ! service_started ${SVCNAME}; then
+		start_service ${SVCNAME}
+	fi
+
+	ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
+
+	setup_uri
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
+		${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
+		${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q
+
+	eend $?
+}
+
+fast() {
+	if ! service_started ${SVCNAME}; then
+		start_service ${SVCNAME}
+	fi
+
+	ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
+
+	setup_uri
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
+		${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q
+	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
+		${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q
+
+	eend $?
+}
+
+
+info() {
+	if ! service_started ${SVCNAME}; then
+		eerror "${SVCNAME} is not started"
+		return 0
+	fi
+
+	setup_uri
+	local result=$(/usr/bin/wget --timeout=${MLDONKEY_TIMEOUT} \
+		-O - ${BASE}/submit?q=vo 2> /dev/null | \
+		/bin/grep -C1 max_hard_upload | \
+		/bin/grep value=\" | /bin/cut -d\" -f2)
+	if [[ ${result} -eq ${LOW_UP} ]]; then
+		einfo "${SVCNAME} runs slow"
+	else
+		einfo "${SVCNAME} runs fast"
+	fi
+}
diff --git a/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild
deleted file mode 100644
index 68b44dd16926..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.6.4-r2.ebuild,v 1.5 2006/01/13 14:22:47 mkay Exp $
-
-inherit eutils
-
-IUSE="gtk 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
-	mozilla? ( http://www.informatik.uni-oldenburg.de/~dyna/${PN}/${MOZVER}/mldonkey_protocol_handler-${MOZVER}.xpi )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc x86"
-
-RDEPEND="dev-lang/perl
-	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
-	!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 guionly && ! use gtk ; then
-		echo
-		eerror "You have guionly enabled, but gtk flag is disabled"
-		die
-	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 the 'truetype' to compile"
-		eerror "mldonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-}
-
-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 gtk; 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 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 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.7.3.ebuild b/net-p2p/mldonkey/mldonkey-2.7.3.ebuild
deleted file mode 100644
index 868c11d2ea68..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.7.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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.3.ebuild,v 1.4 2006/04/27 19:24:27 mattam Exp $
-
-inherit eutils
-
-IUSE="gtk 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="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mozilla? ( http://www.informatik.uni-oldenburg.de/~dyna/${PN}/${MOZVER}/mldonkey_protocol_handler-${MOZVER}.xpi )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~x86"
-RESTRICT="nomirror"
-
-RDEPEND="dev-lang/perl
-	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 guionly && ! use gtk ; then
-		echo
-		eerror "You have guionly enabled, but gtk flag is disabled"
-		die
-	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 the 'truetype' to compile"
-		eerror "mldonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	cd ${S}/config
-	epatch ${FILESDIR}/${P}-configure.patch
-
-	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 gtk; 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 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 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.7.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.7.6-r1.ebuild
deleted file mode 100644
index 53d2a399eda1..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.7.6-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.6-r1.ebuild,v 1.1 2006/06/18 16:57:09 sekretarz Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="gtk guionly batch 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}
-
-	export WANT_AUTOCONF=2.5
-	cd ${S}/config
-	autoconf
-	cd ${S}
-	epatch ${FILESDIR}/${P}-magic.patch
-}
-
-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 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
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.8.2-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.8.2-r1.ebuild
index 4da1c9025f0e..0f303447133a 100644
--- a/net-p2p/mldonkey/mldonkey-2.8.2-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.2 2007/01/13 11:59:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.2-r1.ebuild,v 1.3 2007/01/24 17:40:27 armin76 Exp $
 
 inherit flag-o-matic
 
@@ -111,8 +111,9 @@ src_install() {
 		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-2.8" 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
diff --git a/net-p2p/mldonkey/mldonkey-2.8.2.ebuild b/net-p2p/mldonkey/mldonkey-2.8.2.ebuild
deleted file mode 100644
index 19af6c80fbc4..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.8.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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.8.2.ebuild,v 1.2 2006/12/06 22:47:37 sekretarz 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://www.nongnu.org/mldonkey/"
-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 "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-2.8" 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 MLDonkey gui."
-		einfo "It puts its config files into ~/.mldonkey"
-	fi
-}