Disable md5/elf with autoconf cache vars now rather than sed #274266 by Fabio Erculiani.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 21 insertions, 22 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 6a50449a7f5e..8d06a480acfd 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.148 2009/06/20 23:12:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.149 2009/06/22 13:39:06 vapier Exp $
+
+  22 Jun 2009; Mike Frysinger <vapier@gentoo.org> ntp-4.2.4_p7.ebuild:
+  Disable md5/elf with autoconf cache vars now rather than sed #274266 by
+  Fabio Erculiani.
 
   20 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> +ntp-4.2.4_p6.ebuild:
   Re-add _p6 until bug 274863 is resolved, but add the MOD_NANO patch so it
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 49125b94863a..ce1f0e65265c 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX man-pages/genmans.sh 1608 RMD160 0232a5c8c68112f099befa6f6f8116500b5a4097 SHA1 85fd49155f0d1aa88a58d4f303dd22bbd56a47d0 SHA256 543d91dcc7b310819aa136b84b815a1112a80d9949d37b08366edc8f70db1cb6
 AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d
 AUX man-pages/ntpdc.html.patch 2558 RMD160 54ee42ad6f8b23efdf3005a17df6f1bc6475f5ee SHA1 c2c18f7a70a407a92ca7d272d9de37979664be12 SHA256 ebc0667c6e0225413217489d3356b260824d06de083bd90ad5506c0d233e36d6
@@ -13,6 +16,13 @@ DIST ntp-4.2.4p6.tar.gz 3443787 RMD160 d3853bdd593b49c435ec19b95066097ef5e71acc
 DIST ntp-4.2.4p7-manpages.tar.bz2 49719 RMD160 deebf4f80e4c3684c48f743a03e0481030c7993a SHA1 4e6939aff7b41e7e3efc42332e0a7048f7075240 SHA256 cd21e29fcd9a13ee92d5f5ad492c9be49eeb2e877351865973805c12993cad3f
 DIST ntp-4.2.4p7.tar.gz 3382146 RMD160 11d69176c8cb4b95f7e9f468c37ab8fc53a28876 SHA1 8476f75daffe9851cc6f33d170902bce77637499 SHA256 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
 EBUILD ntp-4.2.4_p6.ebuild 4401 RMD160 71db36cb77effd4666d51a6e3f18283becd3a7c2 SHA1 03b786e70ba02bc3b6b980962cd5a4c11a15a92d SHA256 ff227d888b5ac67db22e94521cc4fdc460fb9d7b4db9a18ea193dac5afc46d61
-EBUILD ntp-4.2.4_p7.ebuild 4400 RMD160 f86e70d05559a5187d514e0017cc795c596a9d73 SHA1 e7f47a72eb31fc1f320b9f47c9529709693d97fd SHA256 551fe2287ff24ad8fd342f682fbd006da035c2804fff772fa6b791e1e9f94f10
-MISC ChangeLog 19932 RMD160 eacbda63c673968bb33068a3f5c03b673f57a4f2 SHA1 9bf2719294b19ac22b8012a0b4fa847ce1b8304d SHA256 1ca53feaf1890814c1b96c36766a0926423751a9de6624ecf49d5dc10adb9ef2
+EBUILD ntp-4.2.4_p7.ebuild 3982 RMD160 44644c9966757dc35552ce22c44b0d434c47ea64 SHA1 4802e73dfe29a256c59cc38c53542bd01d0943b8 SHA256 89374c5a45d28d392f13afd2f820b65ff2b86a4351ac254ecd4e990e654c9b86
+MISC ChangeLog 20096 RMD160 8404f00b55f4b0bbb3c836a20acebadda00564f4 SHA1 3a6928912fb77b484823c371f6f7b8b683250fd5 SHA256 e11069ea9fc5f785ba794a75b068c675316c8934b715172a5d08951a94bd2a96
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko/iX8ACgkQlPl3HsVfCDpfKgCeM/40lRsZM4dyDICJ+B4u7Crl
+9mcAnjcvfO52I4hl41eTJJNRLI43skP7
+=EYCk
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.4_p7.ebuild b/net-misc/ntp/ntp-4.2.4_p7.ebuild
index 4c985802169f..8b25f84cac59 100644
--- a/net-misc/ntp/ntp-4.2.4_p7.ebuild
+++ b/net-misc/ntp/ntp-4.2.4_p7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.7 2009/06/20 12:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.8 2009/06/22 13:39:06 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -28,16 +28,6 @@ PDEPEND="openntpd? ( net-misc/openntpd )"
 
 S=${WORKDIR}/${MY_P}
 
-hax_bitkeeper() {
-	# the makefiles have support for bk ...
-	# basically we have to do this or bk will try to write
-	# to files in /opt/bitkeeper causing sandbox violations ;(
-	mkdir -p "${T}"/fakebin
-	echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk
-	chmod a+x "${T}"/fakebin/bk
-	export PATH="${T}/fakebin:${PATH}"
-}
-
 pkg_setup() {
 	enewgroup ntp 123
 	enewuser ntp 123 -1 /dev/null ntp
@@ -57,16 +47,12 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
 	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
 	append-cppflags -D_GNU_SOURCE #264109
-
-	sed -i \
-		-e 's:md5\.h:touch_not_my_md5:g' \
-		-e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
-		-e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
-		configure || die "sed failed"
 }
 
 src_compile() {
-	hax_bitkeeper
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md_5=no
+	export ac_cv_lib_elf_nlist=no
 	# blah, no real configure options #176333
 	export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no)
 	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
@@ -81,7 +67,6 @@ src_compile() {
 }
 
 src_install() {
-	hax_bitkeeper
 	emake install DESTDIR="${D}" || die "install failed"
 	# move ntpd/ntpdate to sbin #66671
 	dodir /usr/sbin