gentoo resync : 18.08.2019

7 files changed, 2 insertions, 140 deletions

diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 785da07dfc9a..fe054cf06c5c 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,13 +1,4 @@
-AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b01c95e5be5a656995909584f46fd844d4e3befdad22ac83f16d66a04b1f8e53abb92a75ab3e185c8013bcd4 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b
 AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938
-DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5
-DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303
-DIST ack-2.24.tar.gz 261289 BLAKE2B 0ec1e280abbcd2319bcc9f0cd83c73f97decd6698928fd1b8be310fe9a81839e02390bf4baabef402cb8603eceb5c005c4c8a1f71a60273cef21e3366efff11c SHA512 3778c1d70ae08852eff9d8dd75688713bbb8dd15d4e72c07a3829cf362c7bfeba1175275e66cfe99265ba28777b6833734ebd6debb4ec4ec79df06ac46a79c24
-DIST ack-2.28.tar.gz 263072 BLAKE2B 5bb5c41165dff9140959d7680a79def77b8d95106ee3b70b842579f082c8bf4ca978d05d1128722bd22456be94703ea1e44de1a87071317c46a4fb80d0cab6cb SHA512 04ad599b644ff2cb07abe687f99286f14ddd0628458ac88dea0124d8487792824af470a60718c21be5930083830b463385e13927cc4a680ff34be133256c0f8a
 DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45
-EBUILD ack-2.18-r1.ebuild 772 BLAKE2B 12100785921ef1fec21cfa89e065c0172942a1d5d0c86bbaa1a06e2d02e8691b83d0c142e5e69ce20a53d6aa091f2f7599929ba050e9386e98e317dcf695639a SHA512 3451e624eca1eaa393923f7a15a2519d89f7d7a0f01a9cc848d5da611bc05edd61201dcbeda7713251fa91716332ddd80ce6458f5d966397d2932e1b8d51bc04
-EBUILD ack-2.22.ebuild 774 BLAKE2B 4c3eed595671a3b8e9293cbbf64ddbaff4e4cf2fb9ebb8dcc75568a5efb89b541e5a8e5229751ac01db67df14d2b70cf46ade7787a008d14723efb77b1aaaa79 SHA512 996ee903ecf0b54879b05c64b5a5d0bf37c93db78a1ba2c01234a46456ba31b3f4fc72ea7a27547f73040e95f836181c903742b0430ec1e0dc9c8a07d57a5c9e
-EBUILD ack-2.24.ebuild 774 BLAKE2B 7211436088eb1b529fc33f77a4c93674b1121e1f8b77740afa0d5a940157f2be862985d255de9eb2fad75059133fdf442e7a6a18230ab90141b63aa69a675880 SHA512 1103c9d90347a9c17e4aa24123748f2167b0aa2a392870cea5ff82627c84d673013650b2abb0cd0ae9d7014c7aa7bd5914e89576986d9458c688f12aec4d74b1
-EBUILD ack-2.28.ebuild 774 BLAKE2B 4c3eed595671a3b8e9293cbbf64ddbaff4e4cf2fb9ebb8dcc75568a5efb89b541e5a8e5229751ac01db67df14d2b70cf46ade7787a008d14723efb77b1aaaa79 SHA512 996ee903ecf0b54879b05c64b5a5d0bf37c93db78a1ba2c01234a46456ba31b3f4fc72ea7a27547f73040e95f836181c903742b0430ec1e0dc9c8a07d57a5c9e
-EBUILD ack-3.0.0.ebuild 795 BLAKE2B 18591b2ae8817f74c4064a40fd033b04a85ceaed4d902beda0b4d6d19083fa80f324a48d0388cf5d6105bf044ecb5f12eddeaa9b68c16f94106bb97e7ce5355d SHA512 5b7970e9a40c9f56d3d971872086e4bbca47c070535eaa69b12da8c420ee3e18d953ef018fa055ca65d28616c58d7dc8e05cec280479d2202c5b140b24e57ff4
+EBUILD ack-3.0.0.ebuild 822 BLAKE2B ae76fcc3f35cb95b1691ac5f729d9236d301365ec43af62e6835e93d3c8ded7166951983772e58282052ea24054c3ae30de5f73b3739d4c6c60462886a36c2b8 SHA512 2bd89a2584f7b92826ee5b22f9de920a751391897775f2c49ae503e5ac33a0111d4a8063f11995f4768d14ff9cfb5d199dac61ffac9f85edfdd5c2955f5abc15
 MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f
diff --git a/sys-apps/ack/ack-2.18-r1.ebuild b/sys-apps/ack/ack-2.18-r1.ebuild
deleted file mode 100644
index bc165b550e4d..000000000000
--- a/sys-apps/ack/ack-2.18-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="https://beyondgrep.com"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.14-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.22.ebuild b/sys-apps/ack/ack-2.22.ebuild
deleted file mode 100644
index dbff5491f6a4..000000000000
--- a/sys-apps/ack/ack-2.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="https://beyondgrep.com"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.14-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.24.ebuild b/sys-apps/ack/ack-2.24.ebuild
deleted file mode 100644
index 227a80911ad7..000000000000
--- a/sys-apps/ack/ack-2.24.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="https://beyondgrep.com"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.14-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.28.ebuild b/sys-apps/ack/ack-2.28.ebuild
deleted file mode 100644
index dbff5491f6a4..000000000000
--- a/sys-apps/ack/ack-2.28.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="https://beyondgrep.com"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.14-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-3.0.0.ebuild b/sys-apps/ack/ack-3.0.0.ebuild
index ab06b7d94bef..5b422d73a710 100644
--- a/sys-apps/ack/ack-3.0.0.ebuild
+++ b/sys-apps/ack/ack-3.0.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-perl/File-Next-1.160.0"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/ack/files/ack-2.14-gentoo.patch b/sys-apps/ack/files/ack-2.14-gentoo.patch
deleted file mode 100644
index 80f0747deef9..000000000000
--- a/sys-apps/ack/files/ack-2.14-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ack-2.14/ConfigDefault.pm
-+++ ack-2.14/ConfigDefault.pm
-@@ -252,6 +252,9 @@
- # 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
-+
- # Go
- # http://golang.org/
- --type-add=go:ext:go
---- ack-2.14/t/ack-filetypes.t
-+++ ack-2.14/t/ack-filetypes.t
-@@ -26,6 +26,7 @@
- elisp
- erlang
- fortran
-+gentoo
- go
- groovy
- haskell