gentoo resync : 05.02.2020

8 files changed, 11 insertions, 183 deletions

diff --git a/net-misc/omnisync/Manifest b/net-misc/omnisync/Manifest
index de9bef48e172..ba96d1e79c16 100644
--- a/net-misc/omnisync/Manifest
+++ b/net-misc/omnisync/Manifest
@@ -1,12 +1,5 @@
-AUX omnisync-1.0-help.patch 806 BLAKE2B 8c82444278b5da9411b8babee5e6690825b800ee279873d3e9bb936f0c0c35d5f701de8b05c4cf6af02af1c961c9d902c80e155e15bb5f9683921188c3515a94 SHA512 f131ef883a9646a093dde18ea2c78cd54d0ba9d9541ed600a03521e595f9100e7df4145488ee3b52e61449b98f3e7bd65251ead8f369595e36f174373c51b690
-AUX omnisync-1.0-maxshm.patch 652 BLAKE2B aeafe8b36d6bf49e426ee1f78514a5f9cafb12f3ef2787d030b076178484a7b96e22f939ce285e0d6ab4c39c50ae12baeca841a5a88f4989e2c5348d52ebff3f SHA512 883c8509357ba00c97e09f4bf96b402999ee1100796c147441f72811f0b475a8d37f05fba7a33d341be759c42c52eee79338da4dfbd65fd0ae246bca13ca4c4b
-AUX omnisync-1.0-openssl11.patch 508 BLAKE2B 36a55e0442b06505331f97fa058f96da36fdaafa6dd8d22b8bacc30d91637d31b17623c5979dee59e9348a611dc0ba3ed3e6658b288c3a91cccb76737b3b7880 SHA512 3c81e044ab0184473a6184706020aa50f899388e5d3ffd52d6777607b1900d1dd362d57c2bf89f7f225a776fbdbdf7683e2183a6bd6a2c54536ba8b6f2f6df29
-AUX omnisync-1.0-statfile.patch 434 BLAKE2B f003723bd48fff0b7c54b3f187744ee90fe1266b7dca85c445004f85e60af86f12427bd81323b0db12ee03f4c417b833cbb3bc7a65d58b89ca21d76ccb1d86a4 SHA512 2e613f85820f1c17c9c6afbb30d2f0607b69d90d2c496dd281b457d5f5658270513b40a72f14b165a2cb29df69c296007ec8039424e5dad227d0aa41b55c189f
 AUX omnisync.confd 970 BLAKE2B a3d678032e7520d359fe078cf4599e98d75a5f3444bb5e1b08ce3cab246424f6d22c153dee45c66417682212adbe0b3c3c9730b41ca36dde5449ce48e8b1a202 SHA512 f3bd6b0eb866eb6650615fd4a838f07afcbb8b9322b12658a855fcca2ec72171b035aeec5a5bd38bb4f4ad14c32647ad14d994df7058d99dbb9d333a309ccfdb
 AUX omnisync.initd 618 BLAKE2B b532cb4f9c0b763ad97d1098e34e8d4a0b14195698f0f6f518de4e25744058cbe5c66ec53a00eb7bffa9191741d78a75ee3029683e13092a3f227d4955cbecec SHA512 f1c116743fde8578a9812553640da3f680911469d8e38b0af007d69aab99038bed651436f7d9dd5ed8dc939fdd3b94a75c93d15b4bda866460b63c7253788941
