From 37a6ffeac35bb03e1e532745c3151ac8fc1eb186 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 2 Mar 2016 14:06:51 -0800 Subject: [PATCH] bump(app-misc/jq): sync with upstream --- .../portage-stable/app-misc/jq/ChangeLog | 143 ++++++++++++------ .../portage-stable/app-misc/jq/ChangeLog-2015 | 69 +++++++++ .../portage-stable/app-misc/jq/Manifest | 13 +- .../jq/files/jq-1.5-dynamic-link.patch | 13 ++ ....5-remove-automagic-dep-on-oniguruma.patch | 58 +++++++ .../app-misc/jq/jq-1.4-r1.ebuild | 6 +- .../portage-stable/app-misc/jq/jq-1.4.ebuild | 4 +- .../app-misc/jq/jq-1.5-r1.ebuild | 53 +++++++ .../portage-stable/app-misc/jq/metadata.xml | 7 +- .../metadata/md5-cache/app-misc/jq-1.4 | 6 +- .../metadata/md5-cache/app-misc/jq-1.4-r1 | 8 +- .../metadata/md5-cache/app-misc/jq-1.5-r1 | 13 ++ 12 files changed, 328 insertions(+), 65 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog-2015 create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-dynamic-link.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r1 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 3e24ed8db3..9d6ca0ff94 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,69 +1,118 @@ # ChangeLog for app-misc/jq -# 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 $ +# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 +# (auto-generated from git log) -*jq-1.4-r1 (07 Apr 2015) +*jq-1.4-r1 (09 Aug 2015) +*jq-1.4 (09 Aug 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. + 09 Aug 2015; Robin H. Johnson + +files/jq-1.4-dynamic-link.patch, +jq-1.4.ebuild, +jq-1.4-r1.ebuild, + +metadata.xml: + proj/gentoo: Initial commit - 11 Dec 2014; Tim Harder -jq-1.3.ebuild, - -files/jq-1.3-automake-1.14.patch: - Remove old. + This commit represents a new era for Gentoo: + Storing the gentoo-x86 tree in Git, as converted from CVS. - 11 Dec 2014; Tim Harder jq-1.4.ebuild: - Stabilize for amd64 and x86. + This commit is the start of the NEW history. + Any historical data is intended to be grafted onto this point. -*jq-1.4 (11 Jul 2014) + Creation process: + 1. Take final CVS checkout snapshot + 2. Remove ALL ChangeLog* files + 3. Transform all Manifests to thin + 4. Remove empty Manifests + 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ + 5.1. Do not touch files with -kb/-ko keyword flags. - 11 Jul 2014; Patrick McLean +jq-1.4.ebuild: - Version bump (bug #516018). + Signed-off-by: Robin H. Johnson + X-Thanks: Alec Warner - did the GSoC 2006 migration + tests + X-Thanks: Robin H. Johnson - infra guy, herding this + project + X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo + developer, wrote Git features for the migration + X-Thanks: Brian Harring - wrote much python to improve + cvs2svn + X-Thanks: Rich Freeman - validation scripts + X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 + work in migration + X-Thanks: Michał Górny - scripts, QA, nagging + X-Thanks: All of other Gentoo developers - many ideas and lots of paint on + the bikeshed - 10 Dec 2013; Tim Harder -jq-1.2.ebuild, - -files/jq-1.2-makefile.patch: - Remove old. + 24 Aug 2015; Justin Lecher metadata.xml: + Use https by default - 10 Dec 2013; Tim Harder jq-1.3.ebuild, - +files/jq-1.3-automake-1.14.patch: - Fix build with automake-1.14 (bug #493804). + Convert all URLs for sites supporting encrypted connections from http to + https - 04 Jul 2013; Agostino Sarubbo jq-1.3.ebuild: - Stable for x86, wrt bug #474936 + Signed-off-by: Justin Lecher - 28 Jun 2013; Agostino Sarubbo jq-1.3.ebuild: - Stable for amd64, wrt bug #474936 + 24 Aug 2015; Justin Lecher jq-1.4.ebuild, + jq-1.4-r1.ebuild: + Use https by default - 27 May 2013; Tim Harder jq-1.3.ebuild: - Don't try to rebuild docs (bug #471370). + Convert all URLs for sites supporting encrypted connections from http to + https -*jq-1.3 (23 May 2013) + Signed-off-by: Justin Lecher - 23 May 2013; Tim Harder +jq-1.3.ebuild: - Version bump. + 24 Aug 2015; Mike Gilbert metadata.xml: + Revert DOCTYPE SYSTEM https changes in metadata.xml - 01 May 2013; Tim Harder -jq-1.1.ebuild, - -files/jq-1.1-makefile.patch: - Remove old. + repoman does not yet accept the https version. + This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - 01 May 2013; Agostino Sarubbo jq-1.2.ebuild: - Stable for x86, wrt bug #468074 + Bug: https://bugs.gentoo.org/552720 - 01 May 2013; Agostino Sarubbo jq-1.2.ebuild: - Stable for amd64, wrt bug #468074 + 22 Dec 2015; Fabian Groffen jq-1.4-r1.ebuild: + marked ~x64-macos - 07 Feb 2013; Ulrich Müller jq-1.1.ebuild, jq-1.2.ebuild: - Move Creative Commons licenses to shorter names. + Package-Manager: portage-2.2.20-prefix -*jq-1.2 (04 Jan 2013) +*jq-1.5 (09 Jan 2016) - 04 Jan 2013; Tim Harder +jq-1.2.ebuild, - +files/jq-1.2-makefile.patch: - Version bump. + 09 Jan 2016; Patrick McLean + +files/jq-1.5-dynamic-link.patch, + +files/jq-1.5-remove-automagic-dep-on-oniguruma.patch, +jq-1.5.ebuild, + metadata.xml: + version bump to 1.5 -*jq-1.1 (23 Oct 2012) + This also fixes bugs 559334 and 566140, and adds a new "oniguruma" USE flag. + + Package-Manager: portage-2.2.26 + + 09 Jan 2016; Patrick McLean jq-1.4.ebuild, + jq-1.4-r1.ebuild: + Update SRC_URI in 1.4 and 1.4-r1 + + Gentoo-Bug: 566140 + Reported-by: Gaetan + + Package-Manager: portage-2.2.26 + + 24 Jan 2016; Michał Górny metadata.xml: + Unify quoting in metadata.xml files for machine processing + + Force unified quoting in all metadata.xml files since lxml does not + preserve original use of single and double quotes. Ensuring unified + quoting before the process allows distinguishing the GLEP 67-related + metadata.xml changes from unrelated quoting changes. + + 24 Jan 2016; Michał Górny metadata.xml: + Set appropriate maintainer types in metadata.xml (GLEP 67) + +*jq-1.5-r1 (01 Feb 2016) + + 01 Feb 2016; Patrick McLean +jq-1.5-r1.ebuild: + Revision bump, update bison dep to >=3.0 add rdep on oniguruma + + Gentoo-Bug: 573058 + + Package-Manager: portage-2.2.27 + + 01 Feb 2016; Patrick McLean -jq-1.5.ebuild: + Drop ebuild for 1.5 since -r1 fixes some depdency issues + + Package-Manager: portage-2.2.27 - 23 Oct 2012; Tim Harder +jq-1.1.ebuild, - +files/jq-1.1-makefile.patch, +metadata.xml: - Initial import, ebuild by me. diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog-2015 new file mode 100644 index 0000000000..3e24ed8db3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/ChangeLog-2015 @@ -0,0 +1,69 @@ +# ChangeLog for app-misc/jq +# 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) + + 11 Jul 2014; Patrick McLean +jq-1.4.ebuild: + Version bump (bug #516018). + + 10 Dec 2013; Tim Harder -jq-1.2.ebuild, + -files/jq-1.2-makefile.patch: + Remove old. + + 10 Dec 2013; Tim Harder jq-1.3.ebuild, + +files/jq-1.3-automake-1.14.patch: + Fix build with automake-1.14 (bug #493804). + + 04 Jul 2013; Agostino Sarubbo jq-1.3.ebuild: + Stable for x86, wrt bug #474936 + + 28 Jun 2013; Agostino Sarubbo jq-1.3.ebuild: + Stable for amd64, wrt bug #474936 + + 27 May 2013; Tim Harder jq-1.3.ebuild: + Don't try to rebuild docs (bug #471370). + +*jq-1.3 (23 May 2013) + + 23 May 2013; Tim Harder +jq-1.3.ebuild: + Version bump. + + 01 May 2013; Tim Harder -jq-1.1.ebuild, + -files/jq-1.1-makefile.patch: + Remove old. + + 01 May 2013; Agostino Sarubbo jq-1.2.ebuild: + Stable for x86, wrt bug #468074 + + 01 May 2013; Agostino Sarubbo jq-1.2.ebuild: + Stable for amd64, wrt bug #468074 + + 07 Feb 2013; Ulrich Müller jq-1.1.ebuild, jq-1.2.ebuild: + Move Creative Commons licenses to shorter names. + +*jq-1.2 (04 Jan 2013) + + 04 Jan 2013; Tim Harder +jq-1.2.ebuild, + +files/jq-1.2-makefile.patch: + Version bump. + +*jq-1.1 (23 Oct 2012) + + 23 Oct 2012; Tim Harder +jq-1.1.ebuild, + +files/jq-1.1-makefile.patch, +metadata.xml: + Initial import, ebuild by me. 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 4b6accf1b3..722e72ceef 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,6 +1,11 @@ AUX jq-1.4-dynamic-link.patch 232 SHA256 dbc4f3a9f0e509e805a7a6966a37b53aaa00d0e0f06cc58d0a392b27a79e1a2b SHA512 d4c16d04a74ae9f119d6c513b4f401f90dbe88af0d03b0060ac29a57849c05a139eafc3ebfb7d815212858d8bfec981556874151351c0c56830cd0380679fc4f WHIRLPOOL fa7f215b94fa22010f55259379f069d68f2012d73477325ad2ceebe89b3ff81c19772aa5c248c2ecf3946d9200321deaf7fc43976355a9e4137a25e681527200 +AUX jq-1.5-dynamic-link.patch 292 SHA256 c4000f13ea2e0fe85e4d89470af17b7528cb87b2ca921fb990815bf6abcfad6d SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee WHIRLPOOL 29f3e6011c4f27d9339a0692685285ecee057aff58ba289146f6e36a31289c3146b1bc760948a1e55bdd5f6283338f2abbd3f5cbdab6e67479c5986c49e0f11a +AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 SHA256 d5b55b63332899e9eff705fbb32fb1d790e2c637ff3be2659c47ecf8b17bc6c2 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d WHIRLPOOL 903ce507584d94ac49eaaa33c414e9fdca1a7f9ebbf185038ccb232b78ac6c04d7782458b97db0e983037ff4ab63e3e1cdd8d164191b7b22c020930d25baf913 DIST jq-1.4.tar.gz 578317 SHA256 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d SHA512 02e601b713a3249bcfe5373153dff38a63bf504895181ca3f691dbf033b407373a9c5880001bbd1954123cdf89f4fe75e2a5168e7a7cf13b3f7355dc18f92458 WHIRLPOOL 93c85a40d8aaf36d1f846ee9050aebe32a3a135e89a64647688b447af8733d210a4716d4ee62271a7d33f2e498e8aee7b2e88ed5373d0ec07e810215c1d288ab -EBUILD jq-1.4-r1.ebuild 832 SHA256 3419a7529ca41454cb4c3d949c9dafd775cbc3a6ebe87c97efab448b883786e4 SHA512 4806c0485a504a3f4416200ad5e8f39bf7f61e764f2e5771115dc6fbcbab968fa271c9569db00ea3836310ee2410cc46b7fc63334efbb09b06b0b069e0e7a1eb WHIRLPOOL 88b54ff9aaf27a1b20d00d9297ea73d241e932329fad33d33b276064d5472f91c9ba49fee62dc5e77ce700238d4956348db1f175266b2aac2ea41779f7a20204 -EBUILD jq-1.4.ebuild 642 SHA256 cb6350c8e918eb9e39f6196ad3ed478fd20abc1f484b16567941d90bcfaef38b SHA512 fa960d8c1a7cf766699087db810ef4761142b79b3a9f2df6104372d68eb97764aa2a45e33273bb3de0b097a23bc24cd83d0e77e3717effa6b9ac3800191551cc WHIRLPOOL 77ba70edf6de4fe322a154c4af7e8073ec056838bbbdd19984097547f38d6f886584805c95d3f30188d7e4f27865fdacf6fb971d1686d65748e3918ae75de9b6 -MISC ChangeLog 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08 -MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2 +DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907 +EBUILD jq-1.4-r1.ebuild 852 SHA256 2cd732ef8eb9e415cfd72665f9e12184f2dcf2972a10154d25190ec44a382b2e SHA512 45a066036354a0ef24a7956537a59c5f4c0139a709228939e2fe966326dba5eb23309a18c2cb52e0edbec4b065de01f588d23ba5980ecea1ad3b45af1d681c15 WHIRLPOOL 670bdb2dfb974ce1882ae1802a5053427a7ce2c5bc09877399ca3991d610887e4cbb27643081e462362defd93c41defa30c78a8be3f597c4c7013f0aee44cd62 +EBUILD jq-1.4.ebuild 651 SHA256 43181180141fa4db04987979f289c505b73700e3e168c688ae1176902c1ab066 SHA512 4876194bc95a00060ad7d782ded2706c8e663f326a1189b81cf8f18d9f84921a233b3bf08b8ca1c17aa732a2a54d9358ca783a164050e617fc1a673d51b04184 WHIRLPOOL 239bafe801745cc496347025db5cec6950e73d6340433f93669fce2178a5e15e6a00d7887595b1e07984efb6374230a59af5a16596a78cf2c8effe54dbf5452a +EBUILD jq-1.5-r1.ebuild 1179 SHA256 b06ed59e186353dd2abf5d8b42d25ac412e50cf37b584ee3cdc16b27d8761713 SHA512 bb769a67a11413286d90e6ba36538d9e981b32e339b6af8a3c632cdc2ce5a0808180aeb5accde3e5057f9481b6a79e08e50d1daa679e661ba3e70b0ec71df5fd WHIRLPOOL 9fa21b8b5b09264b6bac82ccecbd34e2216617176f601c946581ae87959e2197b20db34a8acd841496fd775795886ee7f32b06c34457051ad768cb6d21d8d878 +MISC ChangeLog 3946 SHA256 38b4b7b3aacc2f101fe05924fe44dded900dbee0578d584b6e439393155b7487 SHA512 f66abeb56cce4030ee6243b7baf63b4bc2b72829cefd1576d5f25b60cfa63d03838090355c7476b611b1066e367a6fc61c76492e468cd3e52096b558c462d067 WHIRLPOOL 6d3ca998b2e2a8adcfc92d99efc3865afafded3199d5b344b565360d48e45a20e3e87279f2106dc64bee249b109c8d53ca6b57cd7c941f55d04813cedd706129 +MISC ChangeLog-2015 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08 +MISC metadata.xml 347 SHA256 9ee404d621988a6d22c3726d75f9af3552a7e1d4675a78911e23b9910fa7696b SHA512 82b1311616fcfd74119bfe3e926bda3ac5f81cbbf5b6e81b277fc49edbf9e007cd625fa79d99dbd8e1ea31edadc5b5ccb80bcac9376730b37c0836c71d689e86 WHIRLPOOL 1ac47bc7ffd1f8c30a71ad364f0a7f4bb6dfd448526a876fba072e8cb6d213d1ec71b82d4a8955fa1f7f43334efceba07810255cc166bfe414b679b1300bda16 diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-dynamic-link.patch b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-dynamic-link.patch new file mode 100644 index 0000000000..dbc2f11acb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-dynamic-link.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index c3a771f..274c01e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -84,7 +84,7 @@ main.c: version.h + + bin_PROGRAMS = jq + jq_SOURCES = main.c version.h +-jq_LDFLAGS = -static-libtool-libs ++jq_LDFLAGS = + jq_LDADD = libjq.la -lm + + if ENABLE_ALL_STATIC diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch new file mode 100644 index 0000000000..95ba0e0580 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch @@ -0,0 +1,58 @@ +commit 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2 +Author: David Tolnay +Date: Sat Nov 21 10:05:37 2015 -0800 + + Support --without-oniguruma + +diff --git a/configure.ac b/configure.ac +index 9e2c8cf..7f6be34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,27 +52,26 @@ fi + AC_ARG_WITH([oniguruma], + [AS_HELP_STRING([--with-oniguruma=prefix], + [try this for a non-standard install prefix of the oniguruma library])], +- [ONIGURUMAPATHSET=1], +- [ONIGURUMAPATHSET=0]) +- +-if test $ONIGURUMAPATHSET = 1; then +- CFLAGS="$CFLAGS -I${with_oniguruma}/include" +- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" +-fi +- +-# check for ONIGURUMA library +-HAVE_ONIGURUMA=0 +-AC_CHECK_HEADER("oniguruma.h", +- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])) +- +-# handle check results +-if test $HAVE_ONIGURUMA != 1; then +- AC_MSG_NOTICE([Oniguruma was not found.]) +- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ]) +-else +- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed]) +-fi +- ++ [], ++ [with_oniguruma=yes]) ++ ++AS_IF([test "x$with_oniguruma" != xno], [ ++ AS_IF([test "x$with_oniguruma" != xyes], [ ++ CFLAGS="$CFLAGS -I${with_oniguruma}/include" ++ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" ++ ]) ++ # check for ONIGURUMA library ++ have_oniguruma=0 ++ AC_CHECK_HEADER("oniguruma.h", ++ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;])) ++ # handle check results ++ AS_IF([test $have_oniguruma = 1], [ ++ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed]) ++ ], [ ++ AC_MSG_NOTICE([Oniguruma was not found.]) ++ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX']) ++ ]) ++]) + + dnl Check for valgrind + AC_CHECK_PROGS(valgrind_cmd, valgrind) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild index 2e4fef43f7..478241412c 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,11 +8,11 @@ inherit autotools eutils DESCRIPTION="A lightweight and flexible command-line JSON processor" HOMEPAGE="https://stedolan.github.com/jq/" -SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz" +SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" LICENSE="MIT CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~x64-macos" IUSE="static-libs test" DEPEND="sys-devel/bison 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 3843f8ea82..34a272633f 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,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ inherit autotools eutils DESCRIPTION="A lightweight and flexible command-line JSON processor" HOMEPAGE="https://stedolan.github.com/jq/" -SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz" +SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" LICENSE="MIT CC-BY-3.0" SLOT="0" diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r1.ebuild new file mode 100644 index 0000000000..df24e2f78f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +DESCRIPTION="A lightweight and flexible command-line JSON processor" +HOMEPAGE="https://stedolan.github.com/jq/" +SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" + +LICENSE="MIT CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x64-macos" +IUSE="oniguruma static-libs test" + +DEPEND=">=sys-devel/bison-3.0 + sys-devel/flex + oniguruma? ( dev-libs/oniguruma[static-libs?] ) + test? ( dev-util/valgrind )" +RDEPEND="!static-libs? ( + oniguruma? ( dev-libs/oniguruma[static-libs?] ) + )" + +DOCS=( AUTHORS README ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5-dynamic-link.patch + "${FILESDIR}"/${P}-remove-automagic-dep-on-oniguruma.patch +) + +src_prepare() { + sed -i '/^dist_doc_DATA/d' Makefile.am || die + sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ + configure.ac || die + + default + eautoreconf +} + +src_configure() { + # don't try to rebuild docs + econf \ + --disable-docs \ + $(use_enable static-libs static) \ + $(use_with oniguruma) +} + +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/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/jq/metadata.xml index efa5eb0078..f57f842690 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/metadata.xml @@ -1,8 +1,11 @@ - + - + radhermit@gentoo.org Tim Harder + + Use dev-libs/oniguruma for regular expression support + 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 7bd10c0d3f..4564950a97 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 @@ -7,6 +7,6 @@ IUSE=test 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 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=c9d32f6dcdfc8abf679751b0dc55b8a8 +SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.4/jq-1.4.tar.gz +_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=6f9d42b8f3ca9522612997af6ad0e7b5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 index 29f96608ab..62b4486e61 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.4-r1 @@ -4,9 +4,9 @@ DESCRIPTION=A lightweight and flexible command-line JSON processor EAPI=5 HOMEPAGE=https://stedolan.github.com/jq/ IUSE=static-libs test -KEYWORDS=~amd64 ~x86 +KEYWORDS=~amd64 ~x86 ~x64-macos LICENSE=MIT CC-BY-3.0 SLOT=0 -SRC_URI=http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz -_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=ce3b02762586be04d13bc7ad34a3e338 +SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.4/jq-1.4.tar.gz +_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=18e241585add143a7375266a2be29746 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r1 new file mode 100644 index 0000000000..3bb9993ed9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-misc/jq-1.5-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=>=sys-devel/bison-3.0 sys-devel/flex oniguruma? ( dev-libs/oniguruma[static-libs?] ) test? ( dev-util/valgrind ) !=sys-devel/automake-1.14.1:1.14 >=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=6 +HOMEPAGE=https://stedolan.github.com/jq/ +IUSE=oniguruma static-libs test +KEYWORDS=~amd64 ~x86 ~x64-macos +LICENSE=MIT CC-BY-3.0 +RDEPEND=!static-libs? ( oniguruma? ( dev-libs/oniguruma[static-libs?] ) ) +SLOT=0 +SRC_URI=https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz +_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 +_md5_=e19f0669240fdb78ed4b0fcf3ad9394a