Version bump. Remove old; distel-4.03 fails to build with R15 and later.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

5 files changed, 47 insertions, 79 deletions

diff --git a/app-emacs/distel/ChangeLog b/app-emacs/distel/ChangeLog
index 6cecd7927ff7..759c3dca3c70 100644
--- a/app-emacs/distel/ChangeLog
+++ b/app-emacs/distel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/distel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/ChangeLog,v 1.5 2009/03/07 21:57:25 fauli Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/ChangeLog,v 1.6 2014/02/25 23:25:00 ulm Exp $
+
+*distel-4.0.6 (25 Feb 2014)
+
+  25 Feb 2014; Ulrich Müller <ulm@gentoo.org> +distel-4.0.6.ebuild,
+  -distel-4.03.ebuild, -files/distel-4.03-fix-ebin-path.patch:
+  Version bump. Remove old; distel-4.03 fails to build with R15 and later.
 
   07 Mar 2009; Christian Faulhammer <fauli@gentoo.org>
   -distel-3.2_p20071103.ebuild:
diff --git a/app-emacs/distel/distel-4.0.6.ebuild b/app-emacs/distel/distel-4.0.6.ebuild
new file mode 100644
index 000000000000..5093b1f45db8
--- /dev/null
+++ b/app-emacs/distel/distel-4.0.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/distel-4.0.6.ebuild,v 1.1 2014/02/25 23:25:00 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Distributed Emacs Lisp for Erlang"
+HOMEPAGE="http://code.google.com/p/distel/
+	http://www.emacswiki.org/emacs/DistributedEmacsLisp"
+SRC_URI="https://github.com/massemanet/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# "New BSD License" according to http://code.google.com/p/distel/
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/erlang-11.2.5[emacs]"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake base info
+	cd elisp || die
+	elisp-compile *.el
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		ELISP_DIR="${ED}${SITELISP}/${PN}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo doc/distel.info
+	dohtml doc/distel/*.html
+	dodoc AUTHORS ChangeLog NEWS README*
+	use doc && dodoc doc/gorrie02distel.pdf
+}
diff --git a/app-emacs/distel/distel-4.03.ebuild b/app-emacs/distel/distel-4.03.ebuild
deleted file mode 100644
index 97c1791c75c4..000000000000
--- a/app-emacs/distel/distel-4.03.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/distel/distel-4.03.ebuild,v 1.2 2009/02/20 18:22:43 ulm Exp $
-
-EAPI=2
-
-inherit elisp eutils
-
-DESCRIPTION="Distributed Emacs Lisp for Erlang"
-HOMEPAGE="http://fresh.homeunix.net/~luke/distel/"
-SRC_URI="http://distel.googlecode.com/files/${P}.tgz"
-
-# "New BSD License" according to http://code.google.com/p/distel/
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/erlang-11.2.5[emacs]"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-ebin-path.patch"
-}
-
-src_compile() {
-	emake base info || die "emake failed"
-	cd elisp
-	elisp-compile *.el || die
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		ELISP_DIR="${D}${SITELISP}/${PN}" install \
-		|| die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo doc/distel.info || die "doinfo failed"
-	dohtml doc/distel/*.html || die "dohtml failed"
-	dodoc AUTHORS ChangeLog NEWS README* || die "dodoc failed"
-	if use doc; then
-		dodoc doc/gorrie02distel.pdf || die "dodoc failed"
-	fi
-}
diff --git a/app-emacs/distel/files/50distel-gentoo.el b/app-emacs/distel/files/50distel-gentoo.el
index 14c8beeee70c..485b2dc27746 100644
--- a/app-emacs/distel/files/50distel-gentoo.el
+++ b/app-emacs/distel/files/50distel-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; distel site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'distel-erlang-mode-hook "distel" nil t)
 (add-hook 'erlang-mode-hook 'distel-erlang-mode-hook)
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
deleted file mode 100644
index 21f6b7caefa8..000000000000
--- a/app-emacs/distel/files/distel-4.03-fix-ebin-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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")