gentoo resync : 25.11.2020

5 files changed, 3 insertions, 56 deletions

diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index 0367781edab0..9aaecf587f69 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,8 +1,5 @@
-AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f
 AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d
-DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea
-EBUILD sntpd-2.2018.244-r1.ebuild 861 BLAKE2B 453645dce4a010fa7b58164ee9229204e5b697754320e5b31c0d8fa27229fbe2e21022343585e2503e8074e40fd4d278ec6e7288285e8de428e857631066c05f SHA512 4062ce0572a597f336009fd11104f7f6aaac43aef17b41ab77978089aacdb780245bf96d5aa2125a68cab41b13753593257462eb4fbd6ba078eb3f1f0cdc9d70
-EBUILD sntpd-3.0-r1.ebuild 823 BLAKE2B 2e314e506b3a825efa31f5471cbedad7c3f9bd9b66212a32d9d0eaedd112e1851615ccd644ea52164ca0451e54e81aed1cb83bd45c69cf71ca79d14fb9a3f71c SHA512 09e33d85196ee16be8fd04a68c99ccf745167d6a0eedf322a145e46488c916b2240ded3d268beee4ac77d2857eb0c4cad7cf2c9718910d2a7737a268ffc7f5d7
-MISC metadata.xml 1215 BLAKE2B ea6284bde03ea2157cd105851ad90a1a2cf379bc6b5f0742866d25fdb2997e0875dcb350984daa79b63625b525d1b53cde28b3fa47220591540a165955273fc4 SHA512 eba1d1787f52e8101cb64df313df7eb3ddc2e6b593d9acbc8b5a8accacdd6d7b0fd02c4b73e65ffd73fce1bbbd10f3d206989e5b2d5280ad84aac97506568659
+EBUILD sntpd-3.0-r1.ebuild 821 BLAKE2B b570f1fafb14542109ca188078b5921f1dbe386d842625ce7292424a0f27fcefc3e476d8030d63062b4f6c6d8d06688bf64215b9af2740de87d42237f9c304e0 SHA512 6f7f2996d5f7101025dfd2be61fe89048cc69afa1e7e63a6006479374f1c295cd3d8d824aa4d4399096987b27d391a660ab56dde60661a300f254c1580480eb7
+MISC metadata.xml 863 BLAKE2B 91a39d6197e120dee085cb419b126f01635aac9a4a0cd03c6431d6ba33b11b55b8017daba6d2235ce1d7a5abd54c4c4c6fb7691a0ba271a2e9435b519debbb2c SHA512 cef3ed6698c5827937d672c11723ee3a5bbcd073143decff45cd2a63bf1035677cb41b01b79338a69a61927495967c15e25f17c5e3a56f065e765845830e0987
diff --git a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
deleted file mode 100644
index df87cb6ceb22..000000000000
--- a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
-+++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <errno.h>
- #ifdef PRECISION_SIOCGSTAMP
-+#include <linux/sockios.h>
- #include <sys/ioctl.h>
- #endif
- #ifdef USE_OBSOLETE_GETTIMEOFDAY
diff --git a/net-misc/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml
index 0d0a5d1ae349..9bb3f3c88e32 100644
--- a/net-misc/sntpd/metadata.xml
+++ b/net-misc/sntpd/metadata.xml
@@ -19,9 +19,5 @@
 	</upstream>
 	<use>
 		<flag name="adjtimex">Install adjtimex for the clock adjustment algorithm.</flag>
-		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
-		<flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag>
-		<flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag>
-		<flag name="syslog">Enable logging to syslog instead of logging to stderr.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
deleted file mode 100644
index f6b938200cc1..000000000000
--- a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ntpclient"
-MY_PV="${PV/2./}"
-MY_P="${MY_PN}-${MY_PV/./_}"
-
-DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
-HOMEPAGE="https://github.com/troglobit/sntpd"
-SRC_URI="https://github.com/troglobit/sntpd/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug embedded obsolete +syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_PN}-${MY_PV}-linux-headers-5.2.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug replay)
-		$(use_enable embedded mini)
-		$(use_enable obsolete)
-		$(use_enable !obsolete siocgstamp)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.0-r1.ebuild
index 5edf61d7f025..7736ca2eb8bf 100644
--- a/net-misc/sntpd/sntpd-3.0-r1.ebuild
+++ b/net-misc/sntpd/sntpd-3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="adjtimex systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"