Stabilize for amd64/x86 and remove old.

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

5 files changed, 17 insertions, 74 deletions

diff --git a/sys-apps/ack/ChangeLog b/sys-apps/ack/ChangeLog
index 5d4be8f56372..510ccb7012f1 100644
--- a/sys-apps/ack/ChangeLog
+++ b/sys-apps/ack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/ack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ack/ChangeLog,v 1.43 2014/12/19 19:23:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ack/ChangeLog,v 1.44 2014/12/21 00:45:21 radhermit Exp $
+
+  21 Dec 2014; Tim Harder <radhermit@gentoo.org> -ack-2.12.ebuild,
+  ack-2.14.ebuild, -files/ack-2.04-gentoo.patch:
+  Stabilize for amd64/x86 and remove old.
 
   19 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop perl herd from metadata
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 7006be189857..58d92a5983ea 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,30 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ack-2.04-gentoo.patch 445 SHA256 0dc3021f1d7f7c08c2eccd7ab34a59a1d1de9b35edaea23fd53fa12b8fe5f96f SHA512 01c46c20ffdd5cc48569b1eaba2194f33c28b6f30db7bee89be0314c77f5cc80eba2359303745034c184efb13ca14556bb0b7f714f435e585ba9ec7da40a5a06 WHIRLPOOL 40c1644a996a522773fbe19a8be68c4d25ff8bb78991306d508d24d94c8a38811dcbc651ae4dddbdaa47a96536b729164c454d6ce2b67fa16f8b468972e2089e
 AUX ack-2.14-gentoo.patch 431 SHA256 7da2f216647e650c63c27b9ff116e977b43a4665b7fea2a44c10b60491f0dd38 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b WHIRLPOOL 7b3e57c7bd937cdfd35038de94db500bd06c9bfd83097b22d8dfc17f2e2baaafd51a4999e296ae83d449b1c668d9eb6e7f21cf812397c2f5e6913eb1c0ae374f
-DIST ack-2.12.tar.gz 219614 SHA256 52f2d37bc2570d947171f10059d6ed4f0f23413849a546ca202b6e17debb7d2b SHA512 636321941c4b95df648e3e49f9aa157ddc626e37a60e9da4f6b78e82c485adb8e965fa7c6ef9fbe33037bdd731d21f1091af92bc8f7513608ca0903ae392350e WHIRLPOOL 789044b9fe17bd8ed6b7220e686c61c68fbd0a4ae841c7b84fa33eec46eb6acba08ba92557502ac958a8f7d58ecc18a07da98e900445f612a5603df7ee33c113
 DIST ack-2.14.tar.gz 222479 SHA256 8549a833efec158dc85bc6334b3a384ae5a389896942eab9a58c6e630c181b3f SHA512 64af6490947e4dcc9e9a28c28db5750df7bec4098e3e8a9d940be5f6b99fe0169c091d390480eb95cf7704f24c745bd6c93b8cfd8de7cab75c11c313184666b4 WHIRLPOOL 1ff77ca6d4bbd65e5330de5bd9dd9ea67de8c2fe799078115315e4fd9b90ea59d58230f476579da999e2e4040537b50d7bbc166e49f877dae36c95971af6de67
