fix .pc install destination wrt #480598

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 105 insertions, 7 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/Manifest b/dev-libs/yajl/Manifest
index 1c3559f27d76..61b837da29e5 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX yajl-2.0.4-pkgconfig_multilib.patch 1584 SHA256 c3751b4868087ca4b837a2e54b270c41e7bcf203d2231d9c8c7dcbab5a4616f5 SHA512 fc0a4d508e48bc8e005e0ad50fb44f3a0dbdd5e8e4eca4784e29a11498a480bd8ffe5558b512be9d54cd2b22bed53399f277796c413230e7c49abbd0dd98530f WHIRLPOOL f5f3a3bf77c4c09c42ca6183792306a4f80adb54eabfcfa7a0a82005018e93dfab4c84f80e0d86ea3b29d97d59b6505d3e82724fb29f4b20aece190e3b4e0529
 AUX yajl-fix_static_linking.patch 1019 SHA256 0a32becf97f2ac4cf14f977dfe0301411583cbb74570a7682632a2e11af99f72 SHA512 14e2708d979b59dd5764757f26ad4008a6229fa571c8b40e1fb2b5a4a6a68c5308d97aa78e1e06b274672cbbf6d07195d2d8291d78452c61738585af8142e32b WHIRLPOOL a3bebd09d5b1257d29008f0b30f43d9093a3194f08d9ca32cb290e530e70504dc43afbde91529e7dee97f1d7877ee57c966274acbf05fa9c2498899c86e7a27b
 AUX yajl-fix_tests.patch 696 SHA256 90a5239c9fc5424ca2837c4d7c1cf83e6d7de589daef80f2431fe35758045429 SHA512 13234c6aa089e09083e15c5be9d2f854a3449373e90c452bd8d39308def000aeabb0e844c345ec4871ec39b1b7f96e962d623ce425bec3354614f10c63d0f6ff WHIRLPOOL 5bbd5b303ebf1f5447cabcee2f7ee07aa4a091d837f542d5fcd2929d47d9239c4fc17fe64553a98ac773c406a32ab0401f11b21a7028f07e715bb0cc8c8f504f
 DIST yajl-1.0.11.tar.gz 53705 SHA256 1e98e03b927a8ec466baea527647f5e243f56f71bdec48cdab1c875f0f8b96a9 SHA512 6ab0e5052da45be327f1987818037b89b37b382c095a9e64043422425759c4819e46eb6c43919677b6020d10c042d077655ad50809d13733f781bee7db8babf0 WHIRLPOOL 28cf0723b65cbdea8d177d4326322fe24d335fc9ff84482b363f797e622ca9f683b1d21c50e1cb8289ac4895906da833e6229a903431c04691c5fd50aa926f57
@@ -10,12 +11,25 @@ EBUILD yajl-1.0.11.ebuild 647 SHA256 fa17720bf216f7c3e330f707907152ecb13b85bfb8f
 EBUILD yajl-2.0.3.ebuild 850 SHA256 6aea8216158656515441be45691ea09341f6435006a83ad45a11ab2e6f89a9ac SHA512 8f3476212aef836f03e4c0d20f4391f71d5d110dab2182462820292fdb879f487ef8b3d284b964d8669a3e730536e658f50c3b3289a4fa3da24b0098a5ef5e1d WHIRLPOOL cc181ceb1d237d983b80c002225004f40664fb94236c849343c4b22223a3275216afb85eeedb325b99d005c4310cbef1d0bcfb08711e3398ba4f7e790c61e1cb
 EBUILD yajl-2.0.4-r1.ebuild 830 SHA256 eb1ee93825dc6be03394c61af637fd62fc1f45938a4d3e7ec5652724102888e8 SHA512 3f6459c5f357c840fbf6c5c58eb6c388161b932be1ac408791ee379e45afdcb69a78d17577052d475f841ae39de6fad6a647339d4e3dbcdf8386be514017eb7d WHIRLPOOL 784fcf9793027462ddbc2d17133ea6fc31c8e57b944a39cf94c700877c6c83dacdf3bdfdead7b3871593e5e6923b565212ac86398fac4b18ce73338c20f1e27e
 EBUILD yajl-2.0.4-r2.ebuild 1018 SHA256 71d8264d7c4b857df0f042f31911d39edae5221a1be314f765427a69ce670afa SHA512 c55bea6b737fd89729aa938ab4c8f44a41e7e8549e1e848d5e0e872c8e1e5bbe78d50109323a49de6dd7f07cc5ae3f2701d9b2563047e97849e2b240b0516427 WHIRLPOOL 16cab42cd1b42ebd959fc6feef50cfaf190ef8598119317f31b8a2317e083cd1e55d84cfd313239ef0862cc0c7cc4f824679eca2a2328dc7b54269f3f6cfb87e
