From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0C74C58973 for ; Wed, 3 Feb 2016 05:56:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90EAC21C02B; Wed, 3 Feb 2016 05:56:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2322021C02B for ; Wed, 3 Feb 2016 05:56:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 328BE340ECA for ; Wed, 3 Feb 2016 05:56:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A56D8DC for ; Wed, 3 Feb 2016 05:56:12 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1454478956.823227aca9a1852ed31315b24ecbee08bf2e9668.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/with-editor/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/with-editor/Manifest app-emacs/with-editor/with-editor-2.5.0-r1.ebuild app-emacs/with-editor/with-editor-2.5.0.ebuild X-VCS-Directories: app-emacs/with-editor/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 823227aca9a1852ed31315b24ecbee08bf2e9668 X-VCS-Branch: master Date: Wed, 3 Feb 2016 05:56:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a73a792d-8a11-4a77-ad73-844173abc4a5 X-Archives-Hash: 1f8f348024ae738f88ffa34f19c0b2c0 commit: 823227aca9a1852ed31315b24ecbee08bf2e9668 Author: Hans de Graaff gentoo org> AuthorDate: Tue Feb 2 15:28:36 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Wed Feb 3 05:55:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823227ac 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 app-emacs/with-editor/Manifest | 2 +- .../{with-editor-2.5.0.ebuild => with-editor-2.5.0-r1.ebuild} | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest index ab254a9..1e71429 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 8995923..91902d2 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="!!