-DIST omnisync-1.0.tgz 27725 BLAKE2B 00e546e3a04c8483f4a3995207fe6715e25526ca639f517220725c31d50d1c01fe0d15927e11e84143f3b2c8aa80ede1317c818945f0249147548bb03d27f744 SHA512 742ffc0a85bd923b99ae7e4f50a6aaa29107eaa987039e902797c78a9673e914e1fa61b2484c6777f62b0caf8b3110a071fd103c8b18456083883df534a1ef4d
-DIST omnisync-1.0_p20180614.tar.bz2 26335 BLAKE2B fbb6e4d39f16e307b5355c1e25c656bfdd3b280888468e64bed692c52af28b35d813e3e5a19c6dd4c13bfa8c64b62f01826bdb8a4a40f358cc665e5050ccfbf1 SHA512 fd21907574abe9801999efa8dae6e19e80198536cd79a1261cd2c006b7beaa3637f5b9da578659baa9e14eca1756fa41551458f14bad44f9636d76634031f262
-EBUILD omnisync-1.0-r1.ebuild 1237 BLAKE2B bce909126ed1750bf4b74b0b0a544bd7ea656b4e3513ddd8ddd9c663749a02cfddf2b47849958c61f81b76569ee5905fc31f9e6ab2693fdabbc73b91ddbe939c SHA512 e4a7a67856aec95b93e3abe1ee8c30cda147ed0d165a2e8217cc2fc34dd1301a75c1c809acc072c5d0406a6bb069a3dea288e678d5ca66e46a42a5c459237c81
-EBUILD omnisync-1.0.ebuild 1046 BLAKE2B 7f9b71a811ee74684d4fd814e457a38e987fa83ba877632c0bc7e1a3620705cbac1c1373b8d28f27440197854d4631661c97b0ca605a1b90cb9fb3a3ce97d047 SHA512 bbd43bb6e8882385fd203e5bfe62acbd5f104e5eaafbd177bf9a008d37b4cefb6d22624b269385635a3a61dd11cb672a7043ffd576bd63e0211c3afb135e3110
-EBUILD omnisync-1.0_p20180614.ebuild 977 BLAKE2B 351af6508315ee71b27ef79ec655dc63557f1418bca9f9ebe4cdcb1b5e3144399bdb4933d304cb62a6317986b63c347c47749e4528f6c8bb345ef8b5e52ac018 SHA512 38d20c3820aa809fbafed53c42450b45d7d17a16e3374b2832c44130d2e5efde6622105afb24fcb4412de025a574f08dba892044de163502bafc32eb7f7f665f
+DIST omnisync-1.0_p20200130.tar.bz2 26360 BLAKE2B 4b999caf66f63f02241781234c88f8de54b727c9ce116afe77f6cc84e75146b0a748c8ecfe236009ad3704ead46d787cf3c06b556b2ffbecbed37c39322dcdf7 SHA512 b9f66755e990f1ffe2f2524f122581ff397f299f26b4e7d1301e649a1430b2ea814b39b4370621f1281c0b0fdab7aa026d1f827aeb7cfa4993286ad86484a4e8
+EBUILD omnisync-1.0_p20200130.ebuild 954 BLAKE2B afc6ea27a95c2683c265fae95020de122b70e0709a7c3774a134f6e0f812a48bbbb8beda6aec347eb5cf355af48c85bcf7e9184856ca15c16acd66d7a44282fc SHA512 db4ac74350dc37d658bade6fa49f65831d62b694287506ff54d6f2f3e7f14512a73dc3344996641d5063cc003b4e4f889c95f2f7b41319289f2e6cd3f35721e5
 MISC metadata.xml 242 BLAKE2B 8f242b6b14b8f22e005169c7c07b6d685e7c1ad269b4de100c7bca4e148a1f25dda103b7e213309b5509d51d14170498206d9bdb7d766bf986a00eaec55b9480 SHA512 c4931bb9ba45348c61011844649be8a5879b84e48316804989379694c692d96d29794eb38c642d0036ed9e61c4864c605340d6cfa6753519b66b05f26545f0a4