-MISC ChangeLog 5608 SHA256 f2b04fe88816d6d39a03895c1d348bf66c472a46ca80c925890085de5166c463 SHA512 265bdd1ad3b19e1b343b90e42bddd5391abc47c55c8689d57a7b602966f4bea1697611fe66e95c03dc26f560d4e3affed479dd8977871301147ec363a9672ce8 WHIRLPOOL b0e03f2798cb337457d9873c2ee93f4edafe6de6fad3709a2716d9538a7ba797996c9057d7777427839bf742798485a5eb27e423fa3fef360d994ecc44f4c85c
+EBUILD yajl-2.0.4-r3.ebuild 1071 SHA256 312caafc108617a716594e161f50fb4f04b91b96c063a443119d58d71f72e937 SHA512 e8588392cc0b0d9493a64d21563db0b408ab5160e34c83e84efaac22936eb96c6763f9f1afac1f21eb0b3a71f221e928283e19258e15d6669fa126bf28d7591a WHIRLPOOL 81f458a5a044742eca43347a99691f6deb43d0e0504b013147876d6ab31059058729cd14c2dd236f070b9aaf9b8264d3a1c85fb132a7dac379f5271dca3ba589
+MISC ChangeLog 5806 SHA256 76a6e9e27b4d4df6ab6f8f8f5394a9e7ee80a72e49e9a361559910c3c28dc145 SHA512 4ddc7a395db096ed7c51c864bf6fe5b29bd8efdc4ae17a87114a64f8200d12ce6ea8dbff89badba5b7ceb999eb502754173bdfa2c2e31217736b6f8ccad71b20 WHIRLPOOL 3b2bf89462a4626bdb6ac09f9df4ab60f914e09fee6d53e2a7aa3202c45bd7a1070899cc3591b7e12aac04e33684905117f36eb9102cd29d1268ac0541c4febf
 MISC metadata.xml 243 SHA256 c6a73a4f1467a2fb881fe3bf391e72dc518cfa52863fc71f9e4d2c8fb9923e5d SHA512 e4c766d1ba677f2aa37e86ac1016cf3bf36a4aabb432594f103bf57ca36b2db273be18ec09d38982251452d748512ca00ea652a6335e2f2ac775b5a7d5a5eac7 WHIRLPOOL c5dd222916a26d80b068f132d9358e65abac7585c3ecce0f9c4de0f795dee831be73b6c9a2d8d62313b3c9454d557f88a2881575db58d65d165cea550960786b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlHKwjYACgkQknrdDGLu8JCPJwD/fW/Fpfj/jV87QqhKeCGt+62D
-WHrmc2pdS2SJXHcx5bcA/RUfLtJbgMqG1CCQgdoShSQkXI4UKeSMUkqovrKkcvMI
-=TCbB
+iQJ8BAEBCABmBQJTnzfgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgBTEQAJRigdNGmG30Y5ef2EqXVGDR
+jkKG9G0oOpTR7l0hxZWpHrQfIGK9E09aEAoWP3FAYg/pSVOrQw7rNppc3BnQh/o+
+vGszGaQgZoRlf+Xg2gkkoiMefwCCotVq3c/1sMBpnaJhm0CyyxxhJkBNE1lGlqiO
+edSNH4rtkw7y9hiNhpCNmangLsL9SBbop+bARf4WoksZEvsQYYIM0WihRn3STtN0
+gjKo3+rZsoxb1dgEkyC2H3n8QxJizFZZd9rogYIBBGIVBdhzqvy1GEr9e9+8PeiN
+akJkeQKZc2W4TmY9eFk0R9kCKfXjN617zWqfaq5pkgcuKW3yk+Vx7sg8Ju+AT6yx
+0cQuWmyYYa93efl59OIdNeHeCAtHPSk5Dy5WDQxxRZbIQ6ETXjYrudJldpNajJ6F
+rCMxLaNg1QZMU69x6Xsm3yE/5GFJuyGKlZCS+IzGW//35T9Q+b8wy1nius6AJOeZ
+ms/J5jUhEk29+qp+HQW4/2N6vv7W30atYPoTp9M3uD+B11IW7rqSsoV6xqrHDpuZ
+g7ya5jbOv+vxqICLp5VPC1B8InrZtjwCt1gEew7UWr0z9sCz6Qcjw+nefMs1GVZh
+fDsMX3Lg9YK8v2XE1ruiXhEwYzzO4o/sPnRC7wvRxyKVfkxToC1tOgk1Q5KDFhME
++im0iwNlFKq7iaALMjqa
+=JHEk
 -----END PGP SIGNATURE-----
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
+}