Bug 201544: Use the proper build mechanism to disable the Tk-using sections of git.

Package-Manager: portage-2.1.4_rc10

5 files changed, 28 insertions, 26 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 93d7078a8ee7..8062d7f64423 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.240 2007/12/25 08:47:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.241 2007/12/25 08:57:27 robbat2 Exp $
+
+  25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
+  git-1.5.4_rc0.ebuild, git-1.5.4_rc1.ebuild:
+  Bug 201544: Use the proper build mechanism to disable the Tk-using sections
+  of git.
 
 *git-1.5.4_rc1 (25 Dec 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index f8e39c28529e..de08b3ddb3f7 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -96,26 +96,26 @@ EBUILD git-1.5.3.6.ebuild 4886 RMD160 3040e1749ee59fa5e45c3f8207920993e99a25e9 S
 MD5 7c7e091dc139c2403d51e880baab42cf git-1.5.3.6.ebuild 4886
 RMD160 3040e1749ee59fa5e45c3f8207920993e99a25e9 git-1.5.3.6.ebuild 4886
 SHA256 22d7677645a2127bdb545ef0ff454d05996a2ff6cfd7626f663c236f540a7673 git-1.5.3.6.ebuild 4886
-EBUILD git-1.5.3.7-r1.ebuild 6327 RMD160 6ac43a1865fd603023495dcffaab2d11f04b319b SHA1 1644ba188c5aa9c34fe8473d05bc5736de433ce6 SHA256 c7eb9c200d9ff99235a71b28b7b357d0b5fd72c95730f1c0aa33bbd147e14c9d
-MD5 bf94ce873921dbbc86f20d67ff4d5e1e git-1.5.3.7-r1.ebuild 6327
-RMD160 6ac43a1865fd603023495dcffaab2d11f04b319b git-1.5.3.7-r1.ebuild 6327
-SHA256 c7eb9c200d9ff99235a71b28b7b357d0b5fd72c95730f1c0aa33bbd147e14c9d git-1.5.3.7-r1.ebuild 6327
+EBUILD git-1.5.3.7-r1.ebuild 6334 RMD160 1c7b174c3df875f699429d75dd66c72f1e0c85b5 SHA1 a0ba0477d4649f456f3e974f8cbfead9e28c620c SHA256 9b4a16adc5814fe353bc7e177666a79f8f897ff67685c7387493c0124d15a4c0
+MD5 773ab809533f3a2701f0c42cdece25ee git-1.5.3.7-r1.ebuild 6334
+RMD160 1c7b174c3df875f699429d75dd66c72f1e0c85b5 git-1.5.3.7-r1.ebuild 6334
+SHA256 9b4a16adc5814fe353bc7e177666a79f8f897ff67685c7387493c0124d15a4c0 git-1.5.3.7-r1.ebuild 6334
 EBUILD git-1.5.3.7.ebuild 5627 RMD160 111a9cf04f5edbdd7d6bc3456569ee344f75f932 SHA1 d9cd33fb633ba6d79a07ff5d9d78c6f1cc987380 SHA256 50b14e256fa9c46e71dea5cc0332b6441c49dee899f6f11ba3de21f411101f9c
 MD5 1994de8b269ed1c296fe261d6f6f3580 git-1.5.3.7.ebuild 5627
 RMD160 111a9cf04f5edbdd7d6bc3456569ee344f75f932 git-1.5.3.7.ebuild 5627
 SHA256 50b14e256fa9c46e71dea5cc0332b6441c49dee899f6f11ba3de21f411101f9c git-1.5.3.7.ebuild 5627
-EBUILD git-1.5.4_rc0.ebuild 6572 RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec SHA1 3972688d905196ca287d34c89d828b654de738f7 SHA256 44864a1e092c384267a370a497559cb36abb9169b925da184a5c590b57bb2935
-MD5 dcfbc5fb35c054e04d202464568d346b git-1.5.4_rc0.ebuild 6572
-RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec git-1.5.4_rc0.ebuild 6572
-SHA256 44864a1e092c384267a370a497559cb36abb9169b925da184a5c590b57bb2935 git-1.5.4_rc0.ebuild 6572
-EBUILD git-1.5.4_rc1.ebuild 6572 RMD160 0dda8c41529b254fb9bcd7aba3d6c0d5a9687266 SHA1 f8d920341c212457b3620547cf635017cc2dc18a SHA256 c992e77b8e892380e7b1f6053fc5128031696729a7fb1a147c3133fcea2bcdf2
-MD5 8aa9898d26a7e3b2f07f58d6d57c84c5 git-1.5.4_rc1.ebuild 6572
-RMD160 0dda8c41529b254fb9bcd7aba3d6c0d5a9687266 git-1.5.4_rc1.ebuild 6572
-SHA256 c992e77b8e892380e7b1f6053fc5128031696729a7fb1a147c3133fcea2bcdf2 git-1.5.4_rc1.ebuild 6572
-MISC ChangeLog 34860 RMD160 a689fbd9805470fd2530ede932fcf6a59e58a949 SHA1 8066bd1a8221a486ba3e4cdfe52eb35fdd74acc5 SHA256 555069aa6072441082bc3116bef9d44c5d5b2de27626bd2f2c227bc67bc3abe9
-MD5 f0744f22e4e639287b9d829d6406674d ChangeLog 34860
-RMD160 a689fbd9805470fd2530ede932fcf6a59e58a949 ChangeLog 34860
-SHA256 555069aa6072441082bc3116bef9d44c5d5b2de27626bd2f2c227bc67bc3abe9 ChangeLog 34860
+EBUILD git-1.5.4_rc0.ebuild 6579 RMD160 3eea31759b006acc962f8c51e39ca9ba9ff860fb SHA1 fbd61e7cf4838688a26056c006882f466e324d73 SHA256 a23563d52fef8d84bd3e69f8735a4ac6279087f7af8138a17098d7bc5ea823fb
+MD5 4e927362deb331cbdd0b375e2dff6aaa git-1.5.4_rc0.ebuild 6579
+RMD160 3eea31759b006acc962f8c51e39ca9ba9ff860fb git-1.5.4_rc0.ebuild 6579
+SHA256 a23563d52fef8d84bd3e69f8735a4ac6279087f7af8138a17098d7bc5ea823fb git-1.5.4_rc0.ebuild 6579
+EBUILD git-1.5.4_rc1.ebuild 6579 RMD160 ed9be4c244357c11843c561e315e02d6de6f1c5c SHA1 654c3a97fcbbac3e9f001386ee023a2021bc2007 SHA256 7d50e1291581cad9d70fc4192c9d02dae93448dac5be432382f3538ecf329808
+MD5 02e23faec40e45190226816b1496eb91 git-1.5.4_rc1.ebuild 6579
+RMD160 ed9be4c244357c11843c561e315e02d6de6f1c5c git-1.5.4_rc1.ebuild 6579
+SHA256 7d50e1291581cad9d70fc4192c9d02dae93448dac5be432382f3538ecf329808 git-1.5.4_rc1.ebuild 6579
+MISC ChangeLog 35071 RMD160 23dbbe8d83ccbe0040613807e235fb1bfac14b57 SHA1 d803fafd4029349d713c81a9b7f0a2ec7479b074 SHA256 290edb6c80c9db58fc6ecf18bc181f945eee9110da0a679ccc7f302b77e07e21
+MD5 9285d4a54f205e2f8b957318189118c0 ChangeLog 35071
+RMD160 23dbbe8d83ccbe0040613807e235fb1bfac14b57 ChangeLog 35071
+SHA256 290edb6c80c9db58fc6ecf18bc181f945eee9110da0a679ccc7f302b77e07e21 ChangeLog 35071
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
diff --git a/dev-util/git/git-1.5.3.7-r1.ebuild b/dev-util/git/git-1.5.3.7-r1.ebuild
index 83328466e706..ae32ca36a8a7 100644
--- a/dev-util/git/git-1.5.3.7-r1.ebuild
+++ b/dev-util/git/git-1.5.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.5 2007/12/25 08:39:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.6 2007/12/25 08:57:27 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -59,6 +59,7 @@ exportmakeopts() {
 	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
 
 	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
 
 	export MY_MAKEOPTS=${myopts}
 }
@@ -107,8 +108,6 @@ src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
 		die "make install failed"
 
-	use tk || rm "${D}"/usr/bin/git{k,-gui}
-
 	doman man?/*
 
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
diff --git a/dev-util/git/git-1.5.4_rc0.ebuild b/dev-util/git/git-1.5.4_rc0.ebuild
index 39c29eeac10a..ae3ee6a0eaae 100644
--- a/dev-util/git/git-1.5.4_rc0.ebuild
+++ b/dev-util/git/git-1.5.4_rc0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc0.ebuild,v 1.3 2007/12/25 08:39:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc0.ebuild,v 1.4 2007/12/25 08:57:27 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -59,6 +59,7 @@ exportmakeopts() {
 	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
 
 	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
 
 	export MY_MAKEOPTS=${myopts}
 }
@@ -107,8 +108,6 @@ src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
 		die "make install failed"
 
-	use tk || rm "${D}"/usr/bin/git{k,-gui}
-
 	doman man?/*
 
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
diff --git a/dev-util/git/git-1.5.4_rc1.ebuild b/dev-util/git/git-1.5.4_rc1.ebuild
index bd4ba075bad5..c68d3afaed8d 100644
--- a/dev-util/git/git-1.5.4_rc1.ebuild
+++ b/dev-util/git/git-1.5.4_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc1.ebuild,v 1.1 2007/12/25 08:47:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc1.ebuild,v 1.2 2007/12/25 08:57:27 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -59,6 +59,7 @@ exportmakeopts() {
 	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
 
 	use iconv || myopts="${myopts} NO_ICONV=YesPlease"
+	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
 
 	export MY_MAKEOPTS=${myopts}
 }
@@ -107,8 +108,6 @@ src_install() {
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
 		die "make install failed"
 
-	use tk || rm "${D}"/usr/bin/git{k,-gui}
-
 	doman man?/*
 
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}