gentoo resync : 20.01.2020

24 files changed, 66 insertions, 225 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 603e5705b513..80014dffc077 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 3c5333e3a007..40023235994c 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.3.tar.gz 499054562 BLAKE2B 5655d39a573915431d296e5cc0a0aee1e0aaa95878e885b578a961b53b001ff8327338cf7e8e9a6eb71d758336cb8d71f7b21d94b4aa72504cc8f73df274dee6 SHA512 9d16ae4e2219d5cecb165934a8c378df2125ae6b14f924d04cad6776b985e19ea1957d1fb15e1c75d078eac56b47eaed2dfed02efedbf0d5ff649bab519ecc1c
-EBUILD clion-2019.3.ebuild 2157 BLAKE2B 61cd0f6a6b4fef3bfefc5f1bdf6519de01ad330d671952d84c4c5227b320bed5a233ba5c8bd6c5bc89c48ae7084b16443f2ebd41e2c7664e87ec1709b599fb76 SHA512 f87202235ccf691733d08ddd347b82b942c517630415a75f7ba47632dbaadc3db98f4624b8a849353aa45fca1023c8a5a3a91b596981bce6820e6433db864fc2
+DIST clion-2019.3.2.tar.gz 504918530 BLAKE2B fd209977752f2e97c42113d082f0e57de0a4c73c3f18d29ba00872f19f753843c719abc96e1e7c1ba2d8afdfd724ef929e803d1ec009019ee9bef735347ae8a0 SHA512 def10008f685c5bac523c2a15920b41482f4877cdfcc26f3aac2dfdfe2cf0e23ebff236750d4f1b04f0076ec6967c127abaf61f0cb1da5a51d873fd0cd029f2a
+EBUILD clion-2019.3.2.ebuild 2157 BLAKE2B a056873673bf62fc31178fa9e4cd36eeae012a4fd556048e80c433ff3f82952f1dd96dbaa21bcd1970fb049b9feb511068deb4dec978627babb1e81e6cae57d5 SHA512 aed58628024651ce9a4efe1c072d1da249a0614fa94553d4ea3f3155efb47792b5b5e31855cf75c6778ec17fd84b45378f0b16ba8bf3972a120163f357fdc5de
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.3.ebuild b/dev-util/clion/clion-2019.3.2.ebuild
index e207a118618f..85f96b2ea6bd 100644
--- a/dev-util/clion/clion-2019.3.ebuild
+++ b/dev-util/clion/clion-2019.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index e90434fde403..e5a5f75e711f 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -2,9 +2,8 @@ AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-EBUILD codeblocks-17.12-r1.ebuild 2158 BLAKE2B 7a7aa1b17655b4727a1a105dc4c13c2bab3332ce0db027d5417f214f608976e1c17ced1d5374c1055e1ffceb8700f92d2444ee8317c5c34be3324947e815dfb7 SHA512 a71101d41db629227d75a12c9e6802c8329e7c895e14ce3e0c5aac3b780cf2eabd12a1209b7fa3fb424f600c8812bb50c622aa478a27aedc2a4049b58f6549c3
 EBUILD codeblocks-17.12-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7
 EBUILD codeblocks-17.12-r301.ebuild 2158 BLAKE2B 88352118a259383659f4c9f2cfd820db719fc375a7615f69e5c5f1f5dd870057dde05c8c91908d0ecb2b87a60ce4e850d6bb79336ffca859d528d7c73f74526c SHA512 13336eac42465cb51e05fa81c1732408d429a758032c86909130980b1684304926fd3fd8860b17c9c9fca3c26481279350d77a9bb8c8aac0d68eb42342e36270
