gentoo resync : 13.06.2020

9 files changed, 12 insertions, 12 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index dee08b6b7568..1f6aac5d15f2 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 83b55f29d16f..66687da09efe 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST cdemu-daemon-3.2.4.tar.bz2 83580 BLAKE2B 56cfde3b9b9a98ba0da629deac717a740b7c92c67195ac282af5337f0e782b555f53221741a59abf3e78faacd066e34a722d08e27cef6fd1082cb75b46eb3ace SHA512 b5dd19a9325773e22c1910ae02f351803fb4f02197eaf5d41a984b4898a5fb0f027c70791d4c25553a9b589273fa3578d3cb12aa7a056f8639b341bd2ab44291
-EBUILD cdemu-daemon-3.2.4.ebuild 1143 BLAKE2B fd7e5a298070b9bf7c85ebbe7465487a8b6e9de057c7575288d1698a7332ee5412366205517762f0764fcf5a5776c89c1703a52357376d9cfd6627fa3018ebd8 SHA512 bb13b2bac89acade309e0ec1436be7f557865a4909c68201c3b95bececfb6395225e43ce9cc93f0ea124ed1a5195e7102304e8dd5f7e016cb2264dbbaa4ebafe
+EBUILD cdemu-daemon-3.2.4.ebuild 1137 BLAKE2B d7f1e6223350898280bd4fc40ea09cb3906b0cc8c5c4f11b999234a13008e3346ea9f40c74bea10dd189b6e71d9c6a8370df286cd406c6671ad2849e3fff7cd5 SHA512 8db90ffaae996a013b7977eb6ff7c35502cc4a76776028c657b9d64968a59e50348624d971b9e5683273a4c12892ae01ea1b2659d67e41bdc83baf44336c58f9
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
index 3ba55a0e6828..f41b381ac9fc 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
 HOMEPAGE="https://cdemu.sourceforge.io"
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 82bec7bc5c69..fc7b1240185d 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,3 +1,3 @@
 DIST cdemu-client-3.2.4.tar.bz2 44284 BLAKE2B c57fe09bef7112933a93fac9944eaff957e01692ec1ddec7fd443aa780f8b3d85d0bd640611337d896843de3ab00d09e093c293776a52afa85f781bdde7f4250 SHA512 2e10cb345e261ddaa6da68ee626770ed65749b1ea64c2bbbf0f3a2e96184c2906834886754e87e3161c3056473e5ee0dc20672ce7cb48232e6bef1c93cb80550
-EBUILD cdemu-3.2.4.ebuild 1168 BLAKE2B 4b200f6ff6b6eb25924e76462612ef4b82b91b4606ac47769596945bffcba8c40cd6afcb4e85a83fdcc24dc9f246e8824a4fa66a934870aae3661d63d2eddfb9 SHA512 7cd167c09177d565ef7539b7fcdc7829c5940206b0db2e3b2b962b9e6198b6a1c7fc87d7678ae2fb3ef3d0870739994a887dbe0e7d2cbb537f301f353392be39
+EBUILD cdemu-3.2.4.ebuild 1150 BLAKE2B e07d1b3de0bc02f1613a8bfeb988746574e192c913cb32584a4e690aeaf7cf6fcfd35c1c359c51db64a9910baa0c011449769c8c4e7d3108318529b92d03f4bc SHA512 3dce40e08b8a06ab99ca6e61876a9ce1502976a337c0b584807e8efaf2ff3906f218c99c296126e54f4b9034210f5dbbe588b86d3488eaa677950ed18546f8c5
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.4.ebuild b/app-cdr/cdemu/cdemu-3.2.4.ebuild
index c87cdfd9eaf4..736cf3013c5d 100644
--- a/app-cdr/cdemu/cdemu-3.2.4.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
+inherit bash-completion-r1 cmake python-single-r1 xdg-utils
 
 MY_P=cdemu-client-${PV}
 DESCRIPTION="Command-line tool for controlling cdemu-daemon"
