gentoo resync : 28.04.2021

4 files changed, 11 insertions, 46 deletions

diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 19f0e340e28c..24b49c3b6013 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,7 +1,5 @@
-DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
 DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3
-EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e
-EBUILD pangomm-2.42.2.ebuild 991 BLAKE2B daff32bc87f4d3a0978c22a358e59737c64bed09df58e00b4a87dff6671bb7e94674c11dfd04568ca00bb204b4d3363f19dca569534d627762352749e171b408 SHA512 9171d58dbcc3d0348bb38f8e5938a28cd3265754a56f738257ff26f685569d8c41ec07a02f89ea570e02268194b2536206ef966d03b098499668110dc9c77f33
-EBUILD pangomm-2.48.0.ebuild 1005 BLAKE2B a5e2ed5eeba3809426505d9c017654c7affc840256d2874e8d5e14033a6783fbeed2badcad55cf232d79e1728bbf62edaec153e63ddb2a25b88da0cddc5fa689 SHA512 77df10f6dc25ccd967316aa4879ff57c45c9ab1afe22ea98cd0ed26a8f5857703360874349792612934e34b11c823274274d7697f356f6fce64ab3f38cb8b8c3
+EBUILD pangomm-2.42.2.ebuild 1051 BLAKE2B 5bc6fb687bfa063c8ef24da32b635882a56203611336cbf36a46c9ecbd9365436e0ee7fb565e75a2e2b824ebd2c11b5d3a71146b31cde06c921a98159a8721f6 SHA512 d35deddcb90fde39fc517d69e2e8d5072d9fc611bff7681fe51c846abbdcea074f5ebf03f9398c9a8465dde239c0b58f85b539a7b342031b7b7f7b6528b4b531
+EBUILD pangomm-2.48.0.ebuild 1069 BLAKE2B 79cb13af7cc48eade2f248088278c34ee82d2b98e611976711103ecdadd4fdb7a4c892213df8b98091b64b7be21c9be73c162811dc188008bf1a0c72fa0d9752 SHA512 309d8cff184fc738a1febe012f10e37d9f3f785a7447730630f0d49a827696f2980e48640870ba483d8199800211c76d39552a454388267aa35c94900072797d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild b/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild
deleted file mode 100644
index 5b8d5a7f6e53..000000000000
--- a/dev-cpp/pangomm/pangomm-2.42.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-COMMON_DEPEND="
-	>=x11-libs/pango-1.41.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.13:2.4
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-cpp/pangomm/pangomm-2.42.2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
index 103bc296f9cc..d0a2f770d9af 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2.ebuild
@@ -2,14 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
@@ -26,6 +28,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {
diff --git a/dev-cpp/pangomm/pangomm-2.48.0.ebuild b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
index 7a3b8eba6959..924043617bfa 100644
--- a/dev-cpp/pangomm/pangomm-2.48.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
@@ -26,6 +28,7 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	${PYTHON_DEPS}
 "
 
 multilib_src_configure() {