gentoo resync : 25.11.2020

4 files changed, 10 insertions, 79 deletions

diff --git a/app-misc/vcontrold/Manifest b/app-misc/vcontrold/Manifest
index 55ede4aa8220..6f982203383c 100644
--- a/app-misc/vcontrold/Manifest
+++ b/app-misc/vcontrold/Manifest
@@ -1,9 +1,6 @@
-AUX man_generation.patch 1033 BLAKE2B 431deaaf6b7e48e975ac8c7bcee7bd144d610cd4e8bc2d7c472e26ac440f5a0c0b793026258ec75662eb6834e9542b0ca15f68c7619da9b6b9bf5e48da8baedd SHA512 67456107d42db0a2b584f3600c68ab9ba787b292198da0c69926c6b627b7f58b80b958513a3cfe537d8bc65fc03c3352b43886d433b6f06cc51bad24eb0da610
 AUX vcontrold 157 BLAKE2B c8d08ae44343850d95e9b99626690a2f79403bb9bafef9ea6125376623c617c4fc1523beb4be4d3cfa50d67c3a7ef84e4b3042afcaf8211ea0276d4e519cd713 SHA512 10583cff05a3099d06ec13cd35711c93dece72de1ba05a2026d85b31cb6279136cbbffa00bcc162cba841232d2f8fe2babda463bdadb6b4f3e1f39ce95562401
-DIST vcontrold-0.98.5.tar.gz 86684 BLAKE2B 07ed2c932b9f1c03410cbd6c23cfbfb7bf1aeaff027f597fb6f05a6b61c647f229a75b5a87d893a66c6b8e917595083d193c5da8585c6b9546d12c5867ca1a1b SHA512 b94dbb09ffe274e0a0a0ac4948365ed3213f221dbc00ed2b2adec2ac5a632e293686d62a07575454b3d11b1b8e4e058625a067461996dd720c2f84066d57e60e
-DIST vcontrold-0.98.6.tar.gz 86999 BLAKE2B bb2933c166793a851fc9b3292cdf00228e0f5383ab6cfce66150383103e7c6b54661ef8c7f0bb177aecedef9f7ca7d3e64a20c1af106d45a6c5a1f2a32bdd971 SHA512 74c17dc83af456e9fbece44a00d775d6e474b1de76993da69f5cb897658be13a83ef2abc3fe75f571f1d52120e2ddade08079336a338af81eae8557b3b357481
+DIST vcontrold-0.98.10.tar.gz 87721 BLAKE2B 06111f534d137d08f0a66b00f1238dd04856c3a7dbe630baeed89667de2840cfa6d9227a899b3ce4819accccd8d2228ef7e31e9562e1bb21027a3ddd2fe2b148 SHA512 4e65c23edd2542323a2815154544c2a4376c35a49a52168d6a3a08dba68f462dbd9c0c43020f86a4cb6c4eb7736b5d9460c2e4e2a67c015e2e51841338547c55
 DIST vcontrold-0.98.8.tar.gz 87831 BLAKE2B cb6ac6771e087e355f909c63be480caf974632a2fc6378f6c7c461d2cd5d6f12fc0fc762a925d05af4f0ccc9252320009c3f8eee33cc026b5621ec8bcb531b72 SHA512 a3452735bc78ba4add991c03c263c1e59ae6ebfc4eb41f27136bd76c01745990b956dea17b489c6d4f088ec0d69d6f6215f2377baf78ee485e0b31642d4ae468
-EBUILD vcontrold-0.98.5.ebuild 906 BLAKE2B ede2a31302a852636266f97069eae207937bc630fa16db5f982ff676c453b1c2da0dfbf8d023197ebd4132f4a55ed16b8fa5bc6659d0cfe0ee7b9898416028f9 SHA512 cb627f085e3d3b9d0cce3c48a4e5e2f1e115c699414da293ff81783689fb7111e0f13d145901616cdd98526d7610a67fab72e0e9a051e07879e4b8371d77bd47
-EBUILD vcontrold-0.98.6.ebuild 950 BLAKE2B e8ec145ef75d4ff2d41fdcbd68e5d2f7ad541a84343cef2c3e8cd18d2830df3d5e08815b392990dfa901fa2bd3cf0a554a5d79e1721eda43a251f9cf9832ce84 SHA512 c22d888251d4f7c0e336436758c57c7d8da4e258af9c940c07819b864ebe5105af4903fd316cf33f733bab7a86a4f5eeaa1188652ebf82b0fe82bdbb11f24ec2
+EBUILD vcontrold-0.98.10.ebuild 882 BLAKE2B febf481c4f796ed0058fd4cee3f938d2633f5ae86dc47b1fc2dd603c40d13fde1107abd0cff0e865b5702a01a2df2b1f1f5435c2242bd9cb8ad3219d5f32cf68 SHA512 b958adf4ca63c46fa77fd1dbf700a25b569bb3eb9b90b888780af43adf4382b959deecdb3ab8f08b0a8d3831ab139ca63d6c43080942e3e821806fba4f80a4a5
 EBUILD vcontrold-0.98.8.ebuild 882 BLAKE2B aaafe640329cfab43417cdd6b28b442a886e91e26cc5eb7cf377bc0a46008acf386d1487655ecafdbd703b4a0a859a4875878f90118a97932a270156e76b7490 SHA512 b3b5cf307f36daa5f4cc07e0499bc3ea065ea638cdea0b3a2bc969ecdea847a4f1d35a670230d9048cafd2d4362461a34474d26eb91bb0a7b6d132b2d97aad38
 MISC metadata.xml 910 BLAKE2B eb06d0c4ca09ba13dc5ec335afc9da950429c650c05289608c90f91e0b7d550f97f6833752a8e71101fad25d2600dd24c522f9747ddad20c958b31c790769d36 SHA512 9eeeb42e54cff821d986407940d3a8e434ba3126708eef45f3234bbd8519dc7fd564f5bd6767d249370a796e7ed13d934b52b309305b4bcc03401c63a68a3d64