-EBUILD ack-2.12.ebuild 925 SHA256 bc936287ee01f8f047095ddf385e6a3fc03442c16c155a4a083e2acf2039383e SHA512 4aa576512904fec912d749fe2a8ce3c4c1123417ab65f05f12bc265512395a38b22f3ddd1c0db3b128b205ff1610127961d3b365eef0c83169bc2bbcf4fdc85c WHIRLPOOL b6a2a98cc7d1352d9d315b39d660fe3a0642f883b5eb2cd4a995a102c845b0c2d21033a4e9ee2764cbea3fc25cac7f8701b30437e83315b18018c6280952da92
-EBUILD ack-2.14.ebuild 922 SHA256 4ca199607548373337b2ffe3c4054fab39986ab4b12fd99b3653698912bb5353 SHA512 1aa6344094038eef3a57dd9badda373f3fe8a90c2b9984ed524a36f18c3cae57afa17cf2d9229c008083d8743b3cde1c2fd8eebb26d33f2b0bc436f7ad91609a WHIRLPOOL b92e54af8280f927b16d5870ecd0005de19b9f88f7afc207bc55721710d833c9e48145c0ab384ab8340253d0ba3ec2bf1953eebc0e786798dacf98cd128dc46a
-MISC ChangeLog 5131 SHA256 67ac5c69d2bd605af39c431ac91c4f7f75bc1a2b9c0e96f2b6b2200a3a9f01bc SHA512 38250519becacd35a77ed733bff763bafa3c13c137869e1d61b05668453eb4bba7a69de0548217d1562c308a64449cbe6ece6eb1772bf1571ac496221f6421df WHIRLPOOL 80fd611720f1cc1c2b19bc326223b9919141a53639c0382d17dfe3e1fd48eaa1931b4e77774e9dd8e82be8ef821fd553fd44ecefe8a122db1f8cbd16b3cad3bf
+EBUILD ack-2.14.ebuild 920 SHA256 081243fcc91f328a0cee92605afe93d1aa36741798d531a45fa25b1a9fe4a286 SHA512 c074ffca01f678c3e3c970c3cb6ed968979053f66cdb6b3fbcf4c2977f1ad31e1060735936cd5a0a01321117d4084c80885d1dddde51c134a8f5d8466b835c76 WHIRLPOOL 9268dea2080ca5124d2316fa7e8f16bb9f6a11c4c0201c01971e7003727a280db52035ead53e6265528d404a0f20f81bd4fe8977d925cf3ff683978b26d2bc6b
+MISC ChangeLog 5290 SHA256 4347b335ae56dfd45f6f753a174223b59c8d472d839587e64b026c7aea741ae0 SHA512 3eb6609c018d0faed1c791280f1d95130c3d66c682f585d5445d77fec07da5a33f8cdddf2a9c5b5ba36198d22272cfedfb817a41daf0461f71c3cd31db8ca1f6 WHIRLPOOL 6170df88e4ac50b99eaae35f71245a7d25f357458b2e35f0fb34920098e7d8150b87c386aa24c2b8c8117672fbb3a4d742967d7e408608d05cb3dd10fe52422c
 MISC metadata.xml 298 SHA256 003fb2bf408fc0a5dad0e863b008c3fe63f850a3c0113fd18a51dfd47d9f745d SHA512 f717ff85d1adf24b3f8c9bc3c199092bb035c0208f2d6d750e51aa133d5ce59baf686966676d2a7c6d28cffc50c0a2f77edc1ea85ae32c532d1a779f69582971 WHIRLPOOL d2d7e1268231a8ee7b80f9959d4648776dfb0ad6c13e46080fdcca8ae5fba82544847c953cf39eaff509a98869d55382dfdb0b2de6dd8641ccab35afd4727809
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUlHtFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcVUEP/jOXjajSY4rQlY2RMgQ9CqEs
-pzCVW1krIHXaZcg68AFwKqweWS4hDyV7A9VgByBSILbr4OHei1Cq7h967FeLK3Lg
-pniqFb9kIeaCOyXQstjFpjcBwk82DEu3dOCic22rV9x6qySiYqcDoinlwmudK30K
-DwUeoNd5cE1OrJks/u0zaZ57I+Rcyjntb1R+IHT0PlW73CiU6EAwHOcfDXYpz3P7
-GWc23Pm4E5qxu/2+YyYzrf3UAYg2AqONfw2bRT5zJBPl4RpN11vQ5wArdIihdNm8
-3VMHFgq9EKh5+KrlDEay7asdHSnDcrx7mx6CxvKXQGv+DGwcaV3bFDg0AED/zq8z
-Kzk86m6sPCa3AQJpKv8zMB+FTXhlKYt0cu0u4F0hsvZgz/CuaSdsOdWxtKgUzhLU
-WjDbubbkyyfBNY5jsyFd/F1LMKfzDc+QNfVTO9d4IYUQJO9Cwvuhbe0Ft+P43OU4
-KhY4dS8GkymGE02YbwyF89rceLo30nzjtu3yFzW1yxS6CLQrhvmB85viiycQU7dq
-h2obUECmL8wFn8wS/fJ/GnNb5VUde+2/SIWKH9CHR4kAzIOrlaha/MS9JXc6Lwew
-oG9jqjoXFt4nGXrSaSuEPgT5GdK60yvpqsxHJ21apZyVe+wD6NaM2pjbP+//dSRK
-5l5jh5yen7iRsUXlicEM
-=gSVe
+iQEcBAEBCAAGBQJUlhgtAAoJEEqz6FtPBkyjxLYH/iKTsdHbgpeLtKIHfNRqFudE
+OvrCuFbwRboiGFgqqkKfhE0jxmGpmo9Ki3pdKNZSuNyZdRTngCO19QwJ583/2Wr9
+877pTda40JtRvZs0/TjlZ9FHTuudUAGRUgxErboOo3GPh+IU9gVdcL0O9i4xLhMk
+UWKeXFVQuxtkIFfEHMGvJ8avjLpsvj+WyDw8sU4Q7cVCRqZ937sFkkEF+TtJHyKU
+pFB7m073LDFvB45ZxHOfy0UjFLIJC3UNS5TAOw/7Nwt5m3jNmqISa88acu4G3TAN
+LYgKfSeCKmm5w/FY/L48MLWmjrFaOa3Ad85b645/tvJVc1dJjduqkexZc0XGlWc=
+=a0P6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/ack/ack-2.12.ebuild b/sys-apps/ack/ack-2.12.ebuild
deleted file mode 100644
index c8ac6e546245..000000000000
--- a/sys-apps/ack/ack-2.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ack/ack-2.12.ebuild,v 1.4 2014/06/19 08:36:20 klausman Exp $
-
-EAPI=5
-MODULE_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, aimed at programmers with large trees of heterogeneous source code"
-HOMEPAGE="http://betterthangrep.com/ ${HOMEPAGE}"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-perl/File-Next-1.100.0"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
-PATCHES=( "${FILESDIR}"/${PN}-2.04-gentoo.patch )
-
-src_test() {
-	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
-	# which enables interactive tests that need to read from stdin. If IO-Tty
-	# is not installed the related tests are skipped.
-	MAKEOPTS+=" -j1" perl-module_src_test
-}
diff --git a/sys-apps/ack/ack-2.14.ebuild b/sys-apps/ack/ack-2.14.ebuild
index 7a42a78eb3b3..d6253c26c20c 100644
--- a/sys-apps/ack/ack-2.14.ebuild
+++ b/sys-apps/ack/ack-2.14.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/sys-apps/ack/ack-2.14.ebuild,v 1.1 2014/09/04 14:33:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ack/ack-2.14.ebuild,v 1.2 2014/12/21 00:45:21 radhermit Exp $
 
 EAPI=5
 MODULE_AUTHOR=PETDANCE
@@ -11,7 +11,7 @@ HOMEPAGE="http://betterthangrep.com/ ${HOMEPAGE}"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=dev-perl/File-Next-1.100.0"
diff --git a/sys-apps/ack/files/ack-2.04-gentoo.patch b/sys-apps/ack/files/ack-2.04-gentoo.patch
deleted file mode 100644
index 2385190627b0..000000000000
--- a/sys-apps/ack/files/ack-2.04-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ack-2.04/ConfigDefault.pm
-+++ ack-2.04/ConfigDefault.pm
-@@ -180,6 +180,9 @@
- # Fortran http://en.wikipedia.org/wiki/Fortran
- --type-add=fortran:ext:f,f77,f90,f95,f03,for,ftn,fpp
- 
-+# Gentoo http://www.gentoo.org/
-+--type-add=gentoo:ext:ebuild,eclass
-+
- # Google Go http://golang.org/
- --type-add=go:ext:go
- 
---- ack-2.04/t/ack-filetypes.t
-+++ ack-2.04/t/ack-filetypes.t
-@@ -25,6 +25,7 @@
- elisp
- erlang
- fortran
-+gentoo
- go
- groovy
- haskell