gentoo Easter resync : 12.04.2020

4 files changed, 19 insertions, 29 deletions

diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 20c0814222ba..ba50f75ed294 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,5 +1,5 @@
-DIST resolv_wrapper-1.1.4.tar.gz 33288 BLAKE2B 1e6ee070e2766bae9d6c9007c1bedc60ad550d33d2e785ef98ea81ab0f9034a0be056a76d56790f7d3c1c400c9b00cab37a37fb78ed99a8b2a4bfe30795b1ca7 SHA512 da7eb897d3964015b2bb6f7c1ba6483020c70e2d64c5e13b6c095f9e57dccf5b035d04e41c38953fa0eb260e83d7e23f6af32c0d8186553bae8d7b741c46c5ba
 DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
-EBUILD resolv_wrapper-1.1.4.ebuild 678 BLAKE2B ef1f99d669fab1a4c63e9b32746e2ed5d790ee8fae2ff92253752a1e63b5e91cdb263d529d90382c7e07f14c2a724fd565ea151a5ff97d62dc931f9795d7f17b SHA512 301cae2529400f6826726e11b3f74c9fdc72e5ea68bf944dba3d6dc3cb7c5c64a269e6be047d2c6aadf5e8e3c9eb8be9366365fa6ae510129c87ac1eb495af27
-EBUILD resolv_wrapper-1.1.5.ebuild 714 BLAKE2B 6185a87b932e3817c2db63035d464e3f212c320f27af55cf53ca416065fc3a517d017f5e6050dfbe43577622f2b0cde650f4fb2f866cb021cd59255d8caa4d11 SHA512 79677bb62b2a4edaf77332f6492aa23dc6433f4edad1c0e513bbe6401fe5f90df3690571399baa0dcfd533a2e979f6799f07e3b0e9066fd89c41534f02009309
-MISC metadata.xml 360 BLAKE2B 3c45284477381a60df338afbc4293cc20c47223eca1b4669b3f310ccb80cb0b81d534d9fbfdac8357b43507340e5f61e959c03e39e5a3deba0430e4f15aa740c SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2
+DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107c53275430b3f5e1e46204265af3501394f72b6119e98ad3382e48f9a8f2511e679b3f4093446beaa11095bfaed340ce SHA512 cc379124c6104ba1330dfc038f04f9b473b71ac81b18889e481fb7812b38e71040ca6bed7bffd6eeaf77abeb8452a4d3308514ec6380811327dc832aa0381be8
+EBUILD resolv_wrapper-1.1.5.ebuild 657 BLAKE2B 909507585dfea902627521d326e76368a40dbe8e3d3b40f78fb4902b5cde67a4f50fad9d5d169a71e6437968bdc7e479e64f024c25c987aa9375c311a8b14b22 SHA512 14db7048addb5a6b7331c629acac97852fc1939501142359b4e9b0942bef1b0897adcc85c794c43de6f0c3947cdb476d745abba8b6439199f068af1aa522c7e1
+EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
+MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/metadata.xml b/net-dns/resolv_wrapper/metadata.xml
index f05d1f266834..48f6ca46f45a 100644
--- a/net-dns/resolv_wrapper/metadata.xml
+++ b/net-dns/resolv_wrapper/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>samba@gentoo.org</email>
-    <name>Samba</name>
+    <name>Samba Team</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
index ba89b7e9fb90..3fa4778a53d0 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.5.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper for DNS name resolving or DNS faking"
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
 HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 # Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
 # Because of this we cannot use cmake-multilib_src_configure() here.
 multilib_src_configure() {
 	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
index 46ba959b819d..98ba5d7cdd3d 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.4.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.6.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-DESCRIPTION="A wrapper for DNS name resolving or DNS faking"
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
 HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
 SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
 # Because of this we cannot use cmake-multilib_src_configure() here.
 multilib_src_configure() {
 	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
-	cmake-utils_src_configure
+	cmake_src_configure
 }