From: Hans de Graaff <graaff@gentoo.org>
Date: Tue, 2 Feb 2016 15:28:36 +0000 (+0100)
Subject: app-emacs/with-editor: fix bug 573666
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=823227aca9a1852ed31315b24ecbee08bf2e9668;p=gentoo.git

app-emacs/with-editor: fix bug 573666

Block on older versions of app-emacs/magit since they bundle
the same code and this leads to file collisions, bug 573666.

Use a sane filename for the downloaded archive.

Package-Manager: portage-2.2.26
---

diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index ab254a99c03e..1e7142962518 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1 +1 @@
-DIST v2.5.0.tar.gz 14940 SHA256 8091465eefee4057a4a0daab72db1f2f0415e2abfe965d1e8b8206f3031aeba5 SHA512 aae01ebc2f5922af1742648eb5e25ccadcf460118c872caa2b79c2139ec85ae13a59ca63880c3d077eb846d333323d054341916b5439acd97fa3ca1a62847533 WHIRLPOOL 85c5959a5644cfd4f00200dac76dc8bc4e0598c144d3138bec72194bf4b5557dc2c9c6ec77c70a86c0c8e04bbebe0df1c34418387168ae5479936ac0c63140e2
+DIST with-editor-2.5.0.tar.gz 14940 SHA256 8091465eefee4057a4a0daab72db1f2f0415e2abfe965d1e8b8206f3031aeba5 SHA512 aae01ebc2f5922af1742648eb5e25ccadcf460118c872caa2b79c2139ec85ae13a59ca63880c3d077eb846d333323d054341916b5439acd97fa3ca1a62847533 WHIRLPOOL 85c5959a5644cfd4f00200dac76dc8bc4e0598c144d3138bec72194bf4b5557dc2c9c6ec77c70a86c0c8e04bbebe0df1c34418387168ae5479936ac0c63140e2
diff --git a/app-emacs/with-editor/with-editor-2.5.0.ebuild b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
similarity index 81%
rename from app-emacs/with-editor/with-editor-2.5.0.ebuild
rename to app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
index 89959239ce91..91902d2def2b 100644
--- a/app-emacs/with-editor/with-editor-2.5.0.ebuild
+++ b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit elisp
 
 DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
 HOMEPAGE="http://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -18,3 +18,6 @@ KEYWORDS="~amd64 ~x86"
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
 DOCS="README.md with-editor.org"
+
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0"