From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B54221382BD for ; Thu, 16 Jun 2016 08:52:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17EB5E096A; Thu, 16 Jun 2016 08:52:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5461FE096A for ; Thu, 16 Jun 2016 08:52:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA1913406C0 for ; Thu, 16 Jun 2016 08:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D9A0983 for ; Thu, 16 Jun 2016 08:51:55 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1466067102.c96d9ffc6c049785383c4a61bc13f02ad3fe8146.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/Manifest net-misc/chrony/chrony-2.4.ebuild net-misc/chrony/chrony-2.4_pre1-r3.ebuild net-misc/chrony/chrony-2.4_pre1.ebuild X-VCS-Directories: net-misc/chrony/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: c96d9ffc6c049785383c4a61bc13f02ad3fe8146 X-VCS-Branch: master Date: Thu, 16 Jun 2016 08:51:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 52276406-eb61-4856-a1b5-8d1c5300348b X-Archives-Hash: 6c3f40bb91cb5bd1c0417f92c763338e commit: c96d9ffc6c049785383c4a61bc13f02ad3fe8146 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jun 16 08:49:06 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jun 16 08:51:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96d9ffc net-misc/chrony: Version bump. Package-Manager: portage-2.3.0_rc1 net-misc/chrony/Manifest | 2 +- ...chrony-2.4_pre1-r3.ebuild => chrony-2.4.ebuild} | 0 net-misc/chrony/chrony-2.4_pre1.ebuild | 118 --------------------- 3 files changed, 1 insertion(+), 119 deletions(-) diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index adab8d0..99b02a7 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,3 +1,3 @@ DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920 -DIST chrony-2.4-pre1.tar.gz 388905 SHA256 3165cd130f6049c08a4e643768adf67c113396ce188b1499e6c9b808b748e118 SHA512 92913bfaba5ef5ef63a32cffa4dab1498683db1d73c593fa7e4f228b57c5d40a6a9bf209c14b02c1a1aa65cf168f59bc3af10fe24d2ad1dfe0a7bc2622e16946 WHIRLPOOL 59932cca6f8a98e581eb99850509c8982bd478745d55db261a6b1c21ecab26b64c08920352d422cee10509f50de5be002da010785538e2d853e27f1fbeda3a36 +DIST chrony-2.4.tar.gz 390077 SHA256 8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f SHA512 29bbeba05fb9897d438cddca7dd4e573a1e9da0d583bd737185088e8b777fdfba4056d091d2bbab78824de284b6244a8de7ada8f62be316e815a3d8ae6145485 WHIRLPOOL 7ad8b17ee8c29afa6734b7f096bb56bc08cfb200747141f0fa77e6a37daab118e1c571b8869abcab7e4893ae3eaae6a6d783425058bbaf8508cbd8de215cb49d diff --git a/net-misc/chrony/chrony-2.4_pre1-r3.ebuild b/net-misc/chrony/chrony-2.4.ebuild similarity index 100% rename from net-misc/chrony/chrony-2.4_pre1-r3.ebuild rename to net-misc/chrony/chrony-2.4.ebuild diff --git a/net-misc/chrony/chrony-2.4_pre1.ebuild b/net-misc/chrony/chrony-2.4_pre1.ebuild deleted file mode 100644 index 32b08b7..0000000 --- a/net-misc/chrony/chrony-2.4_pre1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ~hppa ~ppc64" -IUSE="caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) -" -DEPEND=" - ${CDEPEND} - html? ( dev-ruby/asciidoctor ) -" -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 doc/*.man.in examples/* || 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 cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex rtc '' --disable-rtc) \ - $(usex refclock '' --disable-refclock) \ - $(usex adns '' --disable-asyncdns) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --chronysockdir=/run/chrony \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs $(usex html '' 'ADOC=true') - -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r1 chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - if use html; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.2.logrotate chrony - - systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service - systemd_enable_ntpunit 50-chrony chronyd.service -}