gentoo resync : 22.12.2021

3 files changed, 2 insertions, 52 deletions

diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index fcb6c60c7118..040b0128b885 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,3 @@
-DIST netopeer2-2.0.30.tar.gz 382529 BLAKE2B e17bc4eceb07b91347aac4e5167d7a92bfd7bfde77a79f27b6531f4ad0c77fc42e9281ed156b017969171dbb9f25e2570e9b2db1a85af9da896d5f39bd902555 SHA512 f0ec1b1e469b5a39ec4ae9533bc0cea6391068502defba3e3f25b154a573d37c030283b4483e27a11e8e372f580110af7df7279c6e1be3a2fec249a6b79c3d95
 DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d
-EBUILD netopeer2-2.0.30.ebuild 977 BLAKE2B 6315256db0e18386ed77668700ef2660439ad4d6112ef022799f98b6a5530645421e6156fc47a0db6d78bfe69623494ad058cfbddcff1c91473749550c3db045 SHA512 c821d498f878d4c590831c192d7a1ed14d9523128b5a7da488a918bf0539f6291056efd68ad05a1d1c42c27640387afe8fa7a32c7a4fbf389d002803b62e3d46
-EBUILD netopeer2-2.0.35.ebuild 980 BLAKE2B ac544c4217587fd87d8702b528a629841ccc02fe19ccb64720f2175a6c17172e5cef9e042866a825ddfb085c62a2ded85ae959fe80c7b4b1474c66d3930537dc SHA512 84c0edd43fa9fb09d7323ef750845012f9509294eb35a2dd8c08ab56e37cfec7e4064879d348b37f4dea6ecc8e03415f2043f28aa716e59436d1f583d8591021
+EBUILD netopeer2-2.0.35.ebuild 978 BLAKE2B d219cc8f2ae80831cb16e00047db60eebf156b0b8ec96dcf1f2c52d3400f482a2b535c5811c6f21257ba3a36268cd88d393187825ffce046603f641a1a391b1c SHA512 bb60a9b22620bdf5618f7635d56fdfe5bc481d761e1a679dd855e452b6d914583c319d20c0dae539df9c718981959547da8a370c08930ab70c61e1abeee9b4cf
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.0.30.ebuild b/net-misc/netopeer2/netopeer2-2.0.30.ebuild
deleted file mode 100644
index e47eeecc25b5..000000000000
--- a/net-misc/netopeer2/netopeer2-2.0.30.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Server for implementing NETCONF configuration management"
-HOMEPAGE="https://github.com/CESNET/netopeer2"
-SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-misc/curl:=
-	>=net-misc/sysrepo-2.0.47:=
-	>=net-libs/libnetconf2-2.0.19:=
-	net-libs/libssh:=
-	>=net-libs/libyang-2.0.97:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGENERATE_HOSTKEY=OFF
-		-DINSTALL_MODULES=OFF
-		-DMERGE_LISTEN_CONFIG=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_VALGRIND_TESTS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/netopeer2
-	doins -r scripts/.
-}
-
-pkg_postinst() {
-	elog "In order to do initial server setup please"
-	elog "run setup scripts located in /etc/netopeer2"
-}
diff --git a/net-misc/netopeer2/netopeer2-2.0.35.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
index 04f0cbece36f..f4ad0b6b6641 100644
--- a/net-misc/netopeer2/netopeer2-2.0.35.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/openssl:=