Add patch to conform to MLDonkey 2.9.2. Use autoload in site-init file.

(Portage version: 2.1.4_rc14)

5 files changed, 194 insertions, 2 deletions

diff --git a/app-emacs/mldonkey/ChangeLog b/app-emacs/mldonkey/ChangeLog
index 617020aed128..a68e925c9fbb 100644
--- a/app-emacs/mldonkey/ChangeLog
+++ b/app-emacs/mldonkey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/mldonkey
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mldonkey/ChangeLog,v 1.14 2007/10/26 13:42:19 ulm Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mldonkey/ChangeLog,v 1.15 2008/01/03 15:10:38 ulm Exp $
+
+*mldonkey-0.0.4b-r1 (03 Jan 2008)
+
+  03 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/mldonkey-0.0.4b-vd.patch, +files/51mldonkey-gentoo.el,
+  +mldonkey-0.0.4b-r1.ebuild:
+  Add patch to conform to MLDonkey 2.9.2. Use autoload in site-init file;
+  remove redundant default configuration. Thanks to armin76 for testing.
 
   26 Oct 2007; Ulrich Mueller <ulm@gentoo.org> mldonkey-0.0.4b.ebuild:
   amd64 stable, bug 195512
diff --git a/app-emacs/mldonkey/files/51mldonkey-gentoo.el b/app-emacs/mldonkey/files/51mldonkey-gentoo.el
new file mode 100644
index 000000000000..b74cbf75ebae
--- /dev/null
+++ b/app-emacs/mldonkey/files/51mldonkey-gentoo.el
@@ -0,0 +1,21 @@
+
+;;; mldonkey site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mldonkey "mldonkey" "Run the MlDonkey interface." t)
+
+(setq mldonkey-vd-filename-filters
+      '(mldonkey-vd-filename-remove-p20
+	mldonkey-vd-filename-remove-trailing-ws))
+
+(setq mldonkey-vd-sort-functions
+      '((not mldonkey-vd-sort-dl-state)
+        (not mldonkey-vd-sort-dl-percent)))
+
+(setq mldonkey-vd-sort-fin-functions
+      '(mldonkey-vd-sort-dl-number))
+
+(add-hook 'mldonkey-pause-hook 'mldonkey-vd)
+(add-hook 'mldonkey-resume-hook 'mldonkey-vd)
+(add-hook 'mldonkey-commit-hook 'mldonkey-vd)
+(add-hook 'mldonkey-recover-temp-hook 'mldonkey-vd)
diff --git a/app-emacs/mldonkey/files/digest-mldonkey-0.0.4b-r1 b/app-emacs/mldonkey/files/digest-mldonkey-0.0.4b-r1
new file mode 100644
index 000000000000..c5d220de75dd
--- /dev/null
+++ b/app-emacs/mldonkey/files/digest-mldonkey-0.0.4b-r1
@@ -0,0 +1,3 @@
+MD5 37f8a8693df359f76d42944744883bef mldonkey-el-0.0.4b.tar.gz 17442
+RMD160 f7a6c71e6fba9b73005bc39a6571fd4895ad728f mldonkey-el-0.0.4b.tar.gz 17442
+SHA256 5b14873c45c13bd4da553457798cdd7e552fb00dcba880343a958e63823d3f06 mldonkey-el-0.0.4b.tar.gz 17442
diff --git a/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch b/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch
new file mode 100644
index 000000000000..a763643f78b2
--- /dev/null
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch
@@ -0,0 +1,121 @@
+Patch by Peter Salvi <vukung@yahoo.com> to conform to MLDonkey 2.9.2,
+taken from http://www.emacswiki.org/cgi-bin/wiki/download/mldonkey-vd.patch.gz
+and ported to mldonkey-0.0.4b
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el	2005-01-15 20:54:53.000000000 +0100
++++ mldonkey-el-0.0.4b/mldonkey-vd.el	2008-01-03 10:53:18.000000000 +0100
+@@ -107,6 +107,26 @@
+   :group 'mldonkey
+   :type 'boolean)
+ 
++(defcustom mldonkey-show-release-status nil
++  "Show the release status of a download."
++  :group 'mldonkey
++  :type 'boolean)
++
++(defcustom mldonkey-show-comments nil
++  "Show the number of comments in a download."
++  :group 'mldonkey
++  :type 'boolean)
++
++(defcustom mldonkey-show-user nil
++  "Show the user of a download."
++  :group 'mldonkey
++  :type 'boolean)
++
++(defcustom mldonkey-show-group nil
++  "Show the group of a download."
++  :group 'mldonkey
++  :type 'boolean)
++
+ (defcustom mldonkey-show-filename t
+   "Show the filename of a download."
+   :group 'mldonkey
+@@ -275,6 +295,14 @@
+    ;; FIXME: does a network may contain spaces?
+    "\\[\\(.*?\\)[ \t]*\\([0-9]+\\)\\]"       ; network and number
+    "[ \t]+"
++   "\\(R\\|\\-\\)"                           ; release status
++   "[ \t]+"
++   "\\([0-9]+\\)"                            ; comments
++   "[ \t]+"
++   "\\([^ \t]+\\)"                           ; user
++   "[ \t]+"
++   "\\([^ \t]+\\)"                           ; group
++   "[ \t]+"
+    "\\([^\n]+\\)"                            ; filename
+    "[ \t]+"
+    "\\([0-9\\.]+\\)"                         ; percent
+@@ -283,10 +311,9 @@
+    "[ \t]+"
+    "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\)\\)" ; size
+    "[ \t]+"
+-   ;; "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\|[ \t]*chunks\\)\\)" ; left
+-   "\\([0-9]+%\\)"                           ; avail
++   "\\([0-9:\\-]+\\)"                        ; last seen
+    "[ \t]+"
+-   "\\([0-9]+\\):\\([0-9\\-]+\\)"            ; age and last seen
++   "\\([0-9:\\-]+\\)"                        ; age
+    "[ \t]+"
+    "\\([0-9]+\\)/\\([0-9]+\\)"               ; active sources and total sources
+    "[ \t]+"
+@@ -454,7 +481,7 @@
+     (setq mldonkey-vd-num-downloading (1+ mldonkey-vd-num-downloading))
+     (add-to-list
+      'mldonkey-vd-downloading-list
+-     (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 13))))))
++     (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 16))))))
+ 
+ 
+ (defun mldonkey-vd-get-finished ()
+@@ -523,13 +550,16 @@
+ 
+   (vector "net "
+           "# "
++          "rel "
++          "com "
++          "user "
++          "gr "
+           "file "
+           "% "
+           "down "
+           "size "
+-          "av "
+-          "a "
+           "l "
++          "a "
+           "as "
+           "ts "
+           "kb/s "
+@@ -553,8 +583,11 @@
+ 
+   (vector 'right
+           'right
+-          'left
++          'right
+           'right
++          'left
++          'left
++          'left
+           'right
+           'right
+           'right
+@@ -584,13 +617,16 @@
+ 
+   (vector mldonkey-show-network
+           mldonkey-show-number
++          mldonkey-show-release-status
++          mldonkey-show-comments
++          mldonkey-show-user
++          mldonkey-show-group
+           mldonkey-show-filename
+           mldonkey-show-percent
+           mldonkey-show-downloaded
+           mldonkey-show-size
+-          mldonkey-show-avail
+-          mldonkey-show-days
+           mldonkey-show-last-seen
++          mldonkey-show-days
+           mldonkey-show-active-sources
+           mldonkey-show-total-sources
+           mldonkey-show-rate
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
new file mode 100644
index 000000000000..d4d2f931d1d5
--- /dev/null
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild,v 1.1 2008/01/03 15:10:38 ulm Exp $
+
+inherit elisp eutils
+
+MY_P="${PN}-el-${PV}"
+DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
+HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/MlDonkey
+	http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
+SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=net-p2p/mldonkey-2.9.2"
+
+SITEFILE=51${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-vd.patch"
+}
+
+src_compile() {
+	elisp-comp ml*.el
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	ewarn
+	ewarn "If your network gets really slow when you use mldonkey,"
+	ewarn "consider reducing the max number of connections. See bug #50510."
+	ewarn
+}