diff --git a/net-misc/omnisync/files/omnisync-1.0-help.patch b/net-misc/omnisync/files/omnisync-1.0-help.patch
deleted file mode 100644
index 47ff5201c030..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-help.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-main: fix help missing newline
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:31:25.720686155 -0700
-@@ -139,7 +139,7 @@
- 	printf("-c x   community (snmp only)\n");
- 	printf("-h x   host to connect to\n");
- 	printf("-u x   ntpd shared memory unit\n");
--	printf("-z x   do an initial step, to speed up syncing, parameter is number of samples");
-+	printf("-z x   do an initial step, to speed up syncing, parameter is number of samples\n");
- 	printf("-S x   write measurements to file x\n");
- 	printf("-n     do NOT submit to NTPd/set clock, query only (use in combination with -v and -f)\n");
- 	printf("-f     do not fork\n");
diff --git a/net-misc/omnisync/files/omnisync-1.0-maxshm.patch b/net-misc/omnisync/files/omnisync-1.0-maxshm.patch
deleted file mode 100644
index 678c6e0072dd..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-maxshm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-main: raise SHM unit limit
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:32:34.630066839 -0700
-@@ -346,8 +346,8 @@
- 				unit_nr = atoi(optarg);
- 				if (unit_nr < 0)
- 					error_exit("-u requires a positive value\n");
--				if (unit_nr > 3)
--					error_exit("NTPd normally supports only 4 shared memory devices, still continuing though\n");
-+				if (unit_nr > 254)
-+					error_exit("NTPd normally supports only 254 shared memory devices\n");
- 				break;
- 
- 			case 'v':
diff --git a/net-misc/omnisync/files/omnisync-1.0-openssl11.patch b/net-misc/omnisync/files/omnisync-1.0-openssl11.patch
deleted file mode 100644
index 8c0d9c243338..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-openssl11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurN a/mssl.c b/mssl.c
---- a/mssl.c	2009-01-02 04:03:20.000000000 -0500
-+++ b/mssl.c	2018-06-01 20:59:26.447052020 -0400
-@@ -136,14 +136,20 @@
- 	if (!bio_err)
- 	{
- 		SSL_library_init();
-+#if OPENSSL_API_COMPAT < 0x10100000L
- 		SSL_load_error_strings();
-+#endif
- 
- 		/* error write context */
- 		bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
- 	}
- 
- 	/* create context */
-+#if OPENSSL_API_COMPAT < 0x10100000L
- 	meth = SSLv23_method();
-+#else
-+	meth = TLS_method();
-+#endif
- 
- 	return SSL_CTX_new(meth);
- }
diff --git a/net-misc/omnisync/files/omnisync-1.0-statfile.patch b/net-misc/omnisync/files/omnisync-1.0-statfile.patch
deleted file mode 100644
index 972316a33bd1..000000000000
--- a/net-misc/omnisync/files/omnisync-1.0-statfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-main: wire up stats_file variable
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' omnisync-1.0.orig/main.c omnisync-1.0/main.c
---- omnisync-1.0.orig/main.c	2009-01-02 01:03:20.000000000 -0800
-+++ omnisync-1.0/main.c	2018-06-01 14:39:22.115229735 -0700
-@@ -358,6 +358,10 @@
- 				version();
- 				return 0;
- 
-+			case 'S':
-+				stats_file = optarg;
-+				break;
-+
- 			default:
- 				help();
- 				return 1;
diff --git a/net-misc/omnisync/omnisync-1.0-r1.ebuild b/net-misc/omnisync/omnisync-1.0-r1.ebuild
deleted file mode 100644
index d82752e6f702..000000000000
--- a/net-misc/omnisync/omnisync-1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
-HOMEPAGE="https://www.vanheusden.com/time/omnisync"
-LICENSE="GPL-2"
-SRC_URI="https://www.vanheusden.com/time/${PN}/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0= net-analyzer/net-snmp:="
-DEPEND="${RDEPEND}"
-DOCS=( readme.txt Changes )
-PATCHES=(
-	"${FILESDIR}"/omnisync-1.0-help.patch
-	"${FILESDIR}"/omnisync-1.0-maxshm.patch
-	"${FILESDIR}"/omnisync-1.0-statfile.patch
-	"${FILESDIR}"/omnisync-1.0-openssl11.patch
-)
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i \
-		-e 's/-O2 -Wall/-Wall/' \
-		-e 's/-lsnmp/-lnetsnmp/' \
-		"${S%/}/Makefile" || die
-	use debug ||  sed -i -e 's/$(DEBUG)//' "${S%/}/Makefile" || die
-}
-
-src_install() {
-	dosbin omnisync
-	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
-	einstalldocs
-}
-
-pkg_postinst() {
-	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
-	if [[ -n "${isConfigured}" ]] ; then
-		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
-	fi
-}
diff --git a/net-misc/omnisync/omnisync-1.0.ebuild b/net-misc/omnisync/omnisync-1.0.ebuild
deleted file mode 100644
index 6c0ff7635dcf..000000000000
--- a/net-misc/omnisync/omnisync-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
-HOMEPAGE="https://www.vanheusden.com/time/omnisync"
-LICENSE="GPL-2"
-SRC_URI="https://www.vanheusden.com/time/${PN}/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0= net-analyzer/net-snmp:="
-DEPEND="${RDEPEND}"
-DOCS=( readme.txt Changes )
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e 's/-O2 -Wall/-Wall/' -e 's/-lsnmp/-lnetsnmp/' "${S%/}/Makefile" || die
-	use debug ||  sed -i -e 's/$(DEBUG)//' "${S%/}/Makefile" || die
-}
-
-src_install() {
-	dosbin omnisync
-	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
-	einstalldocs
-}
-
-pkg_postinst() {
-	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
-	if [[ -n "${isConfigured}" ]] ; then
-		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
-	fi
-}
diff --git a/net-misc/omnisync/omnisync-1.0_p20180614.ebuild b/net-misc/omnisync/omnisync-1.0_p20200130.ebuild
index c074a15980df..c0a9f2f3dae6 100644
--- a/net-misc/omnisync/omnisync-1.0_p20180614.ebuild
+++ b/net-misc/omnisync/omnisync-1.0_p20200130.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils vcs-snapshot
+inherit cmake vcs-snapshot
 
-SNAPSHOT="b3a759af454552f4bbd3b1e097b41bd0d1d7fcf5"
+SNAPSHOT="c55215330b1e8a61af6d34d57d3d8236c8cc7d5b"
 
 DESCRIPTION="A driver for NTPd for people who are firewall-challenged"
 HOMEPAGE="https://www.vanheusden.com/time/omnisync"
@@ -21,15 +21,15 @@ DEPEND="${RDEPEND}"
 DOCS=( readme.txt Changes )
 
 src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR%/}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR%/}/${PN}.confd" ${PN}
+	cmake_src_install
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 	einstalldocs
 }
 
 pkg_postinst() {
-	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT%/}/etc/conf.d/${PN}")
+	local isConfigured=$(grep 'OMNISYNC_MODE=""' "${ROOT}/etc/conf.d/${PN}")
 	if [[ -n "${isConfigured}" ]] ; then
-		elog "Be sure to configure ${PN} in ${ROOT%/}/etc/conf.d before trying to start the service"
+		elog "Be sure to configure ${PN} in ${ROOT}/etc/conf.d before trying to start the service"
 	fi
 }