Fix bug #144680

Package-Manager: portage-2.1.1_pre5-r3

3 files changed, 21 insertions, 16 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 21942402eade..9ae430349db1 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/chrony
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.27 2006/08/19 16:00:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.28 2006/08/22 15:22:22 tove Exp $
+
+  22 Aug 2006; Torsten Veller <tove@gentoo.org> chrony-1.21-r1.ebuild:
+  Added a fix for bug #144680.
 
 *chrony-1.21-r1 (19 Aug 2006)
 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index bf563cd4594a..6120fcb973d8 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -44,18 +44,18 @@ EBUILD chrony-1.20.ebuild 1192 RMD160 2f27cccc5e0d8ce0754359289fbf8bc0468cfc7e S
 MD5 565f5d4296870313099305a298cffc43 chrony-1.20.ebuild 1192
 RMD160 2f27cccc5e0d8ce0754359289fbf8bc0468cfc7e chrony-1.20.ebuild 1192
 SHA256 1a3980b4c4b22a874d8e9e98bf79b8e5b7b6bb71888e635ea16db5919295095e chrony-1.20.ebuild 1192
-EBUILD chrony-1.21-r1.ebuild 2006 RMD160 423d19448c24f466be78cdb5eb2895cefb32e16d SHA1 4db89aefd351c97a024adcffb24f1dc1f313cb84 SHA256 9bc8a855daee3d3dfa948d28a089e89d52c99e8309357bba29ac158a40b42134
-MD5 eec11136e245d8b4652c73e82186b29b chrony-1.21-r1.ebuild 2006
-RMD160 423d19448c24f466be78cdb5eb2895cefb32e16d chrony-1.21-r1.ebuild 2006
-SHA256 9bc8a855daee3d3dfa948d28a089e89d52c99e8309357bba29ac158a40b42134 chrony-1.21-r1.ebuild 2006
+EBUILD chrony-1.21-r1.ebuild 2125 RMD160 aaf5c1594c9157820813ceb7ca13795cab60369e SHA1 52074837f3313a2f4140c4509c072b58c7e1d26f SHA256 df2ea3efd6d96c249a4c0cd180a8fff0e33ae7470f9982bbf583c30267d2064b
+MD5 947c9a7f5ec85952841e4841858dab5a chrony-1.21-r1.ebuild 2125
+RMD160 aaf5c1594c9157820813ceb7ca13795cab60369e chrony-1.21-r1.ebuild 2125
+SHA256 df2ea3efd6d96c249a4c0cd180a8fff0e33ae7470f9982bbf583c30267d2064b chrony-1.21-r1.ebuild 2125
 EBUILD chrony-1.21.ebuild 1725 RMD160 30a722b5e4e8d722da705c0ee25278bba851cc56 SHA1 619de7f69b3dbde2bc732952500dad516961bcdb SHA256 81bdeb5c3316a3c88ea9a2906648bf61e6c2c4fa40424a1729e8b1639cab7a97
 MD5 2b03ce824ca6024e896553ce92fa30f2 chrony-1.21.ebuild 1725
 RMD160 30a722b5e4e8d722da705c0ee25278bba851cc56 chrony-1.21.ebuild 1725
 SHA256 81bdeb5c3316a3c88ea9a2906648bf61e6c2c4fa40424a1729e8b1639cab7a97 chrony-1.21.ebuild 1725
-MISC ChangeLog 3673 RMD160 edf440ff742d35b798cb47a9b19ecb65d2d38fa0 SHA1 cc7c2aeb09d46b86c8bbadd37b58d9012e03f653 SHA256 0a2a4964925df9985f1570e1ad9d3877cd6c5c878ea4491cb519fc644ed3a775
-MD5 a2da002ae9f5e4e1d8ec55038dc3c0bf ChangeLog 3673
-RMD160 edf440ff742d35b798cb47a9b19ecb65d2d38fa0 ChangeLog 3673
-SHA256 0a2a4964925df9985f1570e1ad9d3877cd6c5c878ea4491cb519fc644ed3a775 ChangeLog 3673
+MISC ChangeLog 3776 RMD160 e7eec594799ae894605f98c0565d814e7a96be96 SHA1 70e4d62d26a87fe79c6ed7ee84bd2d94ccf37ff6 SHA256 fa7ac6531f84d77f01698b7166822a6e404d64cbf5e5bc71e18d4f908dd86221
+MD5 8df8d24a9df68667cfc30684f268d944 ChangeLog 3776
+RMD160 e7eec594799ae894605f98c0565d814e7a96be96 ChangeLog 3776
+SHA256 fa7ac6531f84d77f01698b7166822a6e404d64cbf5e5bc71e18d4f908dd86221 ChangeLog 3776
 MISC metadata.xml 1015 RMD160 bc4f53cbd06cae4ff0a69ba174b833e91ad5440c SHA1 69d13ba674429a8c83b9f44ed5041622307ce3cc SHA256 a7aea8351438b01c2f11e779007851f07c3bddfac99a2f1a87addbbdef15cb64
 MD5 ba90673e1587f5db474645441572737c metadata.xml 1015
 RMD160 bc4f53cbd06cae4ff0a69ba174b833e91ad5440c metadata.xml 1015
@@ -75,7 +75,7 @@ SHA256 ce1d5871f430ff58f908e8772008355f2557ed4db720e5d95aa5c512ea8f02d1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE5zW0V3J2n04EauwRAtbaAKCDDZiHehkY0etJmORhZIhXF6pRnACgkhzO
-IY9gaWIqSkOzglPujg0o2ZE=
-=zyoi
+iD8DBQFE6yE1V3J2n04EauwRAjLDAJwJsOdiIn50oHUGoxdljrCgleLcWgCgqlKO
+bP8nPtE+lt2ePTph/Of5HKc=
+=sQzo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.21-r1.ebuild b/net-misc/chrony/chrony-1.21-r1.ebuild
index a6c2c4ce4ae7..446acf3384b9 100644
--- a/net-misc/chrony/chrony-1.21-r1.ebuild
+++ b/net-misc/chrony/chrony-1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21-r1.ebuild,v 1.1 2006/08/19 16:00:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21-r1.ebuild,v 1.2 2006/08/22 15:22:22 tove Exp $
 
 inherit eutils toolchain-funcs
 
@@ -26,14 +26,16 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-makefile.diff
 
 	# patches from chrony git repo: <http://chrony.sunsite.dk/git>
-	EPATCH_MULTI_MSG="Applying patches from upstream..."
-	EPATCH_EXCLUDE="chrony-1.21-quash_compile_warnings.diff"
-	EPATCH_FORCE="yes"
+	EPATCH_MULTI_MSG="Applying patches from upstream..." \
+	EPATCH_EXCLUDE="chrony-1.21-quash_compile_warnings.diff" \
+	EPATCH_FORCE="yes" \
 	EPATCH_SUFFIX="diff" epatch "${PATCHDIR}"
 
 	# Allow Hz=200 detection (#21058, Alexander Papaspyrou)
 #	epatch "${FILESDIR}"/${PN}-1.20-sys_linux.c-gentoo.diff
 
+	sed -i "s:#if defined(__i386__) || defined(__sh__):& || defined(__x86_64__):" \
+		io_linux.h || die "amd64 fix"
 	sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
 		chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
 }