gentoo resync : 28.04.2021

4 files changed, 9 insertions, 94 deletions

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index f218b92ef845..c76d49e2d78e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,9 +1,7 @@
-DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
-DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
 DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
 DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ffb34f5c847be705953d8498f307661822462ceaa6362d120e96556a50882ed78540fce5cd2e97f0a4fd11232fe01c SHA512 c0c617e5678f942db33bdff6e149e438bd7d5f4e0a4e0a112476515d1face1c6e992457f998a5077a08bdacc1bda24711b29a4312bd3ee825b526d54a7ca3db7
-EBUILD pygobject-3.34.0-r1.ebuild 1885 BLAKE2B 5c83846b565f9415fa654e1d4bba401438a7e11122b0eeb9ddb91015598f58b0e37b5f326e21d3c4b5cf79c046129b7d4612c32efdbbd20c0bbd1241bb2c13a8 SHA512 5ee96c08251222a4dc18636fd2b1b45a519848cc469a9ba18df2780f22684a6a8f377cf9ac4e0bb9c65fee1eef005409c8ac1691ab3f1957fb67c051b64bb0cc
-EBUILD pygobject-3.36.1-r1.ebuild 1745 BLAKE2B 34eaf592f7695c65bec024632d4e5e852806a3e26e1769c21abfb9a1db5b0f8649efd505d1a416e5a106155839fd72cf2d012160beb4eae0c40b99b2176d15d0 SHA512 fe8e7cf92ffa159fb173b0bc978822c4f68661588038a48cb111e2e6e7fc7f432c34e9039877c5e28953eb6fa943e0af1f2dbf9bae7aff5d109b0adec9a0b8f5
-EBUILD pygobject-3.38.0.ebuild 1757 BLAKE2B e6e9ca79a742e09486e219cc6f1f4418e4affbcab13d7ef07c68209cc83c8b9140f700fd179cc6ae99e75deede081c7acca89ab1c043db3afced4bf420bdb264 SHA512 e13299fd37f59d38d4579113099186dc8d29045aae384d30ff20ed7cc0359ed20943168e62daf6ea322df772c238839168a401ebf673d376afd05a1f27fcf545
+DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
+EBUILD pygobject-3.38.0.ebuild 1750 BLAKE2B 5e9fb1c304867db80e8abd422d6a2acc73cc04d04e5183d6aa6be9e5dea7a1026d9e5888d389eea628dce8fea026363dfea8325f2d971a33a0861ae3b490f6ef SHA512 aad5d9bbbc022fa21b3491eedd9237bb125387639031c2a9897cbc1d7afa6f6f26d435612a73486e157d56000a1011ea80b215ed5e68753ca432eaa07f1a4b68
 EBUILD pygobject-3.40.0.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
+EBUILD pygobject-3.40.1.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
deleted file mode 100644
index 346b245a0cbf..000000000000
--- a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/atk[introspection]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			x11-libs/gdk-pixbuf:2[introspection,jpeg]
-			x11-libs/gtk+:3[introspection]
-			x11-libs/pango[introspection]
-		' -3)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_use cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		if ! python_is_python3; then
-			einfo "Skipping tests on Python 2 to unblock deps"
-			return
-		fi
-
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
index 033a5dd7caf3..1e9a11a47540 100644
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.38.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.40.1.ebuild
index 959d8634b3e4..8e08699fd4ce 100644
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.40.1.ebuild
@@ -12,17 +12,17 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/gobject-introspection-1.56:=
 	dev-libs/libffi:=
 	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
 		x11-libs/cairo[glib] )
 "
 DEPEND="${RDEPEND}
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test )"
 src_configure() {
 	configuring() {
 		meson_src_configure \
-			$(meson_use cairo pycairo) \
+			$(meson_feature cairo pycairo) \
 			$(meson_use test tests) \
 			-Dpython="${EPYTHON}"
 	}