summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-12-10 00:56:14 +0000
committerTim Harder <radhermit@gentoo.org>2013-12-10 00:56:14 +0000
commit9b65fcd4d85586e34b861e859be8d12c6ece86c9 (patch)
tree95722eaf51a621f35d4505046139fa41835ee8c3
parentFix build with automake-1.14 (bug #493804). (diff)
downloadgentoo-2-9b65fcd4d85586e34b861e859be8d12c6ece86c9.tar.gz
gentoo-2-9b65fcd4d85586e34b861e859be8d12c6ece86c9.tar.bz2
gentoo-2-9b65fcd4d85586e34b861e859be8d12c6ece86c9.zip
Remove old.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
-rw-r--r--app-misc/jq/ChangeLog6
-rw-r--r--app-misc/jq/files/jq-1.2-makefile.patch24
-rw-r--r--app-misc/jq/jq-1.2.ebuild32
3 files changed, 5 insertions, 57 deletions
diff --git a/app-misc/jq/ChangeLog b/app-misc/jq/ChangeLog
index 92f92ec09852..28741e207829 100644
--- a/app-misc/jq/ChangeLog
+++ b/app-misc/jq/ChangeLog
@@ -1,6 +1,10 @@
# 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.11 2013/12/10 00:52:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.12 2013/12/10 00:56:14 radhermit Exp $
+
+ 10 Dec 2013; Tim Harder <radhermit@gentoo.org> -jq-1.2.ebuild,
+ -files/jq-1.2-makefile.patch:
+ Remove old.
10 Dec 2013; Tim Harder <radhermit@gentoo.org> jq-1.3.ebuild,
+files/jq-1.3-automake-1.14.patch:
diff --git a/app-misc/jq/files/jq-1.2-makefile.patch b/app-misc/jq/files/jq-1.2-makefile.patch
deleted file mode 100644
index b36925f422b2..000000000000
--- a/app-misc/jq/files/jq-1.2-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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.2.ebuild b/app-misc/jq/jq-1.2.ebuild
deleted file mode 100644
index df5d0a453268..000000000000
--- a/app-misc/jq/jq-1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.2.ebuild,v 1.4 2013/05/01 10:37:17 ago Exp $
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A lightweight and flexible command-line JSON processor"
-HOMEPAGE="http://stedolan.github.com/jq/"
-SRC_URI="https://github.com/stedolan/jq/archive/${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 )"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- tc-export CC
-}
-
-src_install() {
- dobin jq
- dodoc README.md
-}