jer 15/01/30 11:26:16 Modified: ChangeLog Added: chrony-1.31-r1.ebuild Log: Fix configure logic with regard to readline/libedit (bug #538190 by Brian Evans). (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.149 net-misc/chrony/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?rev=1.149&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?rev=1.149&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?r1=1.148&r2=1.149 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- ChangeLog 5 Nov 2014 11:24:29 -0000 1.148 +++ ChangeLog 30 Jan 2015 11:26:16 -0000 1.149 @@ -1,6 +1,12 @@ # ChangeLog for net-misc/chrony -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.148 2014/11/05 11:24:29 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.149 2015/01/30 11:26:16 jer Exp $ + +*chrony-1.31-r1 (30 Jan 2015) + + 30 Jan 2015; Jeroen Roovers <[email protected]> +chrony-1.31-r1.ebuild: + Fix configure logic with regard to readline/libedit (bug #538190 by Brian + Evans). 05 Nov 2014; Jeroen Roovers <[email protected]> -chrony-1.30-r1.ebuild, -files/chronyd.service, -files/chronyd.service-r1: 1.1 net-misc/chrony/chrony-1.31-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild?rev=1.1&content-type=text/plain Index: chrony-1.31-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild,v 1.1 2015/01/30 11:26:16 jer Exp $ EAPI=5 inherit eutils systemd toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="http://chrony.tuxfamily.org/"; SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86" IUSE="caps ipv6 libedit readline +rtc selinux" REQUIRED_USE="?? ( libedit readline )" CDEPEND=" caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4 ) " DEPEND=" ${CDEPEND} sys-apps/texinfo " RDEPEND=" ${CDEPEND} selinux? ( sec-policy/selinux-chronyd ) " RESTRICT=test S="${WORKDIR}/${P/_/-}" src_prepare() { sed -i \ -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ -e 's:/var/run:/run:g' \ conf.c chrony.texi.in chrony.txt examples/* FAQ || die } src_configure() { tc-export CC local CHRONY_EDITLINE # ./configure legend: # --disable-readline : disable line editing entirely # --without-readline : do not use sys-libs/readline (enabled by default) # --without-editline : do not use dev-libs/libedit (enabled by default) if ! use readline && ! use libedit; then CHRONY_EDITLINE='--disable-readline' else CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" fi # not an autotools generated script local CHRONY_CONFIGURE=" ./configure \ $(usex caps '' --disable-linuxcaps) \ $(usex ipv6 '' --disable-ipv6) \ $(usex rtc '' --disable-rtc) \ ${CHRONY_EDITLINE} \ ${EXTRA_ECONF} \ --docdir=/usr/share/doc/${PF} \ --infodir=/usr/share/info \ --mandir=/usr/share/man \ --prefix=/usr \ --sysconfdir=/etc/chrony \ --without-nss \ --without-tomcrypt " # print the ./configure call to aid in future debugging einfo ${CHRONY_CONFIGURE} sh ${CHRONY_CONFIGURE} || die } src_compile() { emake all docs } src_install() { default rm "${D}"/usr/share/doc/${PF}/COPYING || die doinfo chrony.info* newinitd "${FILESDIR}"/chronyd.init chronyd newconfd "${FILESDIR}"/chronyd.conf chronyd insinto /etc/${PN} newins examples/chrony.conf.example chrony.conf newins examples/chrony.keys.example chrony.keys keepdir /var/{lib,log}/chrony insinto /etc/logrotate.d newins "${FILESDIR}"/chrony.logrotate chrony systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service systemd_enable_ntpunit 50-chrony chronyd.service }
