gentoo resync : 25.08.2020

3 files changed, 16 insertions, 16 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index f6699fa4c40c..28d9bfdc5e08 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,7 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
-DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
-EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
-EBUILD devhelp-3.34.0.ebuild 1785 BLAKE2B de85382d7371bb1bb4360639396e4df2eb937e256db3a5abe431e310eaadb6c48384ba8da8508286919263968e9070b17e76dcbcf7d00e713d732c2819ef1b46 SHA512 ad45cb14f9f1839aabc3234d5238034a4c882608cd56cc38d1e2cdfed6be02c474d996c502d206a99fe3c72d26d66d0d660e62dc556aa8e18b16ec6f24740bf0
+DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
+EBUILD devhelp-3.34.0.ebuild 1773 BLAKE2B 90531b17151b31a31c55fd24201520ee20dc3cb59a9784d7bd81dfc8168fc9187bee1a718d93ec3983071732df5e802cfdbbae9f83776009a3a27d84aaa8ee15 SHA512 5b5685d1acb9f1ec30ba6728d3d7b77787d7f56177b26dee74a52218c2f8f6b666f492b6e6e20147de1c91bbb9d7102429e14d71a18722efeaaecbfcb70eaf0d
+EBUILD devhelp-3.36.2.ebuild 1788 BLAKE2B b045297cc190cd06d0f8b1b3d160d93e0f338ca3918b84f7bce54722aa2bd802124d6e6193902c2b43a843bfec4fa7dff5ee50a7ba6bf28af67cf74122f1ac47 SHA512 2a81df40d83cf170e2bcd6ee481dcbd5556b6dc90fb723a6eb34412ccd02e954413fa5a3833f83b36133b168bdb396486aecd59e16ec275f8228f4061856d7b0
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
index 2a8f559e7ffd..01b5ad885657 100644
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.36.2.ebuild
index f953d1ca536a..22133dbacde5 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.36.2.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
 DESCRIPTION="An API documentation browser for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
-COMMON_DEPEND="
-	>=dev-libs/glib-2.56:2
+DEPEND="
+	>=dev-libs/glib-2.60:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.20:4[introspection?]
+	>=net-libs/webkit-gtk-2.24:4[introspection?]
 	>=gui-libs/amtk-5.0:5
 	gnome-base/gsettings-desktop-schemas
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gedit? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -33,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 # libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-util/glib-utils
@@ -46,8 +46,8 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-	"${FILESDIR}"/${PV}-optional-gedit.patch
+	"${FILESDIR}"/3.30.1-optional-introspection.patch
+	"${FILESDIR}"/3.30.1-optional-gedit.patch
 )
 
 pkg_setup() {
@@ -66,7 +66,7 @@ src_configure() {
 
 src_install() {
 	meson_src_install
-	use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
+	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
 }
 
 pkg_postinst() {