From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7AD99158088 for ; Thu, 27 Jan 2022 20:29:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 640DD2BC06B; Thu, 27 Jan 2022 20:28:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3B9C2BC04D for ; Thu, 27 Jan 2022 20:28:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00EA83431FA for ; Thu, 27 Jan 2022 20:28:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17AC81F0 for ; Thu, 27 Jan 2022 20:28:41 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1643315313.273933f937c0623d17a0781a9e0e472b0f5f7783.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/htpdate/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/htpdate/htpdate-9999.ebuild X-VCS-Directories: net-misc/htpdate/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 273933f937c0623d17a0781a9e0e472b0f5f7783 X-VCS-Branch: master Date: Thu, 27 Jan 2022 20:28:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64dc0e86-98c7-49df-be8f-3d65cba70a69 X-Archives-Hash: 291a0a513eeb43cf796268d12ed320e6 commit: 273933f937c0623d17a0781a9e0e472b0f5f7783 Author: Lars Wendler gentoo org> AuthorDate: Thu Jan 27 20:23:44 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jan 27 20:28:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273933f9 net-misc/htpdate: Use original htpdate upstream again Signed-off-by: Lars Wendler gentoo.org> net-misc/htpdate/htpdate-9999.ebuild | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild index 033790209271..eedff8c28a70 100644 --- a/net-misc/htpdate/htpdate-9999.ebuild +++ b/net-misc/htpdate/htpdate-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic readme.gentoo-r1 toolchain-funcs +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="https://github.com/angeloc/htpdate" +HOMEPAGE="https://www.vervest.org/htp/" if [[ "${PV}" == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/angeloc/htpdate.git" + EGIT_REPO_URI="https://github.com/twekkel/htpdate" else - SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" fi IUSE="+ssl" @@ -20,12 +20,14 @@ SLOT="0" DEPEND="ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" -BDEPEND="ssl? ( virtual/pkgconfig )" + +# Test suite tries to connect to the Internet +RESTRICT="test" DOC_CONTENTS="If you would like to run htpdate as a daemon, set appropriate http servers in /etc/conf.d/htpdate!" -PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" ) +PATCHES=( ) src_prepare() { default @@ -37,17 +39,12 @@ src_prepare() { } src_compile() { - if use ssl ; then - append-cflags -DENABLE_HTTPS - export PKG_CONFIG="$(tc-getPKG_CONFIG)" - fi - - emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \ - $(usex ssl 'ENABLE_HTTPS=1' '') + emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ + $(usex ssl "https" '') } src_install() { - emake DESTDIR="${D}" bindir='$(prefix)/sbin' install + emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install dodoc README.md Changelog newconfd "${FILESDIR}"/htpdate.conf htpdate