summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-01-26 17:48:11 +0000
committerJeroen Roovers <jer@gentoo.org>2013-01-26 17:48:11 +0000
commit11e3a042540b307b5e2b31f5c9e597e333792d2a (patch)
tree8023fe1f5a7f0e3066e9b9eed813038d5c5a58bc /net-misc/chrony
parentVersion bump (diff)
downloadgentoo-2-11e3a042540b307b5e2b31f5c9e597e333792d2a.tar.gz
gentoo-2-11e3a042540b307b5e2b31f5c9e597e333792d2a.tar.bz2
gentoo-2-11e3a042540b307b5e2b31f5c9e597e333792d2a.zip
Drop unrecognised --without-tomcrypt from configure call.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/ChangeLog8
-rw-r--r--net-misc/chrony/chrony-1.26.ebuild14
-rw-r--r--net-misc/chrony/chrony-1.27_pre1.ebuild15
3 files changed, 20 insertions, 17 deletions
diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 713dad2c1d4d..d2aaa9ff2906 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/chrony
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.90 2012/11/27 04:22:49 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.91 2013/01/26 17:48:11 jer Exp $
+
+ 26 Jan 2013; Jeroen Roovers <jer@gentoo.org> chrony-1.26.ebuild,
+ chrony-1.27_pre1.ebuild:
+ Drop unrecognised --without-tomcrypt from configure call.
27 Nov 2012; Anthony G. Basile <blueness@gentoo.org> chrony-1.27_pre1.ebuild:
keyword ~arm, bug #444714
diff --git a/net-misc/chrony/chrony-1.26.ebuild b/net-misc/chrony/chrony-1.26.ebuild
index c1459348ba84..386a5ad725b8 100644
--- a/net-misc/chrony/chrony-1.26.ebuild
+++ b/net-misc/chrony/chrony-1.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.26.ebuild,v 1.7 2012/04/11 21:38:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.26.ebuild,v 1.8 2013/01/26 17:48:11 jer Exp $
EAPI=2
@@ -34,13 +34,13 @@ src_configure() {
use caps || myconf+=" --disable-linuxcaps"
# selfwritten configure
./configure \
- --prefix=/usr \
- --sysconfdir=/etc/chrony \
+ ${myconf} ${EXTRA_ECONF} \
+ --docdir=/usr/share/doc/${PF} \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
- --docdir=/usr/share/doc/${PF} \
- --without-tomcrypt \
- ${myconf} ${EXTRA_ECONF} || die "configure failed"
+ --prefix=/usr \
+ --sysconfdir=/etc/chrony \
+ || die "configure failed"
}
src_compile() {
diff --git a/net-misc/chrony/chrony-1.27_pre1.ebuild b/net-misc/chrony/chrony-1.27_pre1.ebuild
index 4ddbcce3cf55..a3c5f3740e8f 100644
--- a/net-misc/chrony/chrony-1.27_pre1.ebuild
+++ b/net-misc/chrony/chrony-1.27_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.27_pre1.ebuild,v 1.3 2012/11/27 04:22:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.27_pre1.ebuild,v 1.4 2013/01/26 17:48:11 jer Exp $
EAPI=4
inherit eutils toolchain-funcs
@@ -38,19 +38,18 @@ src_configure() {
$( use caps || echo --disable-linuxcaps ) \
$( use ipv6 || echo --disable-ipv6 ) \
$( use readline || echo --disable-readline ) \
- --prefix=/usr \
- --sysconfdir=/etc/chrony \
+ ${EXTRA_ECONF} \
+ --docdir=/usr/share/doc/${PF} \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
- --docdir=/usr/share/doc/${PF} \
+ --prefix=/usr \
+ --sysconfdir=/etc/chrony \
--without-nss \
- --without-tomcrypt \
- ${EXTRA_ECONF} \
|| die
}
src_compile() {
- emake all docs || die "make failed"
+ emake all docs
}
src_install() {