Remove old.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 14 insertions, 69 deletions

diff --git a/app-misc/jq/ChangeLog b/app-misc/jq/ChangeLog
index 726680dee204..11ce54fff614 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.5 2013/05/01 10:37:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.6 2013/05/01 16:49:47 radhermit Exp $
+
+  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
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 96f31ca01724..b82921550df2 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX jq-1.1-makefile.patch 739 SHA256 5ec7dd0307c4a700d8e5403107dbf816df98de73d1eaec4a5bb17454cbb9c229 SHA512 048a9363b4f560862946b7f8b6855d4b97e604681da721f5028ce9d5fb962ff292dc4a36128885b54df0fcf490aef85f807860323fa8f7c07a265b04ad88172c WHIRLPOOL eee0923162240b62e886678bbd78fb8daa69693d6de1b7bb301f2a21571bf17ece7dc3d610371120175db3052ea09720ccd4fbf5f17f0f0581ce7e8d16a726d7
 AUX jq-1.2-makefile.patch 802 SHA256 db36f90ee91141c20fadd18232526128b9bab730d056dbf6d62da353438e53bb SHA512 52a0566dc48fa3574667e794edeeee2edad81220d13bfd1d8a82d980af570296c9f76ccc8c9e72696dc59e9ec256187ac29d9178ea6d0f1463d7ee176f100c36 WHIRLPOOL b2ac2229bf127ae7e87f444968929afa85955af5b8d6c435072570133f662395c330effde2e9305d89d3a68cee865a7840f4fb44dddd758430746ed6d1ab9458
-DIST jq-1.1.tar.gz 432144 SHA256 0e53d2753e40705a684f499789920f2cebfa7adfbec03a270519c25a5fc03f60 SHA512 378eb091fc1a840ba30b496f6f470438133b047a7eb02a4dd6e4563273c152f2f2893ee91a4c87e0267fda2c6ed05e872dac45b6db262c9daedda1bc232d3b2e WHIRLPOOL 4cd56c62de186245231dec021e45c378d67d6e7919dce1e2c894b893cb7ade0d89c8e95a964eafa999436d54cc772c5914b5a480a6fef31b96910eeec1d2bb2e
 DIST jq-1.2.tar.gz 180256 SHA256 0cba62de4265894aea2a4b69d8ac094efd3b3a3a84f2c5987f7ee652b068a7d5 SHA512 38f66c9be0eecc18840d1fa7bfd225e91d045c8b6feb638980a24a230f0b9d34022bd9f12a5c5c262a17fd03236e455a450116ed7c074afef59a8f1afde98980 WHIRLPOOL ae0945f65038c122aa2f770dcbb0dd1c217f3dc60ab5d97a38467402bd394f0b2a1729803af8a7ca1aeb0986c5ae4d35857cbf0fd4ff2085b94682d232a62139
-EBUILD jq-1.1.ebuild 666 SHA256 4e8c785d257e77145b112b6c09a0cfa3d193ddb95fc9222f69feb43734fb3759 SHA512 35ff196ebf1a9e2bbde5c8b03d8eabada7d6d02e43925704e32c6117ce757da4f1ff7208a6f51b377e7e063b137835cc22a958cd01cbb96d813cfb6f97eaecc1 WHIRLPOOL cba2addb92119186a5ce963bba690aeb52a3885ba2e0484830d0e22da18dd90c5fe94343c183f27901a7704ef59cb5446293f70656fc103c7d11f8e7e66d5364
 EBUILD jq-1.2.ebuild 701 SHA256 766ea92a0c7c1f13d06541022268a55449315ea7582f9d86c5b3c2515a198e87 SHA512 b79d240b1fc618547f14a4cda638d634d58f01365f0a8afef4b50938262b6d891311fabab9be35e37c61f1981ce6b3be1d88bc2b823c329f769702110db22242 WHIRLPOOL 20464cd100f6ee287bdebd0d4f1eb2caba1eb8f7dca25f0906b4f66d05688797b22cb7a2d9286de2d435ab2633a95ddf72402ee63a42a60ce4d972f97c503ea1
