summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Veller <tove@gentoo.org>2006-08-22 15:22:22 +0000
committerTorsten Veller <tove@gentoo.org>2006-08-22 15:22:22 +0000
commit364abfe6557f3136dad02671874f7a52b202ea82 (patch)
tree854de850f45d865baab675d7ea216cfa2b459539 /net-misc/chrony
parentAdd ~sparc keyword. Seems fine. (diff)
downloadgentoo-2-364abfe6557f3136dad02671874f7a52b202ea82.tar.gz
gentoo-2-364abfe6557f3136dad02671874f7a52b202ea82.tar.bz2
gentoo-2-364abfe6557f3136dad02671874f7a52b202ea82.zip
Fix bug #144680
(Portage version: 2.1.1_pre5-r3)
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/ChangeLog5
-rw-r--r--net-misc/chrony/chrony-1.21-r1.ebuild10
2 files changed, 10 insertions, 5 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/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"
}