gentoo resync : 28.04.2021

6 files changed, 27 insertions, 23 deletions

diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 1d1cb7d4c40f..ec38269f049a 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,7 +1,7 @@
-AUX cowsay-3.04-mech.patch 554 BLAKE2B 5fc429e9a1e2d068a004fe2076bb13523bf38134c053f7717108e6914e219c3287736133ba3a518669d41444c3b512c51859741dfcaa91d2162b4d208cd5dc58 SHA512 7fd9fd35bc4b0e786f6b57dbb54f4b25eaa050d5b221bc3c7c3eba620ce642a46497c62d7dae5096ef47639f98606b702df0f1672d48d81b03dcf2aab1e8eee0
-AUX cowsay-3.04-tongue.patch 422 BLAKE2B 39bd44587c297ce5971298fb6ef0ab5570de8f79bc7f04f4b9ed59d2372178b60f118b934c87dca768a6892b0cdf968b58334f2bb5fcf249cb2083bf2040bfe4 SHA512 af453db6a528802e3ab974379364b47a068fd9b20ac7631328cb53ea48dd86e2b9d5edc1ad1201bdac493c1533d38813ed6fd0ff18a4af378d9be4d648bffe6a
-AUX cowsay-3.04-utf8.patch 493 BLAKE2B eb966fd8d296c2c961d961ecf9b9a3f15e02d70dcf0ed48bda596ee121ce3b8a84c5ac912bf8257249b5080f9072e71cc3304ca57f937082d0be96ca2580fc2b SHA512 c4dcccce8b784c41b06e3fcb8fbf186025a3d2c020cca981774968b7198f345c3c365ada6d1c649951982e5ac28322b4c485aae8798ce1fe002155d86bd7b99f
-AUX cowsay-3.04-version.patch 481 BLAKE2B 7569860a2274b48c367da8a93872b3926a5128b16526a7054ad1d3777622070b93986fba61e43d7906ea780c1471312503af215dbee55b63543185a701f930ba SHA512 65792dd9fa43f9a00c160dc7b6cad85f6aa62faaff38f23c94b3220703c3059d141c62def5a6de71f24e5f07f047fbda0ff17a47283c95f0d7a59767ecd50ddd
+AUX cowsay-3.04-mech.patch 422 BLAKE2B a1090392e80d65642470ceb13aa4b79b8b75c9f6c35e2ef7767992ee6ec60e0be2fece3eef2546a1d521a75b7ef5a81f141d515f98634de51eac46b19d54dc74 SHA512 ec8ff74f17a19d29584b343fb8eb2217fa97bd863a9d7728e51d8142b8ee850b5128a0b03fa4daa456527591502eec25053a0ebe0ce625ea7fe2f8f3ff80d9ac
+AUX cowsay-3.04-tongue.patch 286 BLAKE2B e92de1eb4506ff4b262b72a0dc90bd2ea00e6964b1d3e8caadca3b204cb758463be9417b2f1a538af2e62a10332801602cce15181a858073672e4a07fb4b8294 SHA512 1d0575ca6ce088f7aea768861034ddf15b387b4dd5b08bc60c4544a371bba4215e6cbdd977075ce82b8532117461e3a25646c5d3cd0ced14fb4247f6bce7d52a
+AUX cowsay-3.04-utf8.patch 301 BLAKE2B 9448e405a588c3d58ee0b7ce4b17bae47a7e64f5f3a487d20adcd0b51b3ea88c546627cf05e66a4ae74c051d88bf25576dd483a998dbdd9364393f1e5e77e242 SHA512 3c4e5b88784bbbf74165dfed41bb40bf6515f077b717fbb1dea8340ba7a4900616c6f67d6977346accb1d9d20f910413d51561f9bb84f39ea3080c6dfcba9c17
+AUX cowsay-3.04-version.patch 344 BLAKE2B 4e429f7b7b9863044c58c8aa23f0f2eabb8430a7b4414786ac5013619322ae6c2915d87451298dbb6d8d247a9550fd21d4f1e797272b4cc899036aee77993c07 SHA512 0ca537f4c9a0dc5e2780ee0fe7243f2d5de90ad2f0f6a4d9af8deb0772076b5e5470ad46f39ca600df16a3b84a86f8ea03249cc064e00171b30b1f0faf7e7f65
 DIST cowsay-3.04.tar.gz 31961 BLAKE2B 93e6e9cb31b8902ee6bccda0f997fa651fa83e0504ccab3e7fbbc5cfddc11256f6adea1ea1b4e2bcf8085746eb4194e8332bfee886d1f3d05ad2b6ac3422eea8 SHA512 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51
