From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 20 Oct 2019 14:17:09 +0000 (+0200)
Subject: media-libs/taglib: Fix taglib-config libdir
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f5376c03c8c65c581901c4dee29a05cf2bae2327;p=gentoo.git

media-libs/taglib: Fix taglib-config libdir

Pending upstream PR: https://github.com/taglib/taglib/pull/935

Closes: https://bugs.gentoo.org/697742
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
new file mode 100644
index 000000000000..0ae6b1cfb9af
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1_p20181028-libdir.patch
@@ -0,0 +1,25 @@
+From cd9e6b750206417f155574c78d2551242a779a97 Mon Sep 17 00:00:00 2001
+From: jiblime <47689567+jiblime@users.noreply.github.com>
+Date: Sat, 19 Oct 2019 15:12:03 -0700
+Subject: [PATCH] Changed libdir/includedir variables to change based on a
+ user's system and match syntax
+
+---
+ taglib-config.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/taglib-config.cmake b/taglib-config.cmake
+index 2a5c19f90..e613fa226 100644
+--- a/taglib-config.cmake
++++ b/taglib-config.cmake
+@@ -16,8 +16,8 @@ EOH
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+ 
+ flags=""
+ 
diff --git a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
similarity index 96%
rename from media-libs/taglib/taglib-1.11.1_p20190920.ebuild
rename to media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
index b83996484d65..163dcdf23ea2 100644
--- a/media-libs/taglib/taglib-1.11.1_p20190920.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.11-install-examples.patch
 	"${FILESDIR}"/${PN}-1.11.1_p20181028-version-1.11.2.patch
+	"${FILESDIR}"/${PN}-1.11.1_p20181028-libdir.patch
 )
 
 MULTILIB_CHOST_TOOLS=(