Stabilize for amd64/x86 and remove old.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 7 insertions, 53 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/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