From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LFCnI-00012p-9t for garchives@archives.gentoo.org; Tue, 23 Dec 2008 19:19:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F302E041A; Tue, 23 Dec 2008 19:19:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 52E2FE041A for ; Tue, 23 Dec 2008 19:19:51 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id DA87B64DDD for ; Tue, 23 Dec 2008 19:19:50 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LFCnG-0007uP-J0 for gentoo-commits@lists.gentoo.org; Tue, 23 Dec 2008 19:19:50 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-util/git: git-1.6.0.6.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: git-1.6.0.6.ebuild ChangeLog X-VCS-Directories: dev-util/git X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Tue, 23 Dec 2008 19:19:50 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b0a56b16-2808-4c2e-b7ad-1182159cf488 X-Archives-Hash: 75a2ca769195d92a4ff3b91183baff10 robbat2 08/12/23 19:19:50 Modified: git-1.6.0.6.ebuild ChangeLog Log: Factor out the long emake invocation so that we can consistently call i= t and avoid triggering a rebuild during install or test. (Portage version: 2.2_rc18/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64) Revision Changes Path 1.4 dev-util/git/git-1.6.0.6.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1= .6.0.6.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1= .6.0.6.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/git-1= .6.0.6.ebuild?r1=3D1.3&r2=3D1.4 Index: git-1.6.0.6.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.6.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -p -w -b -B -u -u -r1.3 -r1.4 --- git-1.6.0.6.ebuild 23 Dec 2008 17:09:01 -0000 1.3 +++ git-1.6.0.6.ebuild 23 Dec 2008 19:19:50 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.6.ebuild,v 1.3= 2008/12/23 17:09:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.6.ebuild,v 1.4= 2008/12/23 19:19:50 robbat2 Exp $ =20 inherit toolchain-funcs eutils elisp-common perl-module bash-completion =20 @@ -110,36 +110,30 @@ src_unpack() { exportmakeopts } =20 -src_compile() { +git_emake() { emake ${MY_MAKEOPTS} \ DESTDIR=3D"${D}" \ OPTCFLAGS=3D"${CFLAGS}" \ OPTLDFLAGS=3D"${LDFLAGS}" \ prefix=3D/usr \ htmldir=3D/usr/share/doc/${PF}/html \ - || die "make failed" + "$@" +} + +src_compile() { + git_emake || die "emake failed" =20 if use emacs ; then elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" fi if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR=3D"${D}" \ - OPTCFLAGS=3D"${CFLAGS}" \ - OPTLDFLAGS=3D"${LDFLAGS}" \ - prefix=3D/usr \ - htmldir=3D/usr/share/doc/${PF}/html \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" + git_emake \ + gitweb/gitweb.cgi || die "emake gitweb/gitweb.cgi failed" fi } =20 src_install() { - emake ${MY_MAKEOPTS} \ - DESTDIR=3D"${D}" \ - OPTCFLAGS=3D"${CFLAGS}" \ - OPTLDFLAGS=3D"${LDFLAGS}" \ - prefix=3D/usr \ - htmldir=3D/usr/share/doc/${PF}/html \ + git_emake \ install || \ die "make install failed" =20 @@ -283,7 +277,8 @@ src_test() { cd "${S}" # Now run the tests einfo "Start test run" - emake ${MY_MAKEOPTS} DESTDIR=3D"${D}" prefix=3D/usr test || die "tests = failed" + git_emake \ + test || die "tests failed" } =20 showpkgdeps() { 1.311 dev-util/git/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?rev=3D1.311&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?rev=3D1.311&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/Chang= eLog?r1=3D1.310&r2=3D1.311 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v retrieving revision 1.310 retrieving revision 1.311 diff -p -w -b -B -u -u -r1.310 -r1.311 --- ChangeLog 23 Dec 2008 17:09:01 -0000 1.310 +++ ChangeLog 23 Dec 2008 19:19:50 -0000 1.311 @@ -1,6 +1,10 @@ # ChangeLog for dev-util/git # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.310 2008/1= 2/23 17:09:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.311 2008/1= 2/23 19:19:50 robbat2 Exp $ + + 23 Dec 2008; Robin H. Johnson git-1.6.0.6.ebuild: + Factor out the long emake invocation so that we can consistently call = it + and avoid triggering a rebuild during install or test. =20 23 Dec 2008; Markus Meier git-1.6.0.6.ebuild: amd64/x86 stable, bug #251343