gentoo resync : 28.04.2021

8 files changed, 160 insertions, 97 deletions

diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 004d976f76ef..29a5b1b5cade 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,9 +1,9 @@
+AUX htpdate-1.2.6-ldlibs.patch 916 BLAKE2B 613e7ce001ee6507251d3cca46aaae295b4293e10b8553a49f259bd7722adff8888c10dd9de13cdce042c22b177e10a4cb04b3add97ffe4a8d8a68b8584b4a24 SHA512 c2515949555d70260c21f9cda7b6615a48e44b37c48c84bc356f42595ead0b3c21478e7265a9192e5dcebf00067bb9aa03ae9e9e3ce3145cafc80c6a3a57e435
 AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6b8d787e3cc91ac8870ffd9b95df390bda3c90dd9e186bb6fc2629f56073a97e88fd5dc1141bd6 SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
-DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
-DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
 DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
-EBUILD htpdate-1.0.7.ebuild 1102 BLAKE2B 1cc102fef87ec0088fda9ac44d732edc8b30a91744980a5f43882e0f47815a2222b781003705bc1ae16f8fa399beeccaaf63e913381835f3eddca87e36ec0afd SHA512 9cf645c7550fcc3f4effb0608d423c7bfbfc82da84132502cc2d3be24eaf1ff97d9cfaa748e179c9f653f7ba2c543d8040897415a1702c36f21319f38a9d9086
-EBUILD htpdate-1.2.0.ebuild 1003 BLAKE2B 1076567f66e459d86f8f94a2b27d4f9156aac796ab13722ebdd43a3cc2b028efabee917e47de7b191fe5040f9af641646dfacb5527d17eecfed8b458ba159adb SHA512 a75b5244402021cabc7966bd2128343a92ad7765340b32a9fff91580628c0563396553dbb8569260008f582491996a2d22093c42003dc15bff4ec15c5e9d14b1
-EBUILD htpdate-1.2.2.ebuild 1009 BLAKE2B 1cd2c0f415c3f296b48377549f0b4f9c1010d0ca0990183e53b6db481c83285598a63cba5be9dba902954ca059498cb9b0730fea7f001d0f937d7ddce15bbc0b SHA512 7df407fb876c2fec7afa66719f4e3daa57a5694ad03d47874372d6720bfd1032c783fbb1841cfd74edc83377e6a0bf4e06221d76e5bca82f7b757ce4127c0c12
-MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
+DIST htpdate-1.2.6.tar.gz 15083 BLAKE2B 913337f51fd26e811e33f195e463adc57e2512ba502f668f2429676d962623ea943bdb1d42ceddf6d35e7e8ba727b3f1300b34a8370ed661b3fa5b4b53ef1af7 SHA512 fe7442be5581eea0579060c02fb4ffe52151c6408d1b47afc9be049d2a8b1c8d0acd3b3481680a4b6a50f52622d47266afc0fe8dc67c5bb2a3aca2422e34f23f
+EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d359609d3d1d0ec23fa58a2bf85875359e9e50f7e7df849cf84fcc10931c6ccaf18cb8341646ee99bedee7e218ac5e SHA512 0d627e3d4aef1a2f3924382af51207802784cc5cb7c36f3e8a97a9336d5ae398652a580d97567d2ee89e4f0bb885bd3d574fa7b0f6fc0c857bc5c45cc8d900b8
+EBUILD htpdate-1.2.6.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14
+EBUILD htpdate-9999.ebuild 1531 BLAKE2B 251f6e312942461d3af28f55850940baad3349c8037a7a106829eef3b902225533b2ee62c20b5e985b5c4b725d12cf41b89beed3549d08d00ce8d9a9d30def93 SHA512 a45e9f6f841bcde4ef7cd63b803ec2073b938a0c9568156859d62c2f0fd4a60ee4db6b1b5d3a9c9757df00cf9598a984427c17c290b4bb094796335849a9fa14
+MISC metadata.xml 331 BLAKE2B 499e23627372aaf68a27bf7e8b7d4dc35400c14867fcd8db0c10125669bb996c3678d348958afa13e5b36234764226af6628bdc52005963f7d4568029c355d5b SHA512 439b4865a0e8a9dd6f1848f5ccf68b813057639722b4552a4bb02c9c70ededfe115f21e9535db5b87bd88046cc85cd127df20a9c8bd50bc837716bd5ac4246ff
diff --git a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch
new file mode 100644
index 000000000000..fea1d85b10bc
--- /dev/null
+++ b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch
@@ -0,0 +1,35 @@
+From ea14fbcd91e5575bf16bc64b7660a6d02a855d7a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 31 Mar 2021 15:46:38 +0200
+Subject: [PATCH] Makefile: Libraries belong into LDLIBS variable
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 21668a6..a531f90 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ PKG_CONFIG ?= pkg-config
+ 
+ ifdef ENABLE_HTTPS
+ CFLAGS += -DENABLE_HTTPS
+-LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
++LDLIBS = $(shell $(PKG_CONFIG) --libs openssl)
+ endif
+ 
+ INSTALL = install -c
+@@ -16,7 +16,7 @@ INSTALL = install -c
+ all: htpdate
+ 
+ htpdate: htpdate.c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) -o htpdate htpdate.c $(LDFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o htpdate htpdate.c $(LDLIBS)
+ 
+ install: all
+ 	mkdir -p $(bindir)
+-- 
+2.31.1
+
diff --git a/net-misc/htpdate/htpdate-1.0.7.ebuild b/net-misc/htpdate/htpdate-1.0.7.ebuild
deleted file mode 100644
index d0e7d411480a..000000000000
--- a/net-misc/htpdate/htpdate-1.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo toolchain-funcs unpacker
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/htp/"
-SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=""
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die "change directory to ${S} failed"
-	unpacker htpdate.8.gz
-}
-
-src_prepare() {
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin htpdate
-	doman htpdate.8
-	dodoc README Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
deleted file mode 100644
index f672908fccd4..000000000000
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/htp/"
-SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=""
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-src_prepare() {
-	default
-
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin htpdate
-	doman htpdate.8
-	dodoc README Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
index 40bf07ab11b8..4869d4ad827a 100644
--- a/net-misc/htpdate/htpdate-1.2.2.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/htpdate/htpdate-1.2.6.ebuild b/net-misc/htpdate/htpdate-1.2.6.ebuild
new file mode 100644
index 000000000000..033790209271
--- /dev/null
+++ b/net-misc/htpdate/htpdate-1.2.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="https://github.com/angeloc/htpdate"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/angeloc/htpdate.git"
+else
+	SRC_URI="https://github.com/angeloc/${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"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+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" )
+
+src_prepare() {
+	default
+
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+	# Don't compress man pages by default
+	sed '/gzip/d' -i Makefile || die
+}
+
+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' '')
+}
+
+src_install() {
+	emake DESTDIR="${D}" bindir='$(prefix)/sbin' install
+	dodoc README.md Changelog
+
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild
new file mode 100644
index 000000000000..033790209271
--- /dev/null
+++ b/net-misc/htpdate/htpdate-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
+HOMEPAGE="https://github.com/angeloc/htpdate"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/angeloc/htpdate.git"
+else
+	SRC_URI="https://github.com/angeloc/${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"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+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" )
+
+src_prepare() {
+	default
+
+	# Use more standard adjtimex() to fix uClibc builds.
+	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
+	# Don't compress man pages by default
+	sed '/gzip/d' -i Makefile || die
+}
+
+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' '')
+}
+
+src_install() {
+	emake DESTDIR="${D}" bindir='$(prefix)/sbin' install
+	dodoc README.md Changelog
+
+	newconfd "${FILESDIR}"/htpdate.conf htpdate
+	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
+
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
index 95aa13f6c5ef..42f1d8fdecfc 100644
--- a/net-misc/htpdate/metadata.xml
+++ b/net-misc/htpdate/metadata.xml
@@ -5,4 +5,7 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">angeloc/htpdate</remote-id>
+	</upstream>
 </pkgmetadata>