fix .pc install destination wrt #480598

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

3 files changed, 86 insertions, 2 deletions

diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog
index 82a8505b985e..45f66c793c2e 100644
--- a/dev-libs/yajl/ChangeLog
+++ b/dev-libs/yajl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/yajl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.37 2013/06/26 10:28:11 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/ChangeLog,v 1.38 2014/06/16 18:30:53 hasufell Exp $
+
+*yajl-2.0.4-r3 (16 Jun 2014)
+
+  16 Jun 2014; Julian Ospald <hasufell@gentoo.org> +yajl-2.0.4-r3.ebuild,
+  +files/yajl-2.0.4-pkgconfig_multilib.patch:
+  fix .pc install destination wrt #480598
 
   26 Jun 2013; Michael Weber <xmw@gentoo.org>
   -files/yajl-2.0.4-remove_static_lib.patch, yajl-2.0.4-r2.ebuild:
diff --git a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch
new file mode 100644
index 000000000000..4a01848acd49
--- /dev/null
+++ b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch
@@ -0,0 +1,40 @@
+From 409098e97292aa1698ddff7f34dd8099db41a550 Mon Sep 17 00:00:00 2001
+From: ksergey <inndie@gmail.com>
+Date: Tue, 28 Jan 2014 00:35:36 -0500
+Subject: [PATCH] fixed pkgconfig file path
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e36b736..27b7c7d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
+ # set up some paths
+ SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
+ SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
+-SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig)
++SET (pkgConfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig)
+ 
+ # set the output path for libraries
+ SET(LIBRARY_OUTPUT_PATH ${libDir})
+@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir})
+ # generate build-time source
+ SET(dollar $)
+ CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
+-CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
++CONFIGURE_FILE(yajl.pc.cmake ${pkgConfigDir}/yajl.pc)
+ 
+ # copy public headers to output directory
+ FOREACH (header ${PUB_HDRS})
+@@ -82,5 +82,5 @@ IF(NOT WIN32)
+   INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+   INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
+   INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
+-  INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
++  INSTALL(FILES ${pkgConfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ ENDIF()
+-- 
+1.8.5.5
diff --git a/dev-libs/yajl/yajl-2.0.4-r3.ebuild b/dev-libs/yajl/yajl-2.0.4-r3.ebuild
new file mode 100644
index 000000000000..7a3faf9e3c51
--- /dev/null
+++ b/dev-libs/yajl/yajl-2.0.4-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/yajl/yajl-2.0.4-r3.ebuild,v 1.1 2014/06/16 18:30:53 hasufell Exp $
+
+EAPI=5
+
+inherit eutils cmake-multilib vcs-snapshot
+
+DESCRIPTION="Small event-driven (SAX-style) JSON parser"
+HOMEPAGE="http://lloyd.github.com/yajl/"
+SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-fix_static_linking.patch \
+		"${FILESDIR}"/${P}-pkgconfig_multilib.patch
+
+	multilib_copy_sources
+}
+
+src_test() {
+	run_test() {
+		cd "${BUILD_DIR}"/test
+		./run_tests.sh ./yajl_test || die
+	}
+	multilib_parallel_foreach_abi run_test
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	use static-libs || \
+		find "${D}" -name libyajl_s.a -delete
+}