summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-02-20 18:11:41 +0000
committerUlrich Müller <ulm@gentoo.org>2009-02-20 18:11:41 +0000
commitce5bbc8e891f3ca6133e68d3ae4bd187f32fd26b (patch)
tree69b7158a9867447936c547417bfe72577a6210aa /app-emacs/distel/files
parentarm/s390/sh stable wrt #223879 (diff)
downloadgentoo-2-ce5bbc8e891f3ca6133e68d3ae4bd187f32fd26b.tar.gz
gentoo-2-ce5bbc8e891f3ca6133e68d3ae4bd187f32fd26b.tar.bz2
gentoo-2-ce5bbc8e891f3ca6133e68d3ae4bd187f32fd26b.zip
Version bump and fix path for ebin files, bug 259695.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'app-emacs/distel/files')
-rw-r--r--app-emacs/distel/files/50distel-gentoo.el1
-rw-r--r--app-emacs/distel/files/distel-4.03-fix-ebin-path.patch29
2 files changed, 30 insertions, 0 deletions
diff --git a/app-emacs/distel/files/50distel-gentoo.el b/app-emacs/distel/files/50distel-gentoo.el
index 934a7620732f..14c8beeee70c 100644
--- a/app-emacs/distel/files/50distel-gentoo.el
+++ b/app-emacs/distel/files/50distel-gentoo.el
@@ -4,3 +4,4 @@
(add-to-list 'load-path "@SITELISP@")
(autoload 'distel-erlang-mode-hook "distel" nil t)
(add-hook 'erlang-mode-hook 'distel-erlang-mode-hook)
+(setq distel-ebin-directory "/usr/share/distel/ebin")
diff --git a/app-emacs/distel/files/distel-4.03-fix-ebin-path.patch b/app-emacs/distel/files/distel-4.03-fix-ebin-path.patch
new file mode 100644
index 000000000000..21f6b7caefa8
--- /dev/null
+++ b/app-emacs/distel/files/distel-4.03-fix-ebin-path.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/259695
+
+--- distel-4.03-orig/elisp/erl-service.el 2008-06-25 19:05:09.000000000 +0200
++++ distel-4.03/elisp/erl-service.el 2009-02-20 19:01:31.000000000 +0100
+@@ -172,15 +172,18 @@
+ (&erl-load-backend node))
+ (_ t))))))
+
++(defvar distel-ebin-directory
++ (let ((elisp-directory
++ (file-name-directory (or (locate-library "distel") load-file-name))))
++ (concat elisp-directory "../ebin"))
++ "Directory where beam files are located.")
++
+ (defun &erl-load-backend (node)
+- (let* ((elisp-directory
+- (file-name-directory (or (locate-library "distel") load-file-name)))
+- (ebin-directory (concat elisp-directory "../ebin"))
+- (modules '()))
+- (dolist (file (directory-files ebin-directory))
++ (let ((modules '()))
++ (dolist (file (directory-files distel-ebin-directory))
+ (when (string-match "^\\(.*\\)\\.beam$" file)
+ (let ((module (intern (match-string 1 file)))
+- (filename (concat ebin-directory "/" file)))
++ (filename (concat distel-ebin-directory "/" file)))
+ (push (list module filename) modules))))
+ (if (null modules)
+ (erl-warn-backend-problem "don't have beam files")