12 files changed, 83 insertions, 733 deletions
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 98cdb2bc3eda..0d5d6fc8a0fc 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,31 +1,95 @@
-MD5 53a41ef55735f1980f7ac970550f8f9b ChangeLog 19410
-MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
-MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0-r1 68
-MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4-r2 144
-MD5 eed52b2efc88d5b19ac43a6f4eeb5af7 files/digest-mldonkey-2.6.5 144
-MD5 0efadb757ab70fc302be8d3e139d8438 files/digest-mldonkey-2.6.7 144
-MD5 fb103852197a1645dfbc8926e0ccea68 files/digest-mldonkey-2.7.0 222
-MD5 7402d9c8f1b22a006d2966e7702bbdc6 files/digest-mldonkey-2.7.1 144
-MD5 7c787aa9daf94a51448026c3d113d87a files/digest-mldonkey-2.7.2 144
-MD5 1beda07a92ca951192a55a1331894510 files/digest-mldonkey-2.7.3 144
+AUX dp500.patch 505 RMD160 25b27b4b5129a434ff0db1cd5b230e5df4c2bc5b SHA1 3fcda76acd0968b12d0a06876e4d541950d7d7e6 SHA256 aea135f1d4ad3883cc5a41ab0c167e6057aa82494cbc80781ae5fb3cf606591a size 505
+MD5 2cce9c1b250bd7b652e39c93bfbe11b6 files/dp500.patch 505
+RMD160 25b27b4b5129a434ff0db1cd5b230e5df4c2bc5b files/dp500.patch 505
+SHA256 aea135f1d4ad3883cc5a41ab0c167e6057aa82494cbc80781ae5fb3cf606591a files/dp500.patch 505
+AUX mldonkey 336 RMD160 e12f193088e91ddb02baa63533115075abea0dae SHA1 11af8f2912799262112feaa52358cc0fd62abb26 SHA256 38392622dd39cd8d73e9a6944593e82e45ec0d12cc0134fb736d443a9b17f3d7 size 336
 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
-MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
+RMD160 e12f193088e91ddb02baa63533115075abea0dae files/mldonkey 336
+SHA256 38392622dd39cd8d73e9a6944593e82e45ec0d12cc0134fb736d443a9b17f3d7 files/mldonkey 336
+AUX mldonkey-2.7.3-configure.patch 497 RMD160 3a339c5e660cb9e9dfd0b159e20b77f0f694689a SHA1 1439caeec53b1a8bc5783348de1ed91dde1abb05 SHA256 85380d0d908cbfcdf4e6e2245d50d8361a2db6d9519e35ddad7eecedcb8aadb5 size 497
 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-gui.desktop 263 RMD160 c8da2a5e90446cefe75e93969b975093b2d367b0 SHA1 6e350814866f741ef76389c98df34af22751e164 SHA256 8ba9aec085500abbc7fcf53cf34a61e23a5b68cdc8b4b856f4395a5729608eb9 size 263
 MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263
+RMD160 c8da2a5e90446cefe75e93969b975093b2d367b0 files/mldonkey-gui.desktop 263
+SHA256 8ba9aec085500abbc7fcf53cf34a61e23a5b68cdc8b4b856f4395a5729608eb9 files/mldonkey-gui.desktop 263
+AUX mldonkey.confd 770 RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad SHA1 17f85471433b8139f7ccb39d9fe56d920d19c3f1 SHA256 21e2b01ba6c709a898a5192ac070be5643422fb5330cf04d96320921fc59cd42 size 770
 MD5 0308db20eac32dd62c1519106c6809a7 files/mldonkey.confd 770
+RMD160 b91f4a791a8577c731d9dc8ffbbdd8ce353c5bad files/mldonkey.confd 770
+SHA256 21e2b01ba6c709a898a5192ac070be5643422fb5330cf04d96320921fc59cd42 files/mldonkey.confd 770
+AUX mldonkey.initd 3063 RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a SHA1 67f5130da5198897280942506793ca9d6fb811b2 SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055 size 3063
 MD5 39035eb38db4becb71b58945466eeb95 files/mldonkey.initd 3063
+RMD160 66992e16a26f288ee9aaa3432b2e5739e977401a files/mldonkey.initd 3063
+SHA256 f6568c0e5cc4a6406662d8bef51271b4c785b49081dcb1bb5e2661dc5f835055 files/mldonkey.initd 3063
+AUX mldonkey.png 6835 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 SHA1 bf61199ffd324558f49940a5ca6a68a36f4656b2 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 size 6835
 MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
-MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
+RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
+SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
+DIST mldonkey-2.5.16.tar.gz 3214587 size 3214587
+DIST mldonkey-2.5.21.tar.gz 3234137 size 3234137
+DIST mldonkey-2.6.4.tar.bz2 2669228 size 2669228
+DIST mldonkey-2.6.5.tar.bz2 2756288 size 2756288
+DIST mldonkey-2.6.7.tar.bz2 2757906 size 2757906
+DIST mldonkey-2.7.3.tar.bz2 2807272 size 2807272
+DIST mldonkey-2.7.5.tar.bz2 2815190 RMD160 9e3363b16a8dfe680cbacb0be09a2fff7d8bde52 SHA256 dd3c521664cfbf67cb8c22aa6635c463333103e51c8152e0b191b92d7ebb38de size 2815190
+DIST mldonkey_protocol_handler-1.7.xpi 5502 size 5502
+DIST patch_pack16u.gz 52798 size 52798
+DIST patch_pack21g 182549 size 182549
+EBUILD mldonkey-2.5.16-r9.ebuild 2660 RMD160 e53603314d4a4f824f3b7abed58e00221ecfd94b SHA1 91bd30d8a3457db154317de039e4e5e7d7f226d3 SHA256 c861ed600b3ddf704146651ba4231defb0f0633732e69cf48ddf335dcf7d1fe9 size 2660
 MD5 9171095222ebc67e9b646393ee1ba616 mldonkey-2.5.16-r9.ebuild 2660
+RMD160 e53603314d4a4f824f3b7abed58e00221ecfd94b mldonkey-2.5.16-r9.ebuild 2660
+SHA256 c861ed600b3ddf704146651ba4231defb0f0633732e69cf48ddf335dcf7d1fe9 mldonkey-2.5.16-r9.ebuild 2660
+EBUILD mldonkey-2.5.21-r2.ebuild 2690 RMD160 62fd03b4df209339454421323269daa3da3dc601 SHA1 536125ba6b8f16f4079e6752976efc44abb6b1fc SHA256 1af1e64a9ff5997f7d55f9793f19511baed89c2cb52b5e6a827a8200dafd51e1 size 2690
 MD5 5483b629e50637a677dbbf4f93ce85f3 mldonkey-2.5.21-r2.ebuild 2690
-MD5 c52de767d1a796ced6c1da2794dc900a mldonkey-2.6.0-r1.ebuild 3489
+RMD160 62fd03b4df209339454421323269daa3da3dc601 mldonkey-2.5.21-r2.ebuild 2690
+SHA256 1af1e64a9ff5997f7d55f9793f19511baed89c2cb52b5e6a827a8200dafd51e1 mldonkey-2.5.21-r2.ebuild 2690
+EBUILD mldonkey-2.6.4-r2.ebuild 4979 RMD160 ca04f2bf99c531a0bea16c920d7ee5e1203b6c49 SHA1 f018cf55642387441e7085924626eea7631bed8e SHA256 3ed7bd55a56a1036ac3825648453def8b460a4d7d5f1f576604629bfdd79514b size 4979
 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.6.5.ebuild 4981 RMD160 faeedecb7d7e304fe33b7e88f4eaa781ac91a5ab SHA1 66ac1232546ceb15ca17e3be41696f38d1e3e31b SHA256 2e4496a5efb52a96629408825aedec632d553db469dd262036d617e4ffad64bf size 4981
 MD5 1decce2ae84d294abf540fa4374a9cc6 mldonkey-2.6.5.ebuild 4981
+RMD160 faeedecb7d7e304fe33b7e88f4eaa781ac91a5ab mldonkey-2.6.5.ebuild 4981
+SHA256 2e4496a5efb52a96629408825aedec632d553db469dd262036d617e4ffad64bf mldonkey-2.6.5.ebuild 4981
+EBUILD mldonkey-2.6.7.ebuild 5031 RMD160 cc0ae3da0f7daa61d852e0b2192605965d48170b SHA1 5fc95d503cda7207d0b5b8cc5ceac487d00a23c7 SHA256 7e6b6109f05450a5e4d343988687f80410e73745b5afb001378a9496c7896337 size 5031
 MD5 3ec25aa2ec7e7a1de4ff3dbe3f1b4312 mldonkey-2.6.7.ebuild 5031
