gentoo resync : 05.12.2021

5 files changed, 88 insertions, 79 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index f5a778feb747..c2e4686b3b88 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,6 +1,4 @@
-AUX shared-mime-info-2.0-pkgconfig_install_path.patch 623 BLAKE2B 3ee4845d1c8c7c0b8d63e2b4948fa8bab96b33addd2d4b2ed7dd86bed73b1e14bc4d2cab80308a7fffe56f49f6d14503bcbdf62ec695512d3d1fae5dc3ff3d9f SHA512 b1472ad604b7c5770272dba0a41fcf5e828218db84106327b7b04b3c947e80aa667c4fbcffeeb3b6922eea0f8c929278beef811604978bf6d3bb028239790266
-DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
+AUX shared-mime-info-2.1-itstool.patch 2841 BLAKE2B 4198fa232a034cf2c71f18973c0223af4944bc443c2b642e095cd842c8f206c20812d98d1466d50f345e35c8f61b213a58d711a3b7e515820c462e143dce9904 SHA512 af6772dc8bcceebcdc965e30f626b5ea415bbb0facff9ecaab6fadc23dbdc9ee0d72f588ac0d9637bcdf5930f30bd21102145e56def080cb946cd0f9b027a4b0
 DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
-EBUILD shared-mime-info-2.0-r2.ebuild 1342 BLAKE2B c4cacac538e5344cf145a411f21f1a71c6b1c9b94a6e49bd698e9589a4375dd2cc2db88a53dffba02f690bb1ee4d19297d57d570c121ebb1b34667065f605191 SHA512 49f91beb5326b84b4f88ddbb4766c1f0ed9e01e3a232777c92a3f611a1d03ab2a789cb7f61e2fc8d97d880fdd92a8bbc2ca0c4e14f908c4894dd08e68272dee4
-EBUILD shared-mime-info-2.1.ebuild 1272 BLAKE2B 10525c17ae77bbe1d8d0913a167db5b830f43b7ea352d227eb3b9a88721f1662e3f17feedf65ec487ce19ed85b702ecd6d33daade29930ccd91eac54e5db5093 SHA512 868e6fd1dad4743ff8ef5a2d9a2fbaabb6bdd0c2c61de6f5292857f341c76be90ac19de4ba8d36c9c74d56f02971f6004213f4f106bf3718089ca4cfd52f2b54
+EBUILD shared-mime-info-2.1.ebuild 1317 BLAKE2B 1ff8f3da6e43a8cc28ee849ee0a07b30ef39623317a60e7ce8ada17709aaa80a14915610ec4ca8e3515937e50703602460ddab30ba4d0e6181b2f88e1988d72a SHA512 31842f41f7cfe45ab3d99b1da1a4207c0b6c124daf510863e0e428d2e8cf5b5db401c6b619b155dabfec87caba78ef4c9ae2c1adaefb960e6d3f275e90b22ac8
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
deleted file mode 100644
index e694928728f4..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 6 May 2020 16:48:47 +0200
-Subject: [PATCH] data: Fix pkg-config installation path
-
----
- data/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/meson.build b/data/meson.build
-index 25ce031..e22b544 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -38,4 +38,5 @@ pkgconfig.generate(
-     name: 'shared-mime-info',
-     description: 'Freedesktop common MIME database',
-     version: meson.project_version(),
-+    install_dir: get_option('datadir') / 'pkgconfig'
- )
--- 
-2.26.2
-
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
new file mode 100644
index 000000000000..dedeb61e29cf
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch
@@ -0,0 +1,82 @@
+From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Mon, 8 Nov 2021 18:22:47 -0500
+Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
+ translated XML
+
+gettext upstream has supported this for a very long time (since 0.19.7
+via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
+and itstool is (mostly) a legacy of the time before gettext had proper
+support for these sorts of use cases.
+
+This is similar to the state of intltool, which is described at
+https://wiki.gnome.org/MigratingFromIntltoolToGettext
+
+During the port from autotools to meson, the legacy use of itstool was
+faithfully translated to meson in the only way possible: by jumping
+through hoops to run ninja inside ninja in order to generate the .mo
+files for itstool, because meson's i18n module used a flawed design and
+there was no "real" target to create those files, only a .PHONY
+run_target which other rules cannot depend on.
+
+Although meson 0.60.0 added support for real targets for the built .mo
+files, this changed the rules for output filenames, breaking the script.
+
+But msgfmt does not care, and anyways comes with builtin meson functions
+for convenient use with XML files. So let's take this opportunity to
+drop legacy dependencies and use the modern, builtin tooling, which
+fixes this bug as a side effect.
+
+Fixes #170
+---
+ .gitlab-ci.yml               |  2 --
+ README.md                    |  2 +-
+ data/freedesktop_generate.sh | 12 ------------
+ data/meson.build             | 16 +++++-----------
+ meson.build                  |  1 -
+ 5 files changed, 6 insertions(+), 27 deletions(-)
+ delete mode 100755 data/freedesktop_generate.sh
+
+diff --git a/data/meson.build b/data/meson.build
+index 24361c9..09ed7a9 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,18 +1,12 @@
+ 
+ install_man('update-mime-database.1')
+ 
+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
+-    input : files(
+-        'freedesktop.org.xml.in',
+-        'its/shared-mime-info.its',
+-        'its/shared-mime-info.loc',
+-    ),
++freedesktop_org_xml = i18n.merge_file(
++    input: 'freedesktop.org.xml.in',
+     output: 'freedesktop.org.xml',
+-    command: [
+-        find_program('freedesktop_generate.sh'),
+-        meson.source_root(),
+-        meson.build_root()
+-    ],
++    data_dirs: '.',
++    po_dir: '../po',
++    type: 'xml',
+     install: true,
+     install_dir: get_option('datadir') / 'mime' / 'packages',
+ )
+diff --git a/meson.build b/meson.build
+index 0d08c8a..60f17ae 100644
+--- a/meson.build
++++ b/meson.build
+@@ -20,7 +20,6 @@
+ ###############################################################################
+ # Find tools
+ 
+-itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+ xmlto   = find_program('xmlto')
+ 
+-- 
+GitLab
+
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
deleted file mode 100644
index 948338326b9f..000000000000
--- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-HASH=0440063a2e6823a4b1a6fb2f2af8350f # don't forget to update on version bumps
-inherit meson xdg-utils
-
-DESCRIPTION="The Shared MIME-info Database specification"
-HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
-SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# requires installed xdgmime binary
-RESTRICT="test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( HACKING.md NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-pkgconfig_install_path.patch" #728404
-)
-
-src_install() {
-	meson_src_install
-
-	# in prefix, install an env.d entry such that prefix patch is used/added
-	if use prefix; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
-		doenvd "${T}"/50mimeinfo
-	fi
-}
-
-pkg_postinst() {
-	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
index 440f28e1465b..0957f1fa1a14 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="test"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/xmlto
-	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
@@ -32,6 +31,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( HACKING.md NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}/shared-mime-info-2.1-itstool.patch"
+)
+
 src_install() {
 	meson_src_install