-EBUILD codeblocks-17.12.ebuild 1999 BLAKE2B dc09e29a6d21d530388de93ee093ae50da7406a45fba83a021be19f3fbe7ef587bf039b7a9f380d8edf7ff0ffbd4fc3ab09117837978de687bd7b34476478cc7 SHA512 d331f33150e3054fed50b18c78e105fa76e73022a220a8cabd651e63e076fceff80ef1d3997d112f327f8252b1088f3cb3f5c7240d8609dbcc028f9c83c5cacd
-EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2
+EBUILD codeblocks-17.12-r302.ebuild 2075 BLAKE2B 268d201e8c4d8327c25031ca436617b15f25dd66d75b19a2b0e7e835c1cddf41944425629909d5307a68b128661cae9773e4af8835dac98fc211bb301cd5ee69 SHA512 9cb65efb26c46b96b9b8f4b48d9947c329380634d47650f6fad5b206b3574272bc720adc4a7ffb83cdc26bc2f65328b716fe9542e8cd4e5578cdc625e361f2c1
+EBUILD codeblocks-9999.ebuild 1598 BLAKE2B f2780d052fd517a2363e2d0866ed381a8eadb81d425f9337384ef4af69bf36855da1642e3628a47884c41ef35451a7f7d21ea8987b80030b73836df30384d829 SHA512 0d0b54fc9e42534c3d55a30a06b105597f1baef9613dd7df1ba23d0ace30ee4000994916b3bf2789ba10a527376e89b1184840c709f720b2a0d1033441312c24
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
index 07ab74227eac..e7e1bf808573 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r1.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.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
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
@@ -23,7 +23,11 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x
 
 IUSE="contrib debug fortran pch"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.0.1-r1:0=
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
 		app-admin/gamin
@@ -31,10 +35,7 @@ RDEPEND="app-arch/zip
 		dev-libs/boost:=
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.0.1-r1:0=
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
@@ -44,7 +45,7 @@ PATCHES=(
 src_prepare() {
 	default
 	if has_version ">=dev-util/astyle-3.1" ; then
-		epatch "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+		eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
 	fi
 	eautoreconf
 }
@@ -67,18 +68,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
+	elog "The Symbols Browser is disabled due to it causing crashes."
+	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
diff --git a/dev-util/codeblocks/codeblocks-17.12.ebuild b/dev-util/codeblocks/codeblocks-17.12.ebuild
deleted file mode 100644
index c83617929435..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# USE="contrib -fortran" setup:
-	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
-	# USE="contrib fortran" setup:
-	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
-	# USE="-contrib fortran" setup:
-	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
-
-	econf \
-		--with-wx-config="${WX_CONFIG}" \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 1763fdfc0789..5350bd29d7cc 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.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
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
@@ -14,10 +14,15 @@ SLOT="0"
 KEYWORDS=""
 SRC_URI=""
 ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}/code/trunk"
+ESVN_FETCH_CMD="svn checkout --ignore-externals"
 
 IUSE="contrib debug pch"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
 		app-admin/gamin
@@ -25,10 +30,7 @@ RDEPEND="app-arch/zip
 		dev-libs/boost:=
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.1-r2:0/3.1
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/codeblocks-17.12-nodebug.diff )
 
@@ -53,18 +55,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
+	elog "The Symbols Browser is disabled due to it causing crashes."
+	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index e866c26a1ad0..6e33f874fe92 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -3,7 +3,7 @@ AUX edb-debugger-1.0.0-man1.patch 814 BLAKE2B d4c9540e0ec31b3a18d36126f92ebf850d
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
 DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
 EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