-MD5 3586cd008283449062e3960e8b170ed8 mldonkey-2.7.0.ebuild 5093
-MD5 69c3b4497ee50cac4dc3a6961b973a96 mldonkey-2.7.1.ebuild 4981
-MD5 07f1ca93a2181a341950e4474c45d237 mldonkey-2.7.2.ebuild 4979
+RMD160 cc0ae3da0f7daa61d852e0b2192605965d48170b mldonkey-2.6.7.ebuild 5031
+SHA256 7e6b6109f05450a5e4d343988687f80410e73745b5afb001378a9496c7896337 mldonkey-2.6.7.ebuild 5031
+EBUILD mldonkey-2.7.3.ebuild 5030 RMD160 948720d0b9d30e99717b4000dd28a2e71e96b312 SHA1 6e68cb89bc1f23720c2d42506d3bbc0ba79d09ce SHA256 6561ef5f4d7eaf158319f90c154b5c91b23358c98dc5f0044fdfe4ad22d7fa2e size 5030
 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.5.ebuild 4609 RMD160 99223d2cc75aa053b6cccea0c523b3f3340c27b9 SHA1 afad858488ad53d1a8963328c0d5888c5e2667d7 SHA256 73c826ec21a997f1e7f10bb2817373025856055361b8ecf63f8a41e56757ed69 size 4609
+MD5 2cb1d35607da0c0576c242890ce80b59 mldonkey-2.7.5.ebuild 4609
+RMD160 99223d2cc75aa053b6cccea0c523b3f3340c27b9 mldonkey-2.7.5.ebuild 4609
+SHA256 73c826ec21a997f1e7f10bb2817373025856055361b8ecf63f8a41e56757ed69 mldonkey-2.7.5.ebuild 4609
+MISC ChangeLog 19933 RMD160 1dbef23a48f52bddea871d7f7ff0a0e2d1b2d1c5 SHA1 7ddd0f087571b73e145375817529b47a01cfd68e SHA256 a370c9ce0d3261e30ec3ff0e4c9ebbad74a231c01d2d8d076c7b4d10266cd3b7 size 19933
+MD5 3db5affb062ca7316658462edc154bd3 ChangeLog 19933
+RMD160 1dbef23a48f52bddea871d7f7ff0a0e2d1b2d1c5 ChangeLog 19933
+SHA256 a370c9ce0d3261e30ec3ff0e4c9ebbad74a231c01d2d8d076c7b4d10266cd3b7 ChangeLog 19933
+MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 size 242
+MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
+RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
+SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 metadata.xml 242
+MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
+RMD160 ac6c8f66255f3d1825b7d2da0a767c08447d282e files/digest-mldonkey-2.5.16-r9 128
+SHA256 9211cd65f17bd15401012703fc7df4a928d8e74b088bc69ffd1b7723c98fa3b8 files/digest-mldonkey-2.5.16-r9 128
+MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
+RMD160 be097bb487eef1666027890606f82dd5345723fd files/digest-mldonkey-2.5.21-r2 126
+SHA256 1977bfa101c7b2ba848ca333333c8698de4f284d95ffd24102de508718b3eb9f files/digest-mldonkey-2.5.21-r2 126
+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 de7eb7ad6d5a3df848fb780ee46b8899 files/digest-mldonkey-2.6.5 144
+RMD160 04414433746f6509b40d4332f97bcbb2bf1c62b8 files/digest-mldonkey-2.6.5 144
+SHA256 d9754e1ce93963352c0d2d133e186f0b73589df07f276a300c15f166e69ae06e files/digest-mldonkey-2.6.5 144
+MD5 dd76a14a3b48bbd16dd77fffbc31a855 files/digest-mldonkey-2.6.7 144
+RMD160 b83e0f8c883b9b8d05a45ff65776972cce61b815 files/digest-mldonkey-2.6.7 144
+SHA256 fcc7f3f3a08e1e7445218814483361b937af67d7c906b54ae8ba4c729d8c5436 files/digest-mldonkey-2.6.7 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 2c8036433d33042935ff4574eb6058d8 files/digest-mldonkey-2.7.5 250
+RMD160 38da222110d9018d6d2aa5a0c388c6374953b2ce files/digest-mldonkey-2.7.5 250
+SHA256 15613f322ead9da5d158c30cb5669776bc1c14e57c78e1cd8b355380a27e43b0 files/digest-mldonkey-2.7.5 250
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1
deleted file mode 100644
index 73a1ed2e83ae..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d9aff8eb7d44240950475ea1499ae75 mldonkey-2.6.0.tar.bz2 2622242
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.0 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.0
deleted file mode 100644
index 1f212093279d..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 124edc0a5446cc84e6c7cb65b3810449 mldonkey-2.7.0-endianess.patch.bz2 13816
-MD5 ede2bba27d9ea4dff5e439db5e08d100 mldonkey-2.7.0.tar.bz2 2791993
-MD5 20be3ad138fb9f6bec908591db14585e mldonkey_protocol_handler-1.7.xpi 5502
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.1 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.1
deleted file mode 100644
index 186e7df75a39..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c7eaf255c60f11358e024300a942f3d7 mldonkey-2.7.1.tar.bz2 2793841
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.7.2 b/net-p2p/mldonkey/files/digest-mldonkey-2.7.2
deleted file mode 100644
index 5e370120f6e7..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.7.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b9413047c5c543920b2842844a48beb1 mldonkey-2.7.2.tar.bz2 2795408
-MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/files/mldonkey-2.5.16-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.5.16-configure.patch
deleted file mode 100644
index e1f63660142c..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-2.5.16-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -N -u -w -r --unidirectional-new-file config/configure config2/configure
---- config/configure	2004-03-08 00:03:54.000000000 +0100
-+++ config/configure	2004-04-02 22:38:04.000000000 +0200
-@@ -10509,7 +10509,7 @@
- fi
- 
- echo "Building dependencies"
--$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
-+$GNU_MAKE depend || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
- 
- 
- echo "The following modules will not be compiled: {" $BAD_TARGETS "}"
diff --git a/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch
deleted file mode 100644
index e1f63660142c..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -N -u -w -r --unidirectional-new-file config/configure config2/configure
---- config/configure	2004-03-08 00:03:54.000000000 +0100
-+++ config/configure	2004-04-02 22:38:04.000000000 +0200
-@@ -10509,7 +10509,7 @@
- fi
- 
- echo "Building dependencies"
--$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
-+$GNU_MAKE depend || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
- 
- 
- echo "The following modules will not be compiled: {" $BAD_TARGETS "}"
diff --git a/net-p2p/mldonkey/files/mldonkey-2.6.0-gtk2-gentoo.patch b/net-p2p/mldonkey/files/mldonkey-2.6.0-gtk2-gentoo.patch
deleted file mode 100644
index d7a1521d95aa..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-2.6.0-gtk2-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gtk2/chat/chat_art.ml.orig	2005-07-25 15:56:52.000000000 +0200
-+++ src/gtk2/chat/chat_art.ml	2005-07-25 15:57:33.000000000 +0200
-@@ -22,6 +22,7 @@
- (*                          Icons ressources of mlchat                            *)
- (*                                                                                *)
- (**********************************************************************************)
-+open CommonGlobals
- 
- let table = [
-   "icon_settings", (Menu_settings_svg.t, "");
diff --git a/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
deleted file mode 100644
index d3b918ae2aef..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,125 +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.0-r1.ebuild,v 1.3 2006/04/27 19:24:27 mattam Exp $
-
-inherit eutils
-
-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://savannah.nongnu.org/download/mldonkey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-
-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}
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-	use gtk && epatch ${FILESDIR}/${P}-gtk2-gentoo.patch
-}
-
-src_compile() {
-	myconf="";
-	if use gtk; then
-		myconf="--enable-gui"
-	fi;
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-checks \
-		--disable-batch \
-		--enable-pthread \
-		`use_enable gtk gtk2` \
-		`use_enable gd` \
-		${myconf} || die "Configure Failed!"
-
-	export OCAMLRUNPARAM="l=256M"
-	emake || die "Make Failed"
-}
-
-src_install() {
-	dobin mlnet
-	if use gtk ; then
-		dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	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
-	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.7.0.ebuild b/net-p2p/mldonkey/mldonkey-2.7.0.ebuild
deleted file mode 100644
index 9208e00b467c..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.7.0.ebuild
+++ /dev/null
@@ -1,187 +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.0.ebuild,v 1.4 2006/01/28 13:25:58 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
-	mirror://gentoo/${P}-endianess.patch.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.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_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ../${P}-endianess.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 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.1.ebuild b/net-p2p/mldonkey/mldonkey-2.7.1.ebuild
deleted file mode 100644
index 25a725abe1ec..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.7.1.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.7.1.ebuild,v 1.2 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="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.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
-	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.2.ebuild b/net-p2p/mldonkey/mldonkey-2.7.2.ebuild
deleted file mode 100644
index f0697f4dae50..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.7.2.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.7.2.ebuild,v 1.1 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.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
-	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;
-}
-