From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-842643-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 717D513888F
for <garchives@archives.gentoo.org>; Mon, 26 Oct 2015 18:23:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3BADB21C00E;
Mon, 26 Oct 2015 18:23:26 +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 D7D1721C00E
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2015 18:23:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7A66934092D
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2015 18:23:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 096D31735
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Oct 2015 18:23:21 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1445883764.724aa5e88c07e279e7cd76639145810c0ba9e914.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emacs/magit/magit-2.2.2-r1.ebuild app-emacs/magit/magit-2.2.2.ebuild
X-VCS-Directories: app-emacs/magit/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 724aa5e88c07e279e7cd76639145810c0ba9e914
X-VCS-Branch: master
Date: Mon, 26 Oct 2015 18:23:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5f259943-18b8-4510-805f-e160f2012a0f
X-Archives-Hash: 8eb72b539f8bef88ab75f4603c2f4449
commit: 724aa5e88c07e279e7cd76639145810c0ba9e914
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 18:20:59 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 18:22:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724aa5e8
app-emacs/magit: Fix build failure.
Fix documentation build failure by avoiding the horrible upstream
build system altogether. Drop the "contrib" USE flag since there is
no contrib directory any more. Install some additional doc files.
Bug: 564152
Package-Manager: portage-2.2.23
.../{magit-2.2.2.ebuild => magit-2.2.2-r1.ebuild} | 28 +++++-----------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/app-emacs/magit/magit-2.2.2.ebuild b/app-emacs/magit/magit-2.2.2-r1.ebuild
similarity index 59%
rename from app-emacs/magit/magit-2.2.2.ebuild
rename to app-emacs/magit/magit-2.2.2-r1.ebuild
index 8a803af..bb0b51a 100644
--- a/app-emacs/magit/magit-2.2.2.ebuild
+++ b/app-emacs/magit/magit-2.2.2-r1.ebuild
@@ -13,40 +13,24 @@ SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.2+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="contrib"
RESTRICT="test"
SITEFILE="50${PN}-gentoo.el"
-CDEPEND=">=app-emacs/dash-2.12.0"
-
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND} >=dev-vcs/git-1.9.4"
-
-src_prepare() {
- # Makefile expects this to be present at the current directory
- ln -s lisp/magit-version.el magit-version.el || die
-}
+DEPEND=">=app-emacs/dash-2.12.0"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
src_compile() {
# The upstream build system ignores errors during byte-compilation
# and happily installs broken files, causing errors at runtime.
# Call elisp-compile, in order to catch them here already.
- pushd lisp || die
- elisp-compile *.el
- popd || die
- emake docs
- use contrib && emake contrib
+ elisp-compile lisp/*.el
+ makeinfo Documentation/*.texi || die
}
src_install() {
elisp-install ${PN} lisp/*.{el,elc}
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- doinfo Documentation/*.info
- dodoc README.md
-
- if use contrib; then
- elisp-install ${PN} contrib/*.{el,elc}
- dobin contrib/magit
- fi
+ doinfo *.info
+ dodoc README.md Documentation/AUTHORS.md Documentation/${PV}.txt
}