-EBUILD edb-debugger-1.0.0-r3.ebuild 1168 BLAKE2B af6bd89216181d5a7130bf0967483feac79fc5f63b0b446584405e61515fb89c13ada298bb6fd0e1a079e099c08ee0cdd31d657896496d282b9b01c391e6490e SHA512 b33c9ec836553ebca21238a27cba961480cac68a6981431c00bf2c7e18e19d17b712bf4ed7dde401947f4210be0a89f1cc9efb45a7761c29a0d483b7e108830f
-EBUILD edb-debugger-1.1.0-r1.ebuild 1138 BLAKE2B b6172c3cd112dac42ecdc0159b4145c61637e34c0568a79e3ee72a4529cdf1842f11290d9b0ce60d41cf3236878de269e44f693815d53e5c19807d1aa8f58940 SHA512 03ccd279aa5ecbc2f32f9a2f9c722c593e7383f7aedad1d4675007bd7f1e00492601b82b032eeb0ac1c0e277111a80f062933f2ca23a199a2262178a609e9cd6
-EBUILD edb-debugger-9999.ebuild 950 BLAKE2B d083ce5fcbe33aa971241c0a1e0f5f24c9bb12475bc848e4c52bd89e6cd66686d1d1d077da10ef8101d1b2fa070af2065037d3dbf254747e26c53bab4f56866f SHA512 235343deaa24f1f978a29fba6a031c4ec7eb31ac0249bbce83468d244862940c9ee7edc67da76174c8a44773ce33266c9105063e9fac72904f4b1f584baaec04
+EBUILD edb-debugger-1.0.0-r3.ebuild 1156 BLAKE2B 02b178048945f5865337f6056faf83bb1180900ca1027a876eb3dd2e73f4308c25963df327da4ed35c7e78dc9e0385f4012ca5c69fea89164b184d5b41ef26e0 SHA512 fb10c5ca35eec58f0202db85988ff5331553bbd209492efe06274dfa41f506a1bf8f8c1bb4b8e12ed657d599254b4eab812c9707157badeaba46f1520591d7eb
+EBUILD edb-debugger-1.1.0-r1.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
+EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
index c5dadbd7bf7f..bb8d77db7914 100644
--- a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -47,5 +47,5 @@ src_prepare() {
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
index 12fcafb7f2c3..21c906d48591 100644
--- a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -45,5 +45,5 @@ src_prepare() {
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index b6517f3c57f3..6ff5cb3e1c08 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -38,12 +38,12 @@ src_prepare() {
 	if ! use graphviz; then
 		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_JUMBO=$(usex jumbo-build)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index feba071ed2d3..480e18ee125c 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,5 @@
 DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
 DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
 EBUILD gource-0.49.ebuild 1067 BLAKE2B 239950d5088a2a7d8901b60b1b5514a27aae8b4065a1ed6db44d123236bc1bccdf200ed6d3371b331702cf49032aeb162e201d29febc3d552f991034e45efad3 SHA512 f8511d169bb3db902d7bd9f0aa4c0a33cae3d92123a234d516b0ce03044217cdd846241bc979151c683282c9f457eaeb5daf011d283592114135e2a117a5e8f4
-EBUILD gource-0.51.ebuild 1075 BLAKE2B ce94c79fa5fdfabd9a15febdc0582a45ee960b4ee080f218eb49102a887775b87ab22c8b5e994b6ff980e6168fb9beedf71e8487dc12891160ec66c84ed225ac SHA512 6d51fbe38fe6d807c48fd760f8b59ed3cefb286a9c56b5e08ee3b948bb9ba82aa5591be2f25237c4473acf5304fd215dd0e2c268c9f1177b911a4592dc8f58b5
+EBUILD gource-0.51.ebuild 1074 BLAKE2B 7f2c188a6a3ea4592021f4c0c0e2828041271648a6f1fc76b5aa3a3bc4093400b42b33131e3cec485bbaa5d259e42aa37ea97febf4cefe4fb3271f6750c19d47 SHA512 130c0c2a77a2503e7450e271f82e420ed9a087fa313bcec439fa8f1224d9ba1abba93038bc7e25f3d284d15b59eef9b0bdc910adb0722056a1842b6be5674060
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.51.ebuild b/dev-util/gource/gource-0.51.ebuild
index a1e9aa52d6f9..384186f7e6ea 100644
--- a/dev-util/gource/gource-0.51.ebuild
+++ b/dev-util/gource/gource-0.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index e73ed91305ca..9508d43d1800 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,4 +1,4 @@
 DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
-EBUILD kdstatemachineeditor-1.2.4.ebuild 1085 BLAKE2B c50819313349caaf69cfbdf49b3a52849043e5daee3c10b9fd7d50d9f6306e48af55170985496b605064ed284242b173d0ab42d9f1283e319d1f722a92912d91 SHA512 38d45cf2ad3237b770d6e13920d5b57f2e8d6b2b60d59e346ccbdfcb4ed7c9e84610df79c86bfcf1f8d888a3458a032dc4cc4d1c57e38eac022ae4e581cd31bc
-EBUILD kdstatemachineeditor-9999.ebuild 1085 BLAKE2B c50819313349caaf69cfbdf49b3a52849043e5daee3c10b9fd7d50d9f6306e48af55170985496b605064ed284242b173d0ab42d9f1283e319d1f722a92912d91 SHA512 38d45cf2ad3237b770d6e13920d5b57f2e8d6b2b60d59e346ccbdfcb4ed7c9e84610df79c86bfcf1f8d888a3458a032dc4cc4d1c57e38eac022ae4e581cd31bc
+EBUILD kdstatemachineeditor-1.2.4.ebuild 1073 BLAKE2B 77d5e60e69d688b7613178530033ab30cf8d92b5cc9b69563bf7ed3bb6ffdc8deb4fbe908f7c807fbc79cfef18f8fa41d851ec00fc06c062f033a13683de591d SHA512 ab0398fa23b8ab6f7821f77eead782b75192fe0e469e51020458633cfa38c2e2dd470481c22cb4bf24c83273f4c371e8cdbb403810b700c69401d453afd6fd9e
+EBUILD kdstatemachineeditor-9999.ebuild 1073 BLAKE2B 77d5e60e69d688b7613178530033ab30cf8d92b5cc9b69563bf7ed3bb6ffdc8deb4fbe908f7c807fbc79cfef18f8fa41d851ec00fc06c062f033a13683de591d SHA512 ab0398fa23b8ab6f7821f77eead782b75192fe0e469e51020458633cfa38c2e2dd470481c22cb4bf24c83273f4c371e8cdbb403810b700c69401d453afd6fd9e
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index b8d2337eeb5e..f430b5be2790 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index b8d2337eeb5e..f430b5be2790 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 7a3aa987bd1f..467896576bc6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,9 +1,7 @@
 AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
-DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.0.tar.gz 1548138 BLAKE2B 42340645f3417930856e05da9b479e9352e1fe3ea567929215f433a04fe3b0216d6de8693428be058048d2bd9c8d21031b19d0d5599a99e8f61aa9b6da689bf7 SHA512 e79a093aba5df137d463ac1334199833b8374689b2aba1cfd935fc484fff524d84bf6c2b3fcd9371b67daade0e18d1fe5e47dccdb7cf416932e86b83f49fec73
-EBUILD meson-0.51.2.ebuild 1913 BLAKE2B 8b3ff8f9a249c018a67dbf3a37954ce9b0dab5876e5f06a8066384958f55ef1037f2823b186334478237b450343e06bfdaa1672704c281355e008362807ecbe8 SHA512 6623c39876b25df3bd72b29d8a2512e12f0dad2791aedd6bbdbec32b6553ccce50b4aeb3b7400cd3437f778e6c3ede8935537851b1ca78e2277c70d9785779e4
-EBUILD meson-0.52.1.ebuild 2056 BLAKE2B 97daa03333835f4d5ef3920de9ba23f4ec7e0cf74fd6d3838b82c59bc6991f5b7531d53668bf43035aac319b096bdef66c74b74d9438418347c8087673bef295 SHA512 dff49479711a176066a415d5ebb9626fd7ba9f554fda9921e392d8645bb04c3bc07af23181670014083a4132fdb9a8dc95db44f7891b355c2dcf3c6a8ae2608c
-EBUILD meson-0.53.0.ebuild 2069 BLAKE2B cadf14d173234effe76c0444aa6c235bbe9f162b0523228e46989d75e1297517e22c118b402e6d0d9c1e29ebd7f48d82a36b408cfec124eaf0eea6334efd400b SHA512 93e39c8181e43e1b30226482bf90cffa3d3b4dde70334d0afcc7bfae9d4920702c240dc0e834758982fd5f27b5d2c7a5cbee3973eb148835cca9e004c568826a
-EBUILD meson-9999.ebuild 1995 BLAKE2B 077063da3cd5c8458313b759da409e2f73177e1418b3ee318eb60f474b62e6d822b36ee78179728b916ba1b6c3116b29009c6ec2b6e88b16cd681d5fb47d4dd8 SHA512 abfe6967a70dc0c4b951e304ccd271741d53a9cc10c1051d0a97afac6f2e5fe52ed31f729f15822c8bdfc09f461f2df8ede06b854733b6e699bc392fa7a40c4b
+EBUILD meson-0.52.1.ebuild 2100 BLAKE2B d91311e2d5e9706f178d600af549e755d4f4720c7d26cf65744167218e8c16a2595f20efd7a8ddad4fc7933443123b39ce0d8ba778e315679dde25ef3e84fe4c SHA512 88b28b61a791359bedce515c818c1539aefc4aa1b13a55cc385926ebca609db70bc374d613d0a3d0f06cbf580362e3f6532b9e53f9d0cd8af87c546e812a9b30
+EBUILD meson-0.53.0.ebuild 2113 BLAKE2B 7852e6dd0459f26beaa4f9e121578d6cd44281ead0984f577d16c38b93aa6b03d6ddf4a9401f983c996342c2a937bc3e1b856696bbfc022e5398766cee535a3d SHA512 af11e0bcb5b4858c93ae40c0df410f99e8cd7c4be32404d1c22afabf7e792530ec1939baa1ccccef3bcd06fd7313eb8523465c24ef9cf4e116190ba86be48edc
+EBUILD meson-9999.ebuild 2039 BLAKE2B 7c795a9c84ad0aca3651cb0c16202208603fb0edd017a8d689c69f8980da35a9e73679b6d00d9cd249f3b23610e237770ef8cab2ba5af5a9499c08af5b55646a SHA512 4b96bf71cafcbb1c3f6327a2221f9f89a12088920b3f16c65631a6e19f46c58e39184a2d7277c645990b9fc4d533c8cb825d440581026669de03555198341b0b
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild
deleted file mode 100644
index f7c71e2ff810..000000000000
--- a/dev-util/meson/meson-0.51.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index 232e93978e1a..c46bf9a69551 100644
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.ebuild
@@ -47,7 +47,7 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
-	# Requires python2
+	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
 	distutils-r1_python_prepare_all
diff --git a/dev-util/meson/meson-0.53.0.ebuild b/dev-util/meson/meson-0.53.0.ebuild
index c03f936be1ba..0c1735955a49 100644
--- a/dev-util/meson/meson-0.53.0.ebuild
+++ b/dev-util/meson/meson-0.53.0.ebuild
@@ -47,7 +47,7 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
-	# Requires python2
+	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
 	distutils-r1_python_prepare_all
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 1cb26feeb184..7b35af518736 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -43,7 +43,7 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
-	# Requires python2
+	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
 	distutils-r1_python_prepare_all
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 1caaefc92e77..3b9e02002210 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,5 +2,5 @@ DIST pkgcheck-0.7.3.tar.gz 221266 BLAKE2B f4633a3c115913d8973b82f8ab6a4550334f50
 DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74
 EBUILD pkgcheck-0.7.3.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
 EBUILD pkgcheck-0.7.4.ebuild 1318 BLAKE2B 9373935373bbb8d12d78e6ee7a3e179e0c2adb1987e1fb22f379352d62486806010ff0d9136a37eb051d29487968eddcaae7b1e0045eea8c30e088cdf463dd18 SHA512 6b5ab1b5492d99685e041a6f78960bf5f0fd23dea682ceb94bf080409dbba5aa3c7cdfc18796ca1a30ea8e7ddfde9fabc92394610a7cef7276e1690adaefd5b6
-EBUILD pkgcheck-9999.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
-MISC metadata.xml 550 BLAKE2B 546180cdc48f3c64c63ab80711aaeb9f0e84380ebafd76aba32b5744652b9de7d242bc886cde704dab3720c9251b1845deb0fae7f8825477efb5d5562df41afb SHA512 9ecdd3db309e3f7f97452303cd058ebd34423feb050250c8bbc917598e68d55b9e99e2f6a6ac02aadde0e2218c89513dcf13983765852d360c1656c4b945025c
+EBUILD pkgcheck-9999.ebuild 1310 BLAKE2B fcc38dd1cf741fac1161f31b3c24b005f96f2cc9007d47272f132dbc52f6dc933f10312ca15d31218d7212beaceb97e196ea487dac8738d89abd35b591504213 SHA512 66300bb991470e73d030d54eb6d88680bfa9bf993b4deea62b641ce1ac7fb0b7c97b2fa5d5f57da8ea617db488f336452c8d4d5222acdc9a1b068ec0928222e8
+MISC metadata.xml 658 BLAKE2B a3140b5593fe37271a936139ddb1d0d0155213476353176837cc8587d0da787f99fbe568ff81c88abd4e20638c62527abeb0267404eae03125f11711d52c38e9 SHA512 3854c339a8b6f209f52782225ab37f76333f023db3d6bd7ed927b79aecc79837918b6af1cf0bfecdb7bb9d64bab5fa47dc287b30eab2508fd3df0bb26ac55cb0
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index 72342d2b678f..a9c3c39c785b 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/metadata.xml
@@ -5,6 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
 		<flag name="network">Enable support for network checks using <pkg>dev-python/requests</pkg></flag>
 		<flag name="perl">Enable support for perl checks using <pkg>dev-perl/Gentoo-PerlMod-Version</pkg></flag>
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 4626c74a350b..cf118f1367de 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,7 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
+	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }