From b70e542c2f6968be52305d054a594dcd18b534ad Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 1 Dec 2014 20:44:34 +0000
Subject: [PATCH] taglib-1.7.2: fix pkgconfig and taglib-config paths.

---
 .../taglib/patches/taglib-1.7.2.patchset      | 82 +++++++++++++++++++
 media-libs/taglib/taglib-1.7.2.recipe         |  7 +-
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 media-libs/taglib/patches/taglib-1.7.2.patchset

diff --git a/media-libs/taglib/patches/taglib-1.7.2.patchset b/media-libs/taglib/patches/taglib-1.7.2.patchset
new file mode 100644
index 000000000..21eb54a73
--- /dev/null
+++ b/media-libs/taglib/patches/taglib-1.7.2.patchset
@@ -0,0 +1,82 @@
+From 843808489e698ea8aeaa7cdcf692e3f47a8cc1da Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 1 Dec 2014 19:38:12 +0000
+Subject: fix pkgconfig paths
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb4c338..940154f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,7 +50,7 @@ include(ConfigureChecks.cmake)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config )
+ 
+ if(NOT WIN32)
+-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc @ONLY)
+ endif(NOT WIN32)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index 79c7a6b..b6f8dfa 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib
+ )
+ 
+ 
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc )
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc @ONLY)
+ ########### next target ###############
+ 
+ ADD_LIBRARY(tag_c SHARED tag_c.cpp)
+diff --git a/bindings/c/taglib_c.pc.cmake b/bindings/c/taglib_c.pc.cmake
+index 61764fc..5450582 100644
+--- a/bindings/c/taglib_c.pc.cmake
++++ b/bindings/c/taglib_c.pc.cmake
+@@ -1,12 +1,12 @@
+-prefix=${CMAKE_INSTALL_PREFIX}
+-exec_prefix=${CMAKE_INSTALL_PREFIX}
+-libdir=${LIB_INSTALL_DIR}
+-includedir=${INCLUDE_INSTALL_DIR}
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+ 
+ 
+ Name: TagLib C Bindings
+ Description: Audio meta-data library (C bindings)
+ Requires: taglib
+-Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+-Libs: -L${LIB_INSTALL_DIR} -ltag_c
+-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
++Version: @TAGLIB_LIB_MAJOR_VERSION@.@TAGLIB_LIB_MINOR_VERSION@.@TAGLIB_LIB_PATCH_VERSION@
++Libs: -L${libdir} -ltag_c
++Cflags: -I${includedir}/taglib 
+diff --git a/taglib.pc.cmake b/taglib.pc.cmake
+index 909b8fc..8a5159d 100644
+--- a/taglib.pc.cmake
++++ b/taglib.pc.cmake
+@@ -1,11 +1,11 @@
+-prefix=${CMAKE_INSTALL_PREFIX}
+-exec_prefix=${CMAKE_INSTALL_PREFIX}
+-libdir=${LIB_INSTALL_DIR}
+-includedir=${INCLUDE_INSTALL_DIR}
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=@LIB_INSTALL_DIR@
++includedir=@INCLUDE_INSTALL_DIR@
+ 
+ Name: TagLib
+ Description: Audio meta-data library
+ Requires: 
+-Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+-Libs: -L${LIB_INSTALL_DIR} -ltag
+-Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
++Version: @TAGLIB_LIB_MAJOR_VERSION@.@TAGLIB_LIB_MINOR_VERSION@.@TAGLIB_LIB_PATCH_VERSION@
++Libs: -L${libdir} -ltag
++Cflags: -I${includedir}/taglib 
+-- 
+1.8.3.4
+
diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe
index 225255902..7e4c9d3d7 100644
--- a/media-libs/taglib/taglib-1.7.2.recipe
+++ b/media-libs/taglib/taglib-1.7.2.recipe
@@ -12,10 +12,12 @@ COPYRIGHT="2002-2012 Scott Wheeler"
 LICENSE="GNU LGPL v2
 	MPL v1.1
 	" 
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+PATCHES="taglib-$portVersion.patchset"
+
 PROVIDES="
 	taglib$secondaryArchSuffix = $portVersion
 	lib:libtag$secondaryArchSuffix = 1.7.2 compat >= 1.7
@@ -62,6 +64,9 @@ INSTALL()
 	
 	fixPkgconfig
 	
+	fixDevelopLibDirReferences $binDir/taglib-config
+	sed -i -e "s,\/.*/include,$includeDir," $binDir/taglib-config
+	
 	# devel package
 	packageEntries devel \
 		$developDir \