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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 61 insertions, 94 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/Manifest b/app-emacs/distel/Manifest
index 45fa93db7c17..62d0438777b6 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 50distel-gentoo.el 234 SHA256 381c351c434675e8dce2aa365c6cd444460172541d650d0d69ba678697bf6a33 SHA512 730432ce41672107600cf9256d9c64b41d1a924d8e6209b30acdb6dd6d3ad47272c9521a72652404b04cce964b633ff5ecd3b58ccafa528cbe6c03b17e6a2f92 WHIRLPOOL a8f213f6e5b0239b494e7873631030db42dd6abec8e82a52c8b332449797a572aeadfb400e82f14a69b2d3d23eaf35281823d170e042b053c7eb4a6f784eebb8
-AUX distel-4.03-fix-ebin-path.patch 1152 SHA256 0343e67b3fd5f114cf5da5ddf755cae120ef41bbe31cce78122cb530262bfc0b SHA512 564ba0b0ffbf1f2c221f6f0a7b18861fa44a2a979930afb16c49d69c4aebdf12f91e6ea07b1acd96143f2eafeed4d10328d136f1f4434432661fec1aa5428de2 WHIRLPOOL f2b814c0c95eb26198cec6b45c6815a9fb644437f6bfc521ef50b4e976f065ebcddb3921aa0aa8407a957f08582ac6dc7e8b8b829088e23aba2334f275c64268
-DIST distel-4.03.tgz 210737 SHA256 0fbf14beacfa6019fbe4f453d9b0748e160a82995798b23f37ff4d02dea16551 SHA512 68bf73c873fe3cf70e1ee29ab27ca71a8a51dcfab8cf3466ccc76ce80f77a12bda15006014648c8ed2e407d278feb15d28d0465fc678aac9b8da37faaadc3e8e WHIRLPOOL f58015272174199eb6dc0ebf79cfd4d09fe2451f5710af2b83c147cbf4d18606c5a799835f580cae2904a365ced9b80cc469d28e7e6b2b5fda1e3af3162c9d45
-EBUILD distel-4.03.ebuild 1188 SHA256 b989016cadfcf528a983e55c8a1c2520582c8471360ced826bc8dc7e8ae2f5ce SHA512 bece58ef019b24b31ac88334e32fe0ba4b048c5ba8298a4dcf7b4076009d1c7b60bdfe3f2a33e09848e6cae3ad7233f4384333d3a8578d495e26772bc81aeda4 WHIRLPOOL 92dabd741ac4064913f107b7acc87d5c8b98ea032aed26bc5a6c3172a65b9c3b09e6f90e30780a44900f9620a522c6f643e3b1a7434fd557ebd4b15bd7d8ed6d
-MISC ChangeLog 1133 SHA256 c082bac20a75d99cd761b2217d00d044ee608a69a0e92921205605dab2419e85 SHA512 111b24784e04df5492472fc9cb65a66bec857818feac2278391bfb67a307419d5c23fe29b6b16c47e733df0ed50f49f616ae4259f093398d647290df1dc37b37 WHIRLPOOL 4150f384172f4e53f80549ac38d9d1fccba59da70b52d87fe721f6e1568f41901fbf87e9db6801aa775caa5574e359ff3386ec99eea9159cc61295471806ef67
+AUX 50distel-gentoo.el 197 SHA256 da2818eabdb810c1a762814765f39c725c4b65c5350a935c24bb0329d57ad725 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b WHIRLPOOL 187f5e493b98d09fc41bcea108f4271085203d2b72113913a32ed898548ceadfffb02534fbae5d63fb1eed905ed044c4350c073de89ea496d32081c413de02f3
+DIST distel-4.0.6.tar.gz 210257 SHA256 a80538fab51008f4821f687e7bcda98b7ab9e6e3ef7d695087505a2e40caa1e1 SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f WHIRLPOOL e8fef7f804f98fdf7a1bb97cda97f7d4e471ec5ca01d112d80c1ebd2cede5c0bb8f5ac023407820843a61dec959f31755aa50a2faf34021c9b8aa48d4fe0bf45
+EBUILD distel-4.0.6.ebuild 1027 SHA256 d422179beb82bda294cbcfa718aa5742ac0c7e293442a2ddf5818058e78cae5c SHA512 6c7835b9293466a419b4e949fc542975ec3ccb9d5ded2d49dbd96adf56afcd0afbb48d0191f83a6bc3505023e82eb23f19d2b8ff260b4c7fa0c0115b8a0b07b8 WHIRLPOOL 80ff30f30f9ebdfdb47fb2bb17d9670d6df10387279dd35fab6ca95b815c9cda7932bb0a7ec954ddc3e4221b07342491d3cf12994ebcc8f9390fdaba80144f36
+MISC ChangeLog 1368 SHA256 7e5e57315d850a9db41873f2ad951ff9bf3ca641ef628e047b00e16eb0bc4c16 SHA512 8348aeab2165e26309eb206eac2522c90fd85705b32d2e8e3c9313554e369cdb0ad1346cf7c7e7ca60900ac5b30bb1d898227762a1bc52a294ed85d14eab3e90 WHIRLPOOL 7fc946675ff3cf4adb5d33154b5b5554b8c428fb83f12bb7f23969003b4f6424b0066b7cc1d71ee2840082477f74ef74c6234a5c46e18851d4c9c0e828fd1501
 MISC metadata.xml 232 SHA256 5b7aaa25f22af9f71a5cefff6bf72d7861c538c8a7870838aab3837219d1792f SHA512 fc48e01b70a11b5fc07e188f4f29c8e35cac6fd12058e370146a28835778f283dfd4872598df7156dfa4b21339211b07b6402ab452d931641a78c9dcb505c634 WHIRLPOOL 4b332e8e897503fbda5c7546e6815c0262c2c97fcf499711c65c7a55cf964339f9b338e8da2509f3793fea85d13ac5d12301e849fb53266f17e4dffbdf7a3f6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJTBlkVAAoJEJQzkH1pP7W4urQL/R6+nAKrF4ehd7DDoNSLoNbD
