Add USE=static-libs and fix linking of jq against the dynamic lib; fixes from Chromium OS.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 77 insertions, 10 deletions

diff --git a/app-misc/jq/ChangeLog b/app-misc/jq/ChangeLog
index a6791d1f9408..3e24ed8db37a 100644
--- a/app-misc/jq/ChangeLog
+++ b/app-misc/jq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/jq
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.15 2014/12/11 07:33:30 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.16 2015/04/07 04:10:41 vapier Exp $
+
+*jq-1.4-r1 (07 Apr 2015)
+
+  07 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/jq-1.4-dynamic-link.patch, +jq-1.4-r1.ebuild:
+  Add USE=static-libs and fix linking of jq against the dynamic lib; fixes from
+  Chromium OS.
 
   11 Dec 2014; Tim Harder <radhermit@gentoo.org> -jq-1.3.ebuild,
   -files/jq-1.3-automake-1.14.patch:
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index ea01b0ae0195..2eb12766bda9 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX jq-1.4-dynamic-link.patch 232 SHA256 dbc4f3a9f0e509e805a7a6966a37b53aaa00d0e0f06cc58d0a392b27a79e1a2b SHA512 d4c16d04a74ae9f119d6c513b4f401f90dbe88af0d03b0060ac29a57849c05a139eafc3ebfb7d815212858d8bfec981556874151351c0c56830cd0380679fc4f WHIRLPOOL fa7f215b94fa22010f55259379f069d68f2012d73477325ad2ceebe89b3ff81c19772aa5c248c2ecf3946d9200321deaf7fc43976355a9e4137a25e681527200
 DIST jq-1.4.tar.gz 578317 SHA256 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d SHA512 02e601b713a3249bcfe5373153dff38a63bf504895181ca3f691dbf033b407373a9c5880001bbd1954123cdf89f4fe75e2a5168e7a7cf13b3f7355dc18f92458 WHIRLPOOL 93c85a40d8aaf36d1f846ee9050aebe32a3a135e89a64647688b447af8733d210a4716d4ee62271a7d33f2e498e8aee7b2e88ed5373d0ec07e810215c1d288ab
+EBUILD jq-1.4-r1.ebuild 927 SHA256 a71c92ecf11f6991450cb7ab972cb177410fd258a779e9c1cb621a3d49c8ffc1 SHA512 d3d769168dc49920c348ea2d5436d04b5e7deb0ebf6e5f036235cd566faaeb2d9208f1b004525f610db7c6deb95e7b89d327b31c027b9e58c04a36575ec82995 WHIRLPOOL efdb424a68d80a1b6b9e3a65cc62e371a0933ed97924f6e3b20f58fb457cf43a6f3f32396b1eb2442b2caab03cdc033bcd756835f6984284ef711330fefb5d36
 EBUILD jq-1.4.ebuild 737 SHA256 7b81ea8867a0df389018a5af0af2c6752e201823b434e813c160381df59999c3 SHA512 ce112fadfbae714399488aba693d8b73fc9a55270ee508e3500ffcae1d303895e7e21c006f64c0a98368347eb8607ac328498c227ab284e78e9807adaff62146 WHIRLPOOL 3f739d26f61984460cc17e29605e50c25e6becd6190eb6b2cd75e85c008747a6ea111db1f67c272ca5bef6eab02d61d1ad3dd300d3e5bbd41fa8b00037214e49
