gentoo resync : 15.06.2021

5 files changed, 3 insertions, 89 deletions

diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 54da25079eb6..5fb2cecc505b 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,11 +1,6 @@
-AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938
 AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644de89e541685c37c3fed952802fd3cf25ebe9965f2e619ca405645bb7ec6b72dcc94756d9406b23becbcf2a1 SHA512 c889acf671232070b252c1ac3d041cf0f08d73bff14e76418433f7304d313faa8d50229c2b0ab4a11e3f0948f60590e8cfd3bbb93d094616c3db3967a15711da
-DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45
-DIST ack-v3.2.0.tar.gz 246140 BLAKE2B ac729ba6b1c7f0b720ddd076498452660f7f50ba7f866f908717d19c2ef985858d63dad96a2acd5c93d0a991a1870bec895da3dc64b974bc11c5f74b9245332a SHA512 3604a8ad6a79c63fdd65721fc790db09f345f66b81e5272fa073cb53b7964b576ba3638e1f358d8e0c28c38acd0d9a0362f2666ece9abe374cf6355b752a0f69
-DIST ack-v3.3.1.tar.gz 250024 BLAKE2B 3cf4882929afb05ea592a7e964a06745bef58303d5bc1c66e65ca3eb7d21fccc7fe285b142fe9518cfd9eb5c37bc32dfbec113df775b84de4f55b12864a4ba9e SHA512 7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd
 DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
-EBUILD ack-3.0.0.ebuild 799 BLAKE2B e7e834930c8486c65253d08383544d41ad662fcff5b8617452b4736ad66935c2ea0545338382b267fd33f806c440e75ac260c439278d6fe2b06754cc495ee7ed SHA512 d1b580c7218c6ab3d8fffd6c486286bec34512f2cecef10ef073528a4d6f5f9a4e57c1e56a8b76d5acc8b70d6f107e501d2f32d441661f9d36e952da2dbc285b
-EBUILD ack-3.2.0.ebuild 801 BLAKE2B 2e8cfb420259f4738032d84d9b02021c9ea27ef7a57679ced10f9457c611935a1a7724dedd1fdc97ea71f62a4c453470a91a0998ecd686d1623b902f70a187d8 SHA512 21117f19bb5fe3da21042542d5f26e1959c22aea59fea2f44137da6a9398043a64934ee3ac4d5de1287a057952ef40dfd409ffdfdb5f2866e30160b53d157c7a
-EBUILD ack-3.3.1.ebuild 801 BLAKE2B 1ba6f048ecd103d8bed6aba66158336d3a6926376e51f5e0142396bd0ae8ccfc10ad2c45e8ee767c473c348ac0c7d8d77d2b4c2a3dad8b53db464943c90a1cf9 SHA512 bc0dfb7d5b4de1a61b59bee9654370ee6a6a121f09370af64b63e1b7717861122c15095fb9277936dfc2d01dcdf387644f5214e3367c14d41c3bf163d96e1c0a
+DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 EBUILD ack-3.4.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
+EBUILD ack-3.5.0.ebuild 819 BLAKE2B a7dd4fed8addd0eb46ee172fe2acad9c0441d5cb3de5606af4d2d6220bdadca87515cf785d42a5558b94d3b9b0bf14d74b20fc640b592b66fc2c6abc021457b9 SHA512 c839f2279a913f7386e8a2fc8fb76357957092a77c36094ba428ba9a89450954dc6dc119ff6f740dd08a928ed47556d461119a8ae170713b923115a48359dcc9
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.0.0.ebuild b/sys-apps/ack/ack-3.0.0.ebuild
deleted file mode 100644
index 01badc0b6234..000000000000
--- a/sys-apps/ack/ack-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=PETDANCE
-DIST_VERSION="v${PV}"
-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-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.0-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.2.0.ebuild b/sys-apps/ack/ack-3.2.0.ebuild
deleted file mode 100644
index 4ae50c324a70..000000000000
--- a/sys-apps/ack/ack-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=PETDANCE
-DIST_VERSION="v${PV}"
-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-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/File-Next-1.180.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.0-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.3.1.ebuild b/sys-apps/ack/ack-3.5.0.ebuild
index cb79809565e6..fe8c7cc38c9b 100644
--- a/sys-apps/ack/ack-3.3.1.ebuild
+++ b/sys-apps/ack/ack-3.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ack/files/ack-3.0.0-gentoo.patch b/sys-apps/ack/files/ack-3.0.0-gentoo.patch
deleted file mode 100644
index 09972519ed89..000000000000
--- a/sys-apps/ack/files/ack-3.0.0-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/App/Ack/ConfigDefault.pm
-+++ b/lib/App/Ack/ConfigDefault.pm
-@@ -263,6 +263,10 @@
- # http://en.wikipedia.org/wiki/Fortran
- --type-add=fortran:ext:f,f77,f90,f95,f03,for,ftn,fpp
- 
-+# Gentoo
-+# https://www.gentoo.org/
-+--type-add=gentoo:ext:ebuild,eclass
-+
- # Go
- # http://golang.org/
- --type-add=go:ext:go
---- a/t/ack-filetypes.t
-+++ b/t/ack-filetypes.t
-@@ -26,6 +26,7 @@
- elisp
- erlang
- fortran
-+gentoo
- go
- groovy
- gsp