-MISC ChangeLog 825 SHA256 f11e2e7cd728938dd3a200cebd15b075be7c56e98063a0921bdd7d7562de540e SHA512 7a97512b0bec5224fdab04703ca62d2c8f9a5b736dd6f6ecb5914cbd9134c1771887f799509d0c09329fc4a1493fed180c4db51cbc966ed8525622091218d712 WHIRLPOOL ea9059598db18c3e07c4068b265dc08b1c32fd41e8d4c0abeaf796981349021e1537d7160e8e5a83e4c681ab6bb0e926f2e400fbf76490e5342f6b07394ba47d
+MISC ChangeLog 943 SHA256 a343699ab4c400b6df778032e0b12cd60914ba6e6eeb6f3899021ea74de96014 SHA512 a3eec6969e12bf101fb9c6863eb16c52018e3c112051643bbbd3249ea44fb314544ca1426e73a74e4c859702633806fc638d4aaa4b99f09707c934c6755cc3a7 WHIRLPOOL 9159bc7268c59cd45aea33793cf30db7778261f9c0ded7c4287883c5e9024d700bcf9bb7c4b9fd45adec80f88a973c285305c7f906b0dfb0a308142187c11dd8
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRgPBUAAoJELp701BxlEWfoUMP/j7VMtoDSbaCWu6d2npe7isJ
-UJ23bKYyoL5RnpstM4ssVoeA7QPeH2Gch+OWdfsY8vwgWioE8N2SmHDdnH2NqxkA
-BX9mnos+ouA6PrQLnC4DdUBH6Ptko9NGbHAqRmrrAfS4vh02+wavDYJ63ik4iPy8
-0/V2mEVqsyEeEeL6XjfFNs3MgVL+95TQRFy6/KTvytF1MCaBpqTQKn5CI8Ksu4sy
-VE+mWkkpWSDRHExbfd6PRIyk+0QgJkPIPXHvtdIbKmGaYq7MJYCa8sISC+hEsFLA
-+d2RF7yOZCs9KENCMQPFahGYsxmWGPh8leaGAczQEtVV6+K4vjKgNDz4jHgWrGpB
-wnhasckn3K3DgTmSxCY+Gs53I3Qljo9+RnwAqJcUXKQY129yqWOeVwWBpW7foLTa
-O0XBm7BjP+O+CqMz0ooSldj7aH3or7Y9xYXxjgBcpaPiGPlMwpyXEkeMTxcgrIzp
-0CGGGBjjQgLh8WNjewbiOfFAf6YxNcrpaa7/OzS4hSqqfEweR+2K3mr5/JmhhvE/
-dM8uwbbtrRk1HDQ6dyJr37zFUkHje8Lh+fMSdE02ugqINE9VkWZ1i9oy/PZsEXfj
-gQxoVljCfw98rkBG71/dLWeUVRDTWW5rESNqorL1uL2lra0F6fp7nGyD21+v1DYH
-srfyHyKc3gtwM8ruBxf7
-=t3GZ
+iQEcBAEBCAAGBQJRgUerAAoJEEqz6FtPBkyjvVAH/jgD1sO4YeH9jy6QsyOC+VcH
+fLKjO9uuZKup5z2N5hgJufljX33jSIIdZK/hOrITiqZShoQU0F8l5YcI5ssrBV0G
+cxxYO8XietbAWic8vf470ka11iKAhswgejNqSYwksc6ME+dHAC557v3qfRnsEbjQ
+810lBT8w1IjC/R4oQMoJZEI8uwBGRqRR705WkT5fZ8ol58egH2Dgxk9WnYGQAzPh
+xmBrrku0KmClEvGFqIwlo4T02g8B3c39Xk1HpE9Pa4BOKLFNbhY+z3HJtCOCVMVZ
+XJPrJ4tq7d1zeCVim3P/IJbbpXhE1lw+yRU+To/WgOXOtrzumR7MyYkuaei0O5M=
+=e9j4
 -----END PGP SIGNATURE-----
diff --git a/app-misc/jq/files/jq-1.1-makefile.patch b/app-misc/jq/files/jq-1.1-makefile.patch
deleted file mode 100644
index d492cd0d372c..000000000000
--- a/app-misc/jq/files/jq-1.1-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- stedolan-jq-bf61e95/Makefile
-+++ stedolan-jq-bf61e95/Makefile
-@@ -1,4 +1,5 @@
--CC=gcc -Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function
-+CC?=gcc
-+CFLAGS+=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -Wno-unused-function
- prefix=/usr/local
- 
- .PHONY: all clean releasedep tarball install uninstall test releasetag
-@@ -30,10 +31,10 @@
- 
- 
- jq_test: $(JQ_SRC) jq_test.c
--	$(CC) -DJQ_DEBUG=1 -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DJQ_DEBUG=1 -o $@ $^
- 
- jq: $(JQ_SRC) main.c
--	$(CC) -O -DJQ_DEBUG=0 -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DJQ_DEBUG=0 -o $@ $^
- 
- test: jq_test
- 	valgrind --error-exitcode=1 -q --leak-check=full ./jq_test >/dev/null
diff --git a/app-misc/jq/jq-1.1.ebuild b/app-misc/jq/jq-1.1.ebuild
deleted file mode 100644
index ed99f3c3df60..000000000000
--- a/app-misc/jq/jq-1.1.ebuild
+++ /dev/null
@@ -1,28 +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.1.ebuild,v 1.2 2013/02/07 21:39:36 ulm Exp $
-
-EAPI=5
-
-inherit vcs-snapshot 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/tarball/${P} -> ${P}.tar.gz"
-
-LICENSE="MIT CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin jq
-	dodoc README.md
-}