-MISC ChangeLog 1952 SHA256 849f9f8a0dc96480c786ca75050556886b7711a4b225d2d0efc4e6cd2ea8c37e SHA512 068c88784ea64131bf20c92729034ab4413c7c306dbfb75d8a86a2bd1412c34ee9d223543ee7829f375d892044e4d49e37aa8ec4f6a7f5c711146c59c505b7df WHIRLPOOL 1f9477d1601427a541b234058e06b88b2586c753d80335891409deb1abbe532518ef69fd61bd8b80db123264dbd445fe790f4b81fbfc0ed5f34a8662d4c37242
+MISC ChangeLog 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUiUjUAAoJEEqz6FtPBkyjIuQH/21rZNIPOiWDMc/Z3gBy1pnW
-p+aVt/Db1jcDvxQEaxMnqLAjicvYI9YLSZ4+XyG+zv5mcgBmtGUtOwANbmbWfWVE
-n5tzeuHcS75TeAKM2WTp9xl91g4JxeJbawcc1yRNdN+hjSiIsDYVubJ7M2znjk3B
-2jCrU2DLTtJDzwrU2FKjvDqPOJ7jV5LfGKngD/TL7ExiHvllIRUlAt8osiPqeH69
-sctRlgWBTExz5QlPH+PcjRXnTlZpUYRG1GlMWJIr+R0NnOL+1y0AqJa3DaGxpwyU
-5SJW5rGaUouZOuVi423CjslheG+cgXZMy5DC5lh6Rhr/gHMivWukHwk6q6dzUnQ=
-=pwm9
+iQIcBAEBCAAGBQJVI1jCAAoJEPGu1DbS6WIAIaMP/3R765ZCN+w5z4fGZabHc01D
+43BK1iPf54LScWtJ2RGQiK2DEqaeN+XpwLahnr5kKzqD5WoxZz825q0DIAWV7GCn
+FyjyjM1AhVyTzHFGA8Mwg8VM6iSFWrKpargkN90HC+MVcm8S4TI14NFtlgxpauHk
+2bD6y/nTSARuG1TtinCwEdPmHmHuBigMi4QSTU6bOps9KxZBirauqlXT+OKLFW6K
+byAxgblKMfleDSqwN3mqHKs30eiApKJzv15sYT2kAO9f/WMabxZQQqcaBEVTJ0bh
+2lYveBqg9cByeVH7ad3zW9AaCHjDMMlLBsxWmZX/VCsBYnfjBVLrrhQrsiRNDkpI
+9Ax21p9aQysZ7SWLKeoLM3l49N7KNYU0f74Ot70l9LDvvS6eR4bO9ueQa/3JX9aG
+R0C4pOmi/zPiBPq2nit/ROtYcRvIjux0juDtirXCv0TnHiZtjBAfanxAb/QlbpMg
+Y2TQIu3ghAmLu5iVMPVOatNAX8CLr5+2CRf3RGKAPSlJ2BCv8VyhbYJt6DB/PO1X
+4BXlQfnOzgMEPAWjUnWJB9TjElZzWOwjYH6h3ZI/VqGj6F7Bk6G3nPLSJZ4KNvm7
+6BU5U3d+urTUXDTH1PY+vNXmjrIPjAg4nFHIE8/nK2hHsVGSIEbQbI2F5UDgbgM+
+FK9ZdIERICzG/V1DrDi8
+=PWp/
 -----END PGP SIGNATURE-----
diff --git a/app-misc/jq/files/jq-1.4-dynamic-link.patch b/app-misc/jq/files/jq-1.4-dynamic-link.patch
new file mode 100644
index 000000000000..b958a1556125
--- /dev/null
+++ b/app-misc/jq/files/jq-1.4-dynamic-link.patch
@@ -0,0 +1,12 @@
+do not statically link libjq since we install it
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -53,7 +53,6 @@
+ 
+ bin_PROGRAMS = jq
+ jq_SOURCES = main.c
+-jq_LDFLAGS = -static-libtool-libs
+ jq_LDADD = libjq.la -lm
+ 
+ ### Tests (make check)
diff --git a/app-misc/jq/jq-1.4-r1.ebuild b/app-misc/jq/jq-1.4-r1.ebuild
new file mode 100644
index 000000000000..404b07be4c35
--- /dev/null
+++ b/app-misc/jq/jq-1.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/jq-1.4-r1.ebuild,v 1.1 2015/04/07 04:10:41 vapier Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A lightweight and flexible command-line JSON processor"
+HOMEPAGE="http://stedolan.github.com/jq/"
+SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	test? ( dev-util/valgrind )"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	epatch "${FILESDIR}"/${PN}-1.4-dynamic-link.patch
+	eautoreconf
+}
+
+src_configure() {
+	# don't try to rebuild docs
+	econf \
+		--disable-docs \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name libjq.la -delete
+}