@@ -33,7 +33,7 @@ BDEPEND="${PYTHON_DEPS}
 DOCS=( AUTHORS README )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	python_fix_shebang src/cdemu
 }
@@ -43,7 +43,7 @@ src_configure() {
 		-DPOST_INSTALL_HOOKS=OFF
 		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index b3923d2f84fb..80b57a861100 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8308 BLAKE2B deb5469cd79d539703609068c95d41d2b1178f9f1b3985d2179a60cde90f116db510e52bb8d5fde6a0371f21b64bdadc12dae2fbe29125655236cfc1acc0ba21 SHA512 e95af68eec20cd28b3bdf24489cce215873bd6f8af75d2d8e2aa6de6a4e34997b26c2d72b2d887bee08950d6e53e9ece57334e226026dcc3b4e513a81275994f
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8307 BLAKE2B 35c32ab7c59c207bf765e92852abd47b1105c58cb685ea83d6b3386581444e5fc82bd4df0216ca0b2649ad0fe9678328e6044172f3214876d08da0a9ce8afd40 SHA512 f32a7ba66e461fd100c2769b34a418b389b7237a36899d3b48fa1ea27f6482f641f621ef05016b857845b8ed35748fec982b729cc9dbc391de2ab445ddc97a22
 EBUILD cdrtools-3.02_alpha09.ebuild 8238 BLAKE2B 7bb73807895571dee4c7322a86ded1540ed2446f9be36fe72039a259b88c048a7f03725aa146c7977c69dd132aa143fb30cb9ef92e185e1bb475b902e6c14af3 SHA512 2547caf73df8bfa14b25e144d49208e53c771acbb0a23ce87e8d1c249e16a3cb2fd73babedcf4c3cfd5f0a8f180343de22fb6ac71780dee9f1040e0c6ca607e6
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 81cea1746aaf..8fee8c3e8912 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 57d7ffbbe9dd..d2bacf749481 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,3 +1,3 @@
 DIST gcdemu-3.2.4.tar.bz2 52209 BLAKE2B 620b1ea8616cf0d7f80954dd00ad1442b55fedafc5ff27ad5aa917e69a803a9629ccadb33ec3fdb2371c464bd484a15e85e00036dee5a67283fbf7e8d64e252c SHA512 920ab87a0b200f3f3983ff878871265084787f1468c042352c319ff3a37131547cc1e981801eefaee1e419ec306b026f7a18da165a17e3ddc6a92998a42e7b41
-EBUILD gcdemu-3.2.4.ebuild 1203 BLAKE2B 0a07dfa62d3f772e0de893aa9364e4cf461296c52d821a7d3d5e166988de08245c101fcef0f50a487a4d691665003de638a523a212106993f217c8ae5aff7da3 SHA512 581d0e50d2a723665feb4544325017a21922b86f0877aca6b24712f1957cda014ad73369d00f83544a71c9a2fdf9741be49f2970c9c8f5f3e7bc0d0cceaa2f92
+EBUILD gcdemu-3.2.4.ebuild 1185 BLAKE2B 5e45c0589d1fade9e918265b61bf4562ca079617943b497e2d9dd2295009ace8e59f5bb63d5dad8f83845614673d3cfa866d13d3313bba8420a22004a8489d53 SHA512 a67e08bd9a39d65b2b1f8abd6116f8b43a327a812b491f266a583d1fa95a8307bb21569bd5d1dc4c81acf8a30f13c4309ebaad8401c0fd65670c03f61f038aaf
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild b/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
index 650abe4c268d..6fb6905ac224 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
 HOMEPAGE="https://cdemu.sourceforge.io"
@@ -36,13 +36,13 @@ BDEPEND="${PYTHON_DEPS}
 DOCS=( AUTHORS README )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	python_fix_shebang src/gcdemu
 }
 
 src_configure() {
 	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {