jq: Add patch to fix automake error on 1.3.

6 files changed, 147 insertions, 0 deletions

diff --git a/app-misc/jq/ChangeLog b/app-misc/jq/ChangeLog
new file mode 100644
index 0000000..301c82c
--- /dev/null
+++ b/app-misc/jq/ChangeLog
@@ -0,0 +1,42 @@
+# ChangeLog for app-misc/jq
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.10 2013/07/04 12:24:59 ago Exp $
+
+  04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.3.ebuild:
+  Stable for x86, wrt bug #474936
+
+  28 Jun 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.3.ebuild:
+  Stable for amd64, wrt bug #474936
+
+  27 May 2013; Tim Harder <radhermit@gentoo.org> jq-1.3.ebuild:
+  Don't try to rebuild docs (bug #471370).
+
+*jq-1.3 (23 May 2013)
+
+  23 May 2013; Tim Harder <radhermit@gentoo.org> +jq-1.3.ebuild:
+  Version bump.
+
+  01 May 2013; Tim Harder <radhermit@gentoo.org> -jq-1.1.ebuild,
+  -files/jq-1.1-makefile.patch:
+  Remove old.
+
+  01 May 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.2.ebuild:
+  Stable for x86, wrt bug #468074
+
+  01 May 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.2.ebuild:
+  Stable for amd64, wrt bug #468074
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> 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 <radhermit@gentoo.org> +jq-1.2.ebuild,
+  +files/jq-1.2-makefile.patch:
+  Version bump.
+
+*jq-1.1 (23 Oct 2012)
+
+  23 Oct 2012; Tim Harder <radhermit@gentoo.org> +jq-1.1.ebuild,
+  +files/jq-1.1-makefile.patch, +metadata.xml:
+  Initial import, ebuild by me.
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
new file mode 100644
index 0000000..27f22d3
--- /dev/null
+++ b/app-misc/jq/Manifest
@@ -0,0 +1,6 @@
+AUX 1.3-fix-automake-global-options-error.patch 929 SHA256 9adf6ceac8c540445ae04aa00b30c0a30707d703bbb0f3a975a133d3faf10c86 SHA512 0f2f11a24257a41f45b06bff5684e7b74309e2b808460bb273707090996cda2ffdfac9b3855a1d1d87ba6bebed830dbcabd64e2cf661c7073017fb8cad6d97b1 WHIRLPOOL b0296c9d802e09937f19746dd50518c968bcd1c5589b33d6938f474d6e67a6870462a39f40ce318e18cb5e2f27334385f201a91afdff9f21e38ef8778c7dc442
+AUX jq-1.2-makefile.patch 802 SHA256 db36f90ee91141c20fadd18232526128b9bab730d056dbf6d62da353438e53bb SHA512 52a0566dc48fa3574667e794edeeee2edad81220d13bfd1d8a82d980af570296c9f76ccc8c9e72696dc59e9ec256187ac29d9178ea6d0f1463d7ee176f100c36 WHIRLPOOL b2ac2229bf127ae7e87f444968929afa85955af5b8d6c435072570133f662395c330effde2e9305d89d3a68cee865a7840f4fb44dddd758430746ed6d1ab9458
+DIST jq-1.3.tar.gz 333678 SHA256 623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7 SHA512 50a3502fc6f6d571d4dff47fae59b47c7171d094fb953be8bf8185e21e7b4bbfe8702a4d668214cb6e5d8d7889b49c9b34ff7e48fd5583369b2265d0eb2d3578 WHIRLPOOL 75b8fdb8c5b9af740e4ffdd7a2dbb2b07dae9383b36ea4a13718e7b4281ea83c88375d4692fe303e67ba0368cdc6aeea1b4c9d9c2c6b4fbde17b0eaa4d6582ba
+EBUILD jq-1.3.ebuild 797 SHA256 7dc588f021fdec1763f3eb574439f16ac75a70e5f93453498a95b137dd874e96 SHA512 9384a6baf8f30cd46830e6fde2211d6c204096041f8403a6dd5bde26655d32e5b8ca66608f8d8eb865d5326c65ef221de620306451aff342aaeba6d891101377 WHIRLPOOL 76145321ded416dd5876df6cb6edda5eaebb719b6791cd2408a50bc594e9d6af70a11678e14fafb76b45ec7a20e850cf9df8fedb0d62c5751ae65dd2f29fc478
+MISC ChangeLog 1351 SHA256 a5a0adbab9f302c6ead3784fb4b598489c51bd9495bebe4524d233919a3416c9 SHA512 a22d55dd4a86f7c10b7bfa9b2ca5affd219702cd36c102e4271848302be8e4473b54c301e8e79fcc7534710b442ba705ba971fc542f004e218435a39130598ec WHIRLPOOL cedcc00070784629939b80d2203eda9e9f18e0bd1ed8b775515e363b52f058b37903d04cd0cd5885ba4e998bef2d7d95851066b57058c19f4ae8a5c8bbfccdd5
+MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
diff --git a/app-misc/jq/files/1.3-fix-automake-global-options-error.patch b/app-misc/jq/files/1.3-fix-automake-global-options-error.patch
new file mode 100644
index 0000000..335e922
--- /dev/null
+++ b/app-misc/jq/files/1.3-fix-automake-global-options-error.patch
@@ -0,0 +1,34 @@
+From f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a Mon Sep 17 00:00:00 2001
+From: Ankur <ankz.kothari@gmail.com>
+Date: Sun, 1 Sep 2013 18:58:26 +1000
+Subject: [PATCH] Call AM_INIT_AUTOMAKE once only
+
+Fixes build with automake-1.14
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 76a49a9..d6d2d38 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
+ 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
+@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ 
+ dnl AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE([-Wall])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+ 
+-- 
+1.8.5.1
+
diff --git a/app-misc/jq/files/jq-1.2-makefile.patch b/app-misc/jq/files/jq-1.2-makefile.patch
new file mode 100644
index 0000000..b36925f
--- /dev/null
+++ b/app-misc/jq/files/jq-1.2-makefile.patch
@@ -0,0 +1,24 @@
+--- jq-jq-1.2/Makefile
++++ jq-jq-1.2/Makefile
+@@ -1,5 +1,5 @@
+-CC=gcc
+-CFLAGS=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function $(EXTRA_CFLAGS)
++CC?=gcc
++CFLAGS+=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -Wno-unused-function $(EXTRA_CFLAGS)
+ 
+ prefix=/usr/local
+ mandir=$(prefix)/share/man
+@@ -28,11 +28,10 @@
+ 
+ jq_test: CFLAGS += -DJQ_DEBUG=1
+ jq_test: $(JQ_SRC) jq_test.c
+-	$(CC) $(CFLAGS) $(CFLAGS_DEBUG) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(CFLAGS_DEBUG) -o $@ $^
+ 
+-jq: CFLAGS += -O -DJQ_DEBUG=0
+ jq: $(JQ_SRC) main.c
+-	$(CC) $(CFLAGS) $(CFLAGS_OPT) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(CFLAGS_OPT) -o $@ $^
+ 
+ test: jq_test
+ 	valgrind --error-exitcode=1 -q --leak-check=full ./jq_test >/dev/null
diff --git a/app-misc/jq/jq-1.3.ebuild b/app-misc/jq/jq-1.3.ebuild
new file mode 100644
index 0000000..d8b9a74
--- /dev/null
+++ b/app-misc/jq/jq-1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 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.4 2013/07/04 12:24:59 ago 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="test"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	test? ( dev-util/valgrind )"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.3-fix-automake-global-options-error.patch
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# don't try to rebuild docs
+	econf --disable-docs
+}
diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
new file mode 100644
index 0000000..efa5eb0
--- /dev/null
+++ b/app-misc/jq/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>