From abdf898ec5a8be708f1e04b13495e180d8b766f8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Jun 2015 14:31:55 -0700 Subject: [PATCH] bump(app-misc/jq): sync with upstream --- .../portage-stable/app-misc/jq/ChangeLog | 18 ++++++++-- .../portage-stable/app-misc/jq/Manifest | 35 +++++++++---------- .../jq/files/jq-1.3-automake-1.14.patch | 19 ---------- .../jq/files/jq-1.4-dynamic-link.patch | 12 +++++++ .../jq/{jq-1.3.ebuild => jq-1.4-r1.ebuild} | 19 ++++++---- .../portage-stable/app-misc/jq/jq-1.4.ebuild | 4 +-- .../metadata/md5-cache/app-misc/jq-1.4 | 4 +-- .../md5-cache/app-misc/{jq-1.3 => jq-1.4-r1} | 10 +++--- 8 files changed, 67 insertions(+), 54 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.3-automake-1.14.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.4-dynamic-link.patch rename sdk_container/src/third_party/portage-stable/app-misc/jq/{jq-1.3.ebuild => jq-1.4-r1.ebuild} (58%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/{jq-1.3 => jq-1.4-r1} (75%) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog b/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog index 9da519228f..3e24ed8db3 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog @@ -1,6 +1,20 @@ # 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.13 2014/07/11 22:32:11 chutzpah 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 + +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 -jq-1.3.ebuild, + -files/jq-1.3-automake-1.14.patch: + Remove old. + + 11 Dec 2014; Tim Harder jq-1.4.ebuild: + Stabilize for amd64 and x86. *jq-1.4 (11 Jul 2014) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/Manifest b/sdk_container/src/third_party/portage-stable/app-misc/jq/Manifest index b393076c85..2eb12766bd 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/Manifest @@ -1,27 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX jq-1.3-automake-1.14.patch 476 SHA256 eff902e6cedaa3bfadc032fc1fe6bd729e46545bc47e48558c1d0e291b85e499 SHA512 63ace81c403c6578c881a0c94dab179a539323e9d593038083f342aeeac1dfe955cb4527074533c17dcb7cedf9328be63199f32d874cec495d797ee91a746536 WHIRLPOOL 9665fd6967170c91acf66bc15d70bef5ce680785004bfce03c51c22cf77c443bea346ee775b3171b97f372a75cb0a8daa708ce626dcc63056ec81165ca9a4c1f -DIST jq-1.3.tar.gz 333678 SHA256 623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7 SHA512 50a3502fc6f6d571d4dff47fae59b47c7171d094fb953be8bf8185e21e7b4bbfe8702a4d668214cb6e5d8d7889b49c9b34ff7e48fd5583369b2265d0eb2d3578 WHIRLPOOL 75b8fdb8c5b9af740e4ffdd7a2dbb2b07dae9383b36ea4a13718e7b4281ea83c88375d4692fe303e67ba0368cdc6aeea1b4c9d9c2c6b4fbde17b0eaa4d6582ba +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.3.ebuild 784 SHA256 d916345f54d8442676d0e1100b46ac6f143ca8422af4e450a5e6d7bf5deb80f9 SHA512 acc43aade5c54a72235816fab13037344f8426f311822d76c91e768d45767c511658bdaf4a8d4e6411e4047f55096c00bf02956bb99e0e254b0288720d0a3e62 WHIRLPOOL 0dd15b7cd4462417abc45523dad592492cf975bc19f66d086de838d222c75868c5164fdc6ab4534885b750ab49a1308bd5a9d8c6e59d3fb0538266a7534c71a0 -EBUILD jq-1.4.ebuild 738 SHA256 51396206c489897e0e38f9468c4f4618a19ceb625feadf80fae647c1c3c2aab2 SHA512 ffa992174a12fbe61e291956f4e1b319671fe24505acacae978bc93415b04db89f693c46c0703be222f365268ef77925882f0e91e8007a905256655016185b08 WHIRLPOOL 2995f6366d9c8b3edf9f7a9b42bb9b470c04c48db4488e3f625b504e35c7b18d5c202521d661e597293f39734175f0f2703b97a7e888d256d9756695cee50455 -MISC ChangeLog 1738 SHA256 573a253c3311c50121988f10cbf9ac53eb4da4dfe7be4663f2dd8fb041be37b9 SHA512 676de9313ae918e508296a598b8d4cd6fe97e126702b3b2b71fd307120cc3e6151497a455d5c1ad5e2c699ddf39622df8d149dcb4a34e1ab131e7a7bfca24dfb WHIRLPOOL 3447133ec30878c29e0b36448abec6febca353c87ae7cd5c0f51b5f29d0b548be51a18f27868e703c001a92fc9c4779403a878aae7788be4f928241b9494b66e +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 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTwGXsAAoJEHy/RO9cNQiDXfgP/R/c0USm+x+So90eqAvsTivn -jTrhN4SVpVaaZbZ3d4MqlTvJF9NZ+T6Rc2Ik9XtQA6B7pppgbBrAHcn3dQt5LEkv -qg4QyR2y+o1g8PE8fjcDPVHOQJEwf+vh+AD9OJ5pTncrOMj/PPQO92iE0qrmk7aV -yEXrmHMT/0q/xZOYvsBA50/lkwE7wP+yqv8KAaMsRVYuoPmfZn/SQMhXkcNgSzXQ -W43AyKsJnww8B1qXkAvBdNP9whTiig+4bctM1qT/qvLyXgNuS4pMcILehPrhPDJI -XxCELk8BSy5czXVIzUvjZcyGI/OP6+TQj88nf0diyfSj9zrzNJhAuI92qr4eFI2h -3VP3eIwtaEd+8htD4S9yhWHdX/jQ880mT2OWpV6uTrnNK93bGJrh1xUjptilfW4e -RC45wrFlSq2rUEMfC8xgbphmN4Lpy/dprEA/SGtTj89KrZuESSyy2b/TvKaUBxU3 -0Q5dNN0WqGx906i1emM6LhKmHaY03+xjabmQ+YF1iW+d/6QaNGOe0fq3pAji1n18 -miExpaT5nskepd8FKBWNBmQyDAVoFSoMHedxcsxKDXL17Fpa6t6y/5K1zBZPQQps -SebUGwEGVvAsH34YTTlQD6ESIPkXzOsQ8R+R5uJ7lPssVYswYaGHu0AEKwyaXSuk -E0aULB+G8ZFAj++vhzgu -=aLEZ +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/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.3-automake-1.14.patch b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.3-automake-1.14.patch deleted file mode 100644 index 343e7ca418..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.3-automake-1.14.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- jq-1.3/configure.ac -+++ jq-1.3/configure.ac -@@ -4,7 +4,7 @@ - dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 - AC_PREREQ([2.61]) - AC_CONFIG_AUX_DIR([config]) --AM_INIT_AUTOMAKE([parallel-tests foreign]) -+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall]) - AM_SILENT_RULES([yes]) - AC_PROG_CC - AC_PROG_CC_STDC -@@ -59,7 +59,6 @@ - - dnl AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE([-Wall]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT - diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.4-dynamic-link.patch b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.4-dynamic-link.patch new file mode 100644 index 0000000000..b958a15561 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.3.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.3.ebuild rename to sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild index eb756fa9db..404b07be4c 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.3.ebuild,v 1.5 2013/12/10 00:52:43 radhermit Exp $ +# $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 @@ -12,8 +12,8 @@ SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz" LICENSE="MIT CC-BY-3.0" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs test" DEPEND="sys-devel/bison sys-devel/flex @@ -23,11 +23,18 @@ DOCS=( AUTHORS README ) src_prepare() { sed -i '/^dist_doc_DATA/d' Makefile.am || die - epatch "${FILESDIR}"/${P}-automake-1.14.patch + epatch "${FILESDIR}"/${PN}-1.4-dynamic-link.patch eautoreconf } src_configure() { # don't try to rebuild docs - econf --disable-docs + econf \ + --disable-docs \ + $(use_enable static-libs static) +} + +src_install() { + default + use static-libs || find "${ED}" -name libjq.la -delete } diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4.ebuild index 219173bfeb..e7608f691a 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/jq-1.4.ebuild,v 1.1 2014/07/11 22:32:11 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/jq-1.4.ebuild,v 1.2 2014/12/11 07:32:54 radhermit Exp $ EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz" LICENSE="MIT CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" DEPEND="sys-devel/bison diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4 index 00e4f7d524..d2e3ddf7fe 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4 @@ -4,9 +4,9 @@ DESCRIPTION=A lightweight and flexible command-line JSON processor EAPI=5 HOMEPAGE=http://stedolan.github.com/jq/ IUSE=test -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=MIT CC-BY-3.0 SLOT=0 SRC_URI=http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz _eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 -_md5_=9fae80163098fefe921cad5b7f54e470 +_md5_=d014455a9ab21bfc4e06fcbe6972259f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 similarity index 75% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.3 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 index 7bdf58d910..f6ae06168d 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 @@ -1,12 +1,12 @@ -DEFINED_PHASES=configure prepare +DEFINED_PHASES=configure install prepare DEPEND=sys-devel/bison sys-devel/flex test? ( dev-util/valgrind ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=A lightweight and flexible command-line JSON processor EAPI=5 HOMEPAGE=http://stedolan.github.com/jq/ -IUSE=test -KEYWORDS=amd64 x86 +IUSE=static-libs test +KEYWORDS=~amd64 ~x86 LICENSE=MIT CC-BY-3.0 SLOT=0 -SRC_URI=http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz +SRC_URI=http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz _eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 -_md5_=973e8f822010de590a92867d9a7ab3b7 +_md5_=6c799d27ded1bf4f4ef633173a39948c