-EBUILD cowsay-3.04.ebuild 1248 BLAKE2B b6bd728a6b29cc7ac52c8a8706a53975b80c129e0da4a91ebbd344a811e6f6631f06b753f2366fbfafe35264ca44ff8974154d0488568004cc4a66084ff538b5 SHA512 d229408e2b98a633de90d030592d0e8fab0c504941210d5487dd87c79753d6a0a4bfd5044b29c4f952fbca3d893b4f8549ab0509d788ab1e592e19106bcc604d
+EBUILD cowsay-3.04-r1.ebuild 1286 BLAKE2B a9e1f2de5469db1ea9c244baafaa33aedbac670a469c27b60b78f3647a0b78257d8e6105feccf26d00429d9510e04bdd8e464369f6ac713b490a5cfb15d67c2e SHA512 af2305b5997c0aa7915da65613217ea11a00f082d2d2f7ee5e5e690b1c3f817b57c55323479fc62706058d06787f1a843e5a53fa4fd858a0879b1be91ec7be62
 MISC metadata.xml 339 BLAKE2B ea192482f0b900c68b90a85ab2d92ac46558075b59c7f3ca87d04141d31166ae7252af9b5078ed06d5f4c1bf9b26c308fd51e5fc45ad0b18c4bf3cd2e2248196 SHA512 bfd3935c1f05236a43762bf78f14d5a268ed9895f3bd1696499d1749115b4a9da990f00607df93225f3080bcf1fd23dc1121a3cbf7b59329874f4bc047647429
diff --git a/games-misc/cowsay/cowsay-3.04.ebuild b/games-misc/cowsay/cowsay-3.04-r1.ebuild
index dd1855cb7d00..00de9a111cee 100644
--- a/games-misc/cowsay/cowsay-3.04.ebuild
+++ b/games-misc/cowsay/cowsay-3.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,20 +6,21 @@ EAPI=7
 DESCRIPTION="Configurable talking ASCII cow (and other characters)"
 HOMEPAGE="https://github.com/tnalpgge/rank-amateur-cowsay"
 SRC_URI="https://github.com/tnalpgge/rank-amateur-${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}"/rank-amateur-${PN}-${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-macos ~x64-solaris"
 
 RDEPEND=">=dev-lang/perl-5"
 BDEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-tongue.patch"
-	"${FILESDIR}/${P}-mech.patch"
-	"${FILESDIR}/${P}-utf8.patch"
-	"${FILESDIR}/${P}-version.patch" )
 
-S="${WORKDIR}/rank-amateur-${PN}-${P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-tongue.patch
+	"${FILESDIR}"/${P}-mech.patch
+	"${FILESDIR}"/${P}-utf8.patch
+	"${FILESDIR}"/${P}-version.patch
+)
 
 src_prepare() {
 	sed	-i \
@@ -36,15 +37,19 @@ src_prepare() {
 }
 
 src_compile() {
-	./install.sh "${D}"
+	:;
 }
 
 src_install() {
+	./install.sh PREFIX=/usr "${ED}" || die
+
 	dobin cowsay
 	doman cowsay.1
 	dosym cowsay /usr/bin/cowthink
 	dosym cowsay.1 /usr/share/man/man1/cowthink.1
+
 	insinto /usr/share/${P}
 	doins -r cows
+
 	einstalldocs
 }
diff --git a/games-misc/cowsay/files/cowsay-3.04-mech.patch b/games-misc/cowsay/files/cowsay-3.04-mech.patch
index 9c9ff9d3fe32..a180ef49cb30 100644
--- a/games-misc/cowsay/files/cowsay-3.04-mech.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-mech.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cows/mech-and-cow	2009-06-21 03:09:36.000000000 +0300
-+++ rank-amateur-cowsay-cowsay-3.04/cows/mech-and-cow.cow	2010-08-22 01:04:02.670000262 +0300
+--- a/cows/mech-and-cow
++++ b/cows/mech-and-cow.cow
 @@ -1,3 +1,5 @@
 +$the_cow = <<EOC;
 +${thouts}
diff --git a/games-misc/cowsay/files/cowsay-3.04-tongue.patch b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
index 01123587611f..7b620b3499c4 100644
--- a/games-misc/cowsay/files/cowsay-3.04-tongue.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cows/head-in.cow.old	2007-05-09 20:28:08.000000000 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cows/head-in.cow	2007-05-09 20:29:32.000000000 +0200
+--- a/cows/head-in.cow
++++ b/cows/head-in.cow
 @@ -7,6 +7,6 @@
      ^__^         /
      ($eyes)\\_______/  _________
diff --git a/games-misc/cowsay/files/cowsay-3.04-utf8.patch b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
index 3aeaf0d66c14..6e015d36ce69 100644
--- a/games-misc/cowsay/files/cowsay-3.04-utf8.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
@@ -1,6 +1,5 @@
-diff -Naur cowsay-3.03.orig//cowsay cowsay-3.03/cowsay
---- rank-amateur-cowsay-cowsay-3.04/cowsay.orig	2011-04-21 16:36:03.581377699 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cowsay	2011-04-21 16:37:07.968430100 +0200
+--- a/cowsay
++++ b/cowsay
 @@ -12,6 +12,13 @@
  use Getopt::Std;
  use Cwd;
diff --git a/games-misc/cowsay/files/cowsay-3.04-version.patch b/games-misc/cowsay/files/cowsay-3.04-version.patch
index 4b8c47462d45..8c9a14006994 100644
--- a/games-misc/cowsay/files/cowsay-3.04-version.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-version.patch
@@ -1,5 +1,5 @@
---- rank-amateur-cowsay-cowsay-3.04/cowsay.orig	2019-10-19 08:44:59.442928870 +0200
-+++ rank-amateur-cowsay-cowsay-3.04/cowsay	2019-10-19 08:45:16.165928638 +0200
+--- a/cowsay
++++ b/cowsay
 @@ -1,7 +1,7 @@
  #!/usr/bin/perl