[gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/

[Ulrich Müller]

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
 }