-+mk4DzzupX0WFoyR3YviehC+DW911flnJ9D3spNMdgzGOdKinZR771uELtrYG4I6
-UVmyb+tcpUDKm98oxQYm/v47zkuPxlmSfAkwrFqCa4YNwelMd1/W5eyo1XrXFuB7
-nRxszycgyQq1NyKHw0l6SunotjK9GDqlnQjOIM29P7TZMieq2SLoA/7o051Z2lqF
-yOkJeVJ2XHQo210tFft80aLlHzM0R64dBN3T3iAmHEF0iGicB9SNuxKQlXUqS/Yq
-waMj+iGcb8xaszno//gG1JGcI4u9lPF3ieun6BRyl4hZxnDPzCP5+RLScN0glM2e
-rJE24DMSKJu02sVF3lTAZBQOXOHoanRYTbwHz3VaBKb3h1UknadYYqLMeqRoQ4q5
-f4aFR76/1k+uzFGe5YRi6szifED9avhvJ85t6+tX/Z7YqZ0EXCo8G00NZnkeuW2N
-R4q05a8nZYohZADId0mVfeAbo6baw4Yg1cAS+D7zsA==
-=CzIl
+iQGcBAEBCAAGBQJTDSexAAoJEJQzkH1pP7W4/Q0L/AszhjgDsJG3pSy9bH06w9Hb
+dRe80AF1cJQOo8bZjMFkd5zw0JxDHI82leiz7/mWyOMxANohxiWp9NAKr7kpULFO
+5KObToLNAxxSSRThZSVCBiSBGHPLpOdMeDSXSfDU/KCD0BuT33q0k0zRpHTxbq5H
+VxiF7SM1rJnzECRFSX5zb4RBBunddjVNKq75Plm/a63DcDwPxpavY/hrgcNr6jzh
+kyTEewuw4pY8s5c5UphT5acNvZthCS++IKrMarboZ+q8WesRAvAup7esGg6W+sbJ
+Fey6plFabLa0hNjD2tmpPNVWcoionrPi+tYn6UXwL8wKImgZ/SgdWNP0KSSzDuMM
+O7fCKIh82X8Qd3YzDiUp6s8mZ8eMT2JHGKiSaHoymkptWgNMSGNcnoNnV7miMhcJ
+gDuYoPY3iQ5MZAZzx2+DBeWHONKb7579ELrwlxMM4Uhi+QfD9KjYlqJKI8k8BouU
+xa9Vr27Ha2C9rA8hHwymQz8x5e1WSlzL1C1INvbAew==
+=ENB0
 -----END PGP SIGNATURE-----
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")