gentoo resync : 21.06.2020

3 files changed, 77 insertions, 0 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index c2af318fc842..a0c74a29121f 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,8 @@
+AUX shared-mime-info-2.0-pkgconfig_install_path.patch 623 BLAKE2B 3ee4845d1c8c7c0b8d63e2b4948fa8bab96b33addd2d4b2ed7dd86bed73b1e14bc4d2cab80308a7fffe56f49f6d14503bcbdf62ec695512d3d1fae5dc3ff3d9f SHA512 b1472ad604b7c5770272dba0a41fcf5e828218db84106327b7b04b3c947e80aa667c4fbcffeeb3b6922eea0f8c929278beef811604978bf6d3bb028239790266
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2
+DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085
 EBUILD shared-mime-info-1.10-r1.ebuild 1773 BLAKE2B bd008173ac18b6b06be56cfad43cddaf9e0495853c5f7526f1b236e81cd1e2f7c0730148bb020dd414e42c106e51825d02ee5c6d0234c36a33a361a290424dea SHA512 cdd5dfbc93748884a3defb0447afb0bf24283c06df886085f6880400018bdbd5b764cf056d8b4ef9c60066c16b0f08b4085f3400d7379b5eb48968df40dca453
 EBUILD shared-mime-info-1.15.ebuild 1274 BLAKE2B 0c17cc9a27afbf1f678dae46af667d3f661c408a8738b199579e5084212a7a65b81da72716eb4530504cf4927802f8e13f31bd7656fda9d4dc4e0a9f97b3d1ed SHA512 5a108f4bfc9fc34e35f16849dc183ddac0296ede5166eb86c961b0da409e2a9e4516e97c0f25a3d6e6ace8fb3e21348e1909ce1a5c623ad8a33f0f54bdc021d9
+EBUILD shared-mime-info-2.0-r2.ebuild 1374 BLAKE2B 310af59675fd8f6e9d43805c53014b3f73281a67efed48f31960ba534aa103c4c496084aea712a1018a0bd5bb0049ab18ae00296655d9f33839382a000b210db SHA512 aa7225bbfcf2048749a47ff4bf6e238bf24a92a87d90220e6b57723e09b2e71fdfcab959c4f16f140425b00b78947e18df46bb3cde6a67ee6045ea5292267e00
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
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
new file mode 100644
index 000000000000..e694928728f4
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch
@@ -0,0 +1,22 @@
+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/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
new file mode 100644
index 000000000000..714f445d6525
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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
+}