diff --git a/app-misc/vcontrold/files/man_generation.patch b/app-misc/vcontrold/files/man_generation.patch
deleted file mode 100644
index 81b8941d00a6..000000000000
--- a/app-misc/vcontrold/files/man_generation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
-index 65024b3..c3e3211 100644
---- a/doc/man/CMakeLists.txt
-+++ b/doc/man/CMakeLists.txt
-@@ -14,14 +14,13 @@ if(VSIM)
- endif(VSIM)
- 
- foreach(MANUAL IN LISTS MANUALS)
--    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1.gz)
-+    set(MANPAGE_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANUAL}.1)
-     set(MANPAGE_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${MANUAL}.rst)
-     add_custom_command(OUTPUT ${MANPAGE_OUTPUT}
--        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} | gzip > ${MANPAGE_OUTPUT}
-+        COMMAND ${RST2MAN} ${RST2MAN_OPTS} ${MANPAGE_SOURCE} ${MANPAGE_OUTPUT}
-         DEPENDS ${MANPAGE_SOURCE}
--        BYPRODUCTS ${MANPAGE_OUTPUT}
-         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1.gz"
-+        COMMENT "Converting ${MANUAL}.rst from ReStructuredText into manpage ${MANUAL}.1"
-         VERBATIM
-     )
-     list(APPEND MANPAGES_LIST ${MANPAGE_OUTPUT})
diff --git a/app-misc/vcontrold/vcontrold-0.98.5.ebuild b/app-misc/vcontrold/vcontrold-0.98.10.ebuild
index e5b4f78672d4..87e6097f057d 100644
--- a/app-misc/vcontrold/vcontrold-0.98.5.ebuild
+++ b/app-misc/vcontrold/vcontrold-0.98.10.ebuild
@@ -1,20 +1,20 @@
-# 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
+inherit cmake
 
 DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
 HOMEPAGE="https://github.com/openv/vcontrold/"
 SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+man +vclient vsim"
 
-RDEPEND="dev-libs/libxml2"
+RDEPEND="dev-libs/libxml2:2"
 DEPEND="${RDEPEND}
 	man? ( dev-python/docutils )"
 
@@ -22,7 +22,7 @@ src_prepare() {
 	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
 		> "src/version.h" || die "Setting version failed"
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -32,11 +32,11 @@ src_configure() {
 		-DVSIM="$(usex vsim)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	doinitd "${FILESDIR}/vcontrold"
 	insinto /etc/vcontrold/
 	doins -r xml
diff --git a/app-misc/vcontrold/vcontrold-0.98.6.ebuild b/app-misc/vcontrold/vcontrold-0.98.6.ebuild
deleted file mode 100644
index cd6ff144ee01..000000000000
--- a/app-misc/vcontrold/vcontrold-0.98.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
-HOMEPAGE="https://github.com/openv/vcontrold/"
-SRC_URI="https://github.com/openv/vcontrold/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+man +vclient vsim"
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	man? ( dev-python/docutils )"
-
-src_prepare() {
-	sed "s/@VERSION@/${PV}/" "src/version.h.in" \
-		> "src/version.h" || die "Setting version failed"
-	eapply "${FILESDIR}"/man_generation.patch
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANPAGES="$(usex man)"
-		-DVCLIENT="$(usex vclient)"
-		-DVSIM="$(usex vsim)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doinitd "${FILESDIR}/vcontrold"
-	insinto /etc/vcontrold/
-	doins -r xml
-}