Factor out the long emake invocation so that we can consistently call it and avoid triggering a rebuild during install or test.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64

3 files changed, 19 insertions, 30 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 9abc615a6c33..271c9fc9607d 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -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/12/23 17:09:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.311 2008/12/23 19:19:50 robbat2 Exp $
+
+  23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> 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.
 
   23 Dec 2008; Markus Meier <maekke@gentoo.org> git-1.6.0.6.ebuild:
   amd64/x86 stable, bug #251343
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 11c20d7ff3da..63da9af9e343 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20080322-git-1.5.4.4-noperl.patch 11055 RMD160 a184a12108077bbb44ccce42da2b5f603fdc27d8 SHA1 1437ecf11405109d38fe63a4ab29fbed55eb0b60 SHA256 76c706775095987ca073bb0229c93d7a972d61ddebeed598fbba4bc15112a60f
 AUX 20080423-git-1.5.5.1-noperl.patch 10399 RMD160 dbe5bcfb2e6a6b924807cc2f9458c25c2e1a5399 SHA1 7ad957a4a6ae2414a3eea0ec491cbceb362d2000 SHA256 e681fcf677a141c81ef2e7460cb03b2f0d1fe346c175a1ebdc2323818f615c35
 AUX 20080528-git-1.5.5.3-noperl.patch 10902 RMD160 9a0b7c5a11828c0e0cff3486b0318225b6a9b49c SHA1 1792d05d37d91ccb2531c84938846d4cbcab415c SHA256 d5b1eac4c06c26dbc0f751865c356eaf3a2bb5cf34558f46c1533d71c0b51307
@@ -86,14 +83,7 @@ EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b S
 EBUILD git-1.6.0.4-r1.ebuild 8948 RMD160 8931b3756e1c0302d46bea731c15715b5549b0cf SHA1 4c41d4512cd01983a81b91e6da0aa872f9cdefa4 SHA256 fdb03c4d902d6169300595a231b965349844c03f0f5f5ff291daa1c0435a82bb
 EBUILD git-1.6.0.4-r2.ebuild 8948 RMD160 6da6d8ad23d1f4666044098149409130b33b1cc9 SHA1 e72e51557d1831763059164c83348fd4e3e63eaa SHA256 4ef3dc1039dbeff20f1dadb08e24071e97124fe2f4bb93f5eddc8fc7ab975063
 EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b
-EBUILD git-1.6.0.6.ebuild 8941 RMD160 5932f2d8ba58f3864df5e18e5be6eddcc1a54cf6 SHA1 46543c6a0d5d2c79e0afcc61ae92629d91d39771 SHA256 f27a57a51db968a5cfc638b9cca16aeb76a2b0ae8cfeb6a04baf60a09a66daed
+EBUILD git-1.6.0.6.ebuild 8668 RMD160 3741ce70fe022e4aa95a1bd59929c3ec71fef441 SHA1 1a73a2be8c3ac731d1319de7ea904a7c1670d741 SHA256 7d8e951b3e08f3b1938be577691650f1fb75d3b5682522c805908869c18e1fc7
 EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c
-MISC ChangeLog 46803 RMD160 0648d41d9429b3ccd09f105031bddf046057c817 SHA1 150bc59c84cab3342165a625669b92e58bddc692 SHA256 da9213f9575526ba6e3a34e683745c9ab4546eedd3b3aebb19fa0ac1cccce3e3
+MISC ChangeLog 47010 RMD160 0cccdc72a6f02a676dbab7bb72c0424c99fda75c SHA1 5614d3d7a5371462101a72dda1381222a71c5009 SHA256 15ef7f7f5cf63d378e54ac1092ae92483a9104eae6cb62dceb236870956c749d
 MISC metadata.xml 1539 RMD160 b8c0182e6c64bf0399c979942ec403c309a95019 SHA1 e3fbe7df1c4a5209d10ae82d7aa368df6bbf8a9e SHA256 9b0b2c3e7607e1e280edd997169c72799f37c7cac547bce3e294584eaabbb3e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklRG1MACgkQkKaRLQcq0GImjwCfYICWFI8+PjFfzCML5KzFlpTB
-oYkAoKdVDBgMHUOOXDU1CWdjG0k5IgwN
-=Ff7j
------END PGP SIGNATURE-----
diff --git a/dev-util/git/git-1.6.0.6.ebuild b/dev-util/git/git-1.6.0.6.ebuild
index cd5f52aa9362..422049d8f199 100644
--- a/dev-util/git/git-1.6.0.6.ebuild
+++ b/dev-util/git/git-1.6.0.6.ebuild
@@ -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 $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -110,36 +110,30 @@ src_unpack() {
 	exportmakeopts
 }
 
-src_compile() {
+git_emake() {
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		prefix=/usr \
 		htmldir=/usr/share/doc/${PF}/html \
-		|| die "make failed"
+		"$@"
+}
+
+src_compile() {
+	git_emake || die "emake failed"
 
 	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="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		prefix=/usr \
-		htmldir=/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
 }
 
 src_install() {
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		prefix=/usr \
-		htmldir=/usr/share/doc/${PF}/html \
+	git_emake \
 		install || \
 		die "make install failed"
 
@@ -283,7 +277,8 @@ src_test() {
 	cd "${S}"
 	# Now run the tests
 	einfo "Start test run"
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+	git_emake \
+		test || die "tests failed"
 }
 
 showpkgdeps() {