[gentoo-commits] repo/gentoo:master commit in: x11-misc/shared-mime-info/files/, x11-misc/shared-mime-info/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     1e87a64d415f618ab7773bf251f4a96a2932be8c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 20:05:59 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 20:06:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e87a64d

x11-misc/shared-mime-info: Use upstream patch for previous fix

Closes: https://bugs.gentoo.org/728404
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...ared-mime-info-2.0-pkgconfig_install_path.patch | 22 ++++++++++++++++++++++
 .../shared-mime-info-2.0-r2.ebuild                 |  9 ++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

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 00000000000..e694928728f
--- /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
index b21ac610129..dc5eca64624 100644
--- 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
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( HACKING.md NEWS README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-pkgconfig_install_path.patch" #728404
+)
+
 src_install() {
 	meson_src_install
 
@@ -39,11 +43,6 @@ src_install() {
 		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
 		doenvd "${T}"/50mimeinfo
 	fi
-
-	# Move pkgconfig file to /usr/share/pkgconfig #728404
-	dodir /usr/share/pkgconfig
-	mv "${ED}"/usr/{$(get_libdir),share}/pkgconfig/${PN}.pc || die
-	rm "${ED}"/usr/$(get_libdir) -r || die
 }
 
 pkg_postinst() {