gentoo resync : 16.01.2021

6 files changed, 168 insertions, 3 deletions

diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 59e01fb631a9..18ca7fdefde4 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,8 +1,12 @@
+AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e47813935ac0a166acbdfe719e27eb3d83e50ce5eb55486dfe6dfd4bbd53bf56c28d3d213cc266148063fbe8aee06967a423622 SHA512 160d3bcf8ea27fecd51470a15e83ef29c99f9b4c86cce1286d8ba2a6432a11a0fa4ec602db80c8daba3ad5e5e24c602a876fc8ad90e07a65d968ed47e46badfc
+AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
+AUX 14.0.1-meson-0.60-fix.patch 785 BLAKE2B 24caa4cb052a4669d6b3e04bd7e7a0825232b0a2659f2968a9ae2f7b2215229bbaf1792bead1a0f73fa27a9db8f3045ad83d7b691fecc187499d883e60aa68b1 SHA512 6d5c4271e7aa8a4cbad8e1af8c18354e9e01477fb0381cc404485a832a47ecb788fe68819e24350555046c64024772d4d6c24a19a32e2cfcc634a32022590b9b
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
 DIST gucharmap-14.0.1.tar.gz 1925102 BLAKE2B 134d48703efb27d5eb3a19e8d90031d6feb8f0fa7321596efc1209377653590fe5f4191af739f012c1dee15df75e2d70ca2ed8850d30b57cc87b97343716de85 SHA512 5a79afe1a7e9f2a54f7499a578a34db690853f096a9374b335786abd3439812f511222792447f6cc603c2611490d3514d6a179844dd03fbf7f289133e29cf015
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-13.0.8.ebuild 1513 BLAKE2B b2d035506c04b189660dd7cf90e13adcadee5f01090fed944600be4eb067307e1a5767f5980b155b7d6c43858f8753c8a596216d055f43ca0af55df5d0890d97 SHA512 4d0e19912ebca1fec4906730bd520d41c4d08db5ced4da9323616f80aa90010cf3b1c7a9a789d415c78a42faddde04dd1180f744d674faec7abebefacfdd5e7f
+EBUILD gucharmap-13.0.8.ebuild 1514 BLAKE2B 37ed1aa8adf126665056dda6ee7b23744404d3ad567a6c73d38e40e45563d2196c4ac931e857be355d726712287be48539736d14fa662cd1f0328f78fc8ff801 SHA512 ef556d1dbf9be4f040d1b8cc7dd5a2fdc762698c3a6765d90627bcbb7e1b622c96dcfcaf003a607b202ff0efa56052340e40b460264fef355f4d8779a52f2f1b
+EBUILD gucharmap-14.0.1-r1.ebuild 1708 BLAKE2B 990a3a55a1578594d5014620594c89b535f2074b105fcdd13efde935f9b5c1d7aafa01241b419cb7b463808e6b026ae21e0e7e4e75c81fa2cf376a2c20460899 SHA512 dffe514e85cfcef953ba10dbe8f03733b02c131e88f2742c471a9e3bdbc16a6f6e4ecc6762133fc47291fa8da29ec1545444dc42df950f486b6e618e8e81b64b
 EBUILD gucharmap-14.0.1.ebuild 1480 BLAKE2B 70d51350fb8ad7d0c76a5bd453dd12113c8adb9e715fdc51adc040e668cf7a01d7da757b1dcfa977981d9c5ad6bc08bd3a8a8c4c9d1006ef942d4b0292e4fda4 SHA512 7dac7d9a481e280feb875c91f4004a671cde113d2b45a54b0f6363526e5d7a9bce319902cf2ea711197fca90a058d2b5a351eb59f26eac2568afa1b908ea3398
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
new file mode 100644
index 000000000000..55a346271880
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
@@ -0,0 +1,26 @@
+From 92b5a40d2d84e1989cdd091a10660e14e66c4daf Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Sun, 16 Jan 2022 01:03:08 +0200
+Subject: [PATCH 3/3] build: Use API version in gettext domain
+
+Avoids file conficts with other API versions being installed on the system.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 00cfbeec..db44e1dd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -78,7 +78,7 @@ libgucharmap_gtk4_soversion = '0'
+ 
+ # i18n
+ 
+-gucharmap_gettext_domain = gucharmap_name
++gucharmap_gettext_domain = libgucharmap_gtk3_api_name
+ po_dir = meson.current_source_dir() / 'po'
+ 
+ # Directories
+-- 
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
new file mode 100644
index 000000000000..42507f865685
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
@@ -0,0 +1,28 @@
+From 3193fe41561e6ddd99c1f5148089aa51c88236aa Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart@leio.tech>
+Date: Sun, 16 Jan 2022 01:00:43 +0200
+Subject: [PATCH 2/3] build: Always build and install user help
+
+We need a separate knob for gtk-doc that wouldn't affect user help
+being installed. Just remove the docs option check for user help to
+always installed it for us.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9529f5d1..00cfbeec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -262,7 +262,7 @@ if get_option('docs')
+   subdir('docs' / 'reference')
+ endif
+ 
+-if get_option('docs') and get_option('charmap')
++if get_option('charmap')
+   subdir('help')
+ endif
+ 
+-- 
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
new file mode 100644
index 000000000000..682f52a960c4
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
@@ -0,0 +1,32 @@
+From 7e748fcf7e7459e3a0368f4d057d241adc71936b Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Wed, 15 Dec 2021 00:03:33 +0100
+Subject: [PATCH 1/3] build: Fix build with meson 0.60
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 11e4e8a6..4bd50014 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gucharmap_prefix / gucharmap_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  'gucharmap.metainfo.xml',
+   input: 'gucharmap.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -42,7 +41,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  'gucharmap.desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+   type: 'desktop',
+-- 
+2.32.0
+
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
index 3e9ee44f49ff..3d55d12f7e08 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
new file mode 100644
index 000000000000..b276ab3b6f18
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+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 ~riscv ~sparc ~x86"
+
+UNICODE_VERSION="14.0"
+
+IUSE="+introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="media-libs/freetype:2
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libpcre2-10.21:=
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=x11-libs/pango-1.42.4-r2[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-0.60-fix.patch
+	"${FILESDIR}"/14.0.1-install-user-help.patch
+	"${FILESDIR}"/14.0.1-fix-file-conflicts.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcharmap=true
+		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dgtk3=true
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}