gentoo resync : 28.04.2021

5 files changed, 8 insertions, 174 deletions

diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index e3b849f1e60f..a5d9b3bbfdde 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,10 +1,6 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-AUX gucharmap-update_to_unicode_12.1.patch 1498 BLAKE2B 5ed3c8a254862074fb923ceac25a03478c88ff3fdd33af9aab98f49830045e04a13cf6ea8551d16aee112a5c62ccc71a167926ce5205297a1552f2819193d99a SHA512 aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f
-DIST gucharmap-12.0.1.tar.xz 1678524 BLAKE2B 90923dcb85f132f607007b272f56d091cd51f14d6818fc01fdedc594d736cc1047e4d3165f4ba3cede96ee2c0db4973890e1fde60c294fb848ffb3918988178f SHA512 989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2
 DIST gucharmap-13.0.4.tar.gz 1900442 BLAKE2B 83925f04b23a5984e0180ae86d39842e419fe723604d3e93785241ed33ba56b80d68bfd8c99514ef542e515c78a0b64748781faa962d3a32e26746673ba4d2f0 SHA512 919f3298040962cf1b8636fe82a900e667d1f63c0f92c99b013d10cee7e7d5f074f3ffaa0ab8a8e3685b6764915a4e683e459fb680aeb65247c82c5a8a326bf9
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-12.0.1-r1.ebuild 1936 BLAKE2B a3686c5c86744f975a8e112c4098ffc82f80e1c1def8545b57a26b76c97856fc899afb028fb406fac91e06f69a0fe049847352a09d0620fa13bf1a37d888cafa SHA512 91aa6a98a48bfc3ab55ad150e3ddb3950ccccdae66219b836f54260aabaf5905a8ace69913a7c7478b40e7983becb4e82ae330cf4865d6087a70409abb610ec6
-EBUILD gucharmap-12.0.1.ebuild 1741 BLAKE2B dea36eb5c3be56088a803f974509d12075f488c823c5943d1915ea0cc9ab1328ae09ef1964b939c4b64771bda8bbb44fcc351a5cad86ff7a636f09c3f46c247d SHA512 a30f6df8594982e305da2092af3a26cdb8d014101af5f1b8d0d75b35dbabf68aa34bbc058c279d896907953cbbe6fa52e2ddf2035384ae6e007f77370031deba
-EBUILD gucharmap-13.0.4.ebuild 1437 BLAKE2B e63b7c0ee24534e72b705ec8fedfd2045e20dfbe085655da6578430f437640f8ff23afc3d73340a8fdf4dc5771a1b76f3e05c108e770b997291f7f9d5ca75327 SHA512 254a44fdd8e9529a7c1ee81b8ca352d94358745dbb3e2e4f4f7e983c80f41ee5698d03078dd1184b3405cede0ad8b476a9ebc4513885b7d7168b89d52dbbcf5d
+EBUILD gucharmap-13.0.4.ebuild 1496 BLAKE2B 12ea9277f7a0f28f9ceeb1faccf80f65c70fca1bd1896b254d5060d179c8ac11a0e636e2ba9bf19bf28d8089db4c40abb05e06c910ad6158514d982d9d678f4a SHA512 3d6269ed657e97cdc9828980911f295940b9381e19ce8cdc0e5cb764dcdfd7b5f76fad844a40ab7026566445a41683f0ab0ee9f3d8d5646315bfae2e09ada179
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch b/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch
deleted file mode 100644
index 60dbb7af58c4..000000000000
--- a/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h
---- gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h	2019-03-07 21:21:27.000000000 +0100
-+++ gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h	2019-11-14 17:43:55.007583238 +0100
-@@ -51,7 +51,8 @@
-   GUCHARMAP_UNICODE_VERSION_10_0,
-   GUCHARMAP_UNICODE_VERSION_11_0,
-   GUCHARMAP_UNICODE_VERSION_12_0,
--  GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_0 /* private, will move forward with each revision */
-+  GUCHARMAP_UNICODE_VERSION_12_1,
-+  GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_1 /* private, will move forward with each revision */
- } GucharmapUnicodeVersion;
- 
- /* return values are read-only */
-diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c gucharmap-12.0.1/gucharmap/gucharmap-window.c
---- gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c	2019-03-07 21:21:27.000000000 +0100
-+++ gucharmap-12.0.1/gucharmap/gucharmap-window.c	2019-11-14 17:45:11.145809820 +0100
-@@ -454,7 +454,7 @@
-   gtk_show_about_dialog (GTK_WINDOW (guw),
- 			 "program-name", _("GNOME Character Map"),
- 			 "version", VERSION,
--			 "comments", _("Based on the Unicode Character Database 12.0.0"),
-+			 "comments", _("Based on the Unicode Character Database 12.1.0"),
- 			 "copyright", "Copyright © 2004 Noah Levitt\n"
- 				      "Copyright © 1991–2019 Unicode, Inc.\n"
- 				      "Copyright © 2007–2019 Christian Persch\n"
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
deleted file mode 100644
index 16aafd985d66..000000000000
--- a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="debug +introspection test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION="12.1"
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	media-libs/freetype:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-update_to_unicode_12.1.patch"
-	eapply_user
-
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-	sed -e 's/unicode_version = 12.0.0/unicode_version = 12.1.0/g' \
-		-i gucharmap/Makefile.am gucharmap/Makefile.in || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	# https://gitlab.gnome.org/GNOME/gucharmap/issues/13
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
deleted file mode 100644
index 17ae326da87b..000000000000
--- a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit eapi7-ver gnome2 vala
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-IUSE="debug +introspection test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(ver_cut 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	media-libs/freetype:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	# https://gitlab.gnome.org/GNOME/gucharmap/issues/13
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
index 19e0a35c76c0..793250c94685 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2-utils meson vala xdg
+inherit gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Unicode character map viewer and library"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
@@ -14,18 +14,20 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 UNICODE_VERSION="13.0"
 
 IUSE="debug +introspection gtk-doc vala"
 REQUIRED_USE="vala? ( introspection )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
 	>=sys-devel/gettext-0.19.8
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	${vala_depend}"
+	$(vala_depend)"
 
 DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
 	>=dev-libs/glib-2.32:2