gentoo resync : 03.11.2019

11 files changed, 67 insertions, 31 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index bdf543a901a8..4fe4d81f7e5b 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 907aa79ca930..f4a90198b77c 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -5,5 +5,5 @@ AUX bsd-games-2.17-headers.patch 268 BLAKE2B e3b1761e4373e2ed22c3a4b1d31e30f5af8
 AUX config.params-gentoo 1204 BLAKE2B 638b52df3c92928a78a0e0833c2bc84a76906144b36d5a6b3523f4de24452aeeab355268afadb9d32933e5c0c19ab4145062bf3968a9d440af1a659a403b32c4 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618
 DIST bsd-games-2.17.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 DIST bsdgames_2.17-22.debian.tar.xz 32268 BLAKE2B 2485abc1d80b8319c7eb68e2747c0a4166d18079047eca67c1de549cd011f75a767b6fe69021cb4ce09aaf029823a097e6ac658efcab5e19e976a89ed798d06f SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5
-EBUILD bsd-games-2.17-r5.ebuild 4333 BLAKE2B c5b3a50469f62a5af317ca720b43787117a3d675d8170bb91cb4a43dbc9fd928359bfb62c1f86819522ed245fd2f96377deee74e0891c17538259afe4bc61123 SHA512 cd1ef22f06ffa4b454022ac65ce1b0cad748ae6dd07c5bc100eb2eb2ba8af92af5adcf76be7545c2bfc568bbd1f776c80ce4800784a6a22a04728a8b0b505e9d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD bsd-games-2.17-r5.ebuild 4367 BLAKE2B b8c622107c70c26e540a780ffbf6ba2f8a2e993967425a2a42ff8cffb213935aa0ddbbff8ade6e856506afc57279a413a8a02784cda16d6484caf6f5bdbaa6db SHA512 c928e89b3a53484636946e5042f815c7ebd732012ff056ec7996e7d50167e5c798a111abf88ae6aa0ffd77bc03f1217cc25a9170644b991cc639bba192a625c6
+MISC metadata.xml 326 BLAKE2B 264f08d8e1036db642114667e4dd07d5b4212b85c0254c55e2a0ec541b408f7129322dc133cc0bd875714e1535699d067fe0b625048b14ba002744e7269c4b6d SHA512 6e4e98607587faadf0aae1ba28287c2e694ef629b6ce915db751427f8f46c425e7aa120ef5fc978b2a0e4d4e33ad1cb0b0e136b0a0641c555f6471a8c286ccf5
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
index cefeb7976f5b..6679e61b5fc7 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ inherit eutils toolchain-funcs games
 
 DEB_PATCH_VER=22
 DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
+HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
+SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${P}.tar.gz
 	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz"
 
 LICENSE="BSD"
diff --git a/games-misc/bsd-games/metadata.xml b/games-misc/bsd-games/metadata.xml
index 78274e0fa550..e21a7394ad30 100644
--- a/games-misc/bsd-games/metadata.xml
+++ b/games-misc/bsd-games/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">jsm28/bsd-games</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 4183c26e0648..c57e2ed22a99 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,6 +1,7 @@
-AUX cowsay-3.03-mech.patch 490 BLAKE2B 28c4f7060f8be6e77bb1d1a598875ed28b0d3dabd3b0f84ae4f197c159d7f554cf35600e082d58684ee244a1d76e620c7c5505f9e054e5e2853edceab3bfea72 SHA512 abaa76dee0c896100bab79a68c25720bb8449af77990ced74d89d271e22fd8fa5cb1b4586ef79e4c12a21d7091164d8c19a1162e78636874864a3fafa3a8df1d
-AUX cowsay-3.03-tongue.patch 358 BLAKE2B 35dbba5ebd96a4d20b59ebdb8fba86d3169f6bdfad86d8e7dcd5f4f4e02bcbd54ae8f114a3ef5cac18de355e45a1c5a9b5306a5230676638732698048fea68ab SHA512 bce27566383debd01f00c40e867dff9d405304f70e72de9ca4c2611c6242da9919c5a74b6ac3d0632ad7c928ef578f8bb78d125ed6141a0adf3f7498731f8e6f
-AUX cowsay-3.03-utf8.patch 454 BLAKE2B 2274a604daf96638b11d7cedd1fae7ac3178d138e7c1110007cfff4aa19ca061099dac7423545688388d741f66fba9fcfff6f9a8983501b5eabfefaeaf75f005 SHA512 4519c799311b5e31b3299fc66285ad0f9bfd2148dbfb34411437d37cda37d7cea8e823c8f99b0a0ef3652bb839f09d05fd5c5c727db4b091c6ed86d335ed6ece
-DIST cowsay-3.03.tar.gz 15189 BLAKE2B de22c870c23612d1861d7de5e610a072833f1627897b11bb9a642464032051a35f6a146125a75c511e7b65df3f885cb7558988d0a535e093dcb3765969aef4d1 SHA512 8e91d0c929c2e0743106c08643029a943d0684343ff44ad8ff172636a8f47fd25ee8bc4d108ccfe308c756d2871b956cceef0c406800615ed0dc1e1e24648219
-EBUILD cowsay-3.03-r2.ebuild 1128 BLAKE2B c57e5a72c9db6dbb2c98adf68fcf968b56f33141725ec9e604fcc9c61044fab43eaf3beadd9e9dca712ec1682025e8c44be5435f06ba53559ff1d73d2a0f76f8 SHA512 6c01755217eb08cd20d67c5a28e156576ab5c6e002b65fcde48192b4fd9dfa3a756ed3ef758a9e0744d887b6b45e4993e9c661265db214f14fe708912f656c8f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+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
+DIST cowsay-3.04.tar.gz 31961 BLAKE2B 93e6e9cb31b8902ee6bccda0f997fa651fa83e0504ccab3e7fbbc5cfddc11256f6adea1ea1b4e2bcf8085746eb4194e8332bfee886d1f3d05ad2b6ac3422eea8 SHA512 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51
+EBUILD cowsay-3.04.ebuild 1241 BLAKE2B 558afc312315a574afa3f12880db213782570162b7a3651673d92f4752f753db826d13d56c53c8abab9c577dfd4c430c0dc9f425f353cc570ee4b7e2c9228d3b SHA512 30f5226afdfd8bd36cf9f55372db5ea37bb9f93fff94df57b359115778f808f3bbcd84dc706b4b5f0948f38d19f03f55ccbfb6ecaf727236643b2564e8609392
+MISC metadata.xml 339 BLAKE2B ea192482f0b900c68b90a85ab2d92ac46558075b59c7f3ca87d04141d31166ae7252af9b5078ed06d5f4c1bf9b26c308fd51e5fc45ad0b18c4bf3cd2e2248196 SHA512 bfd3935c1f05236a43762bf78f14d5a268ed9895f3bd1696499d1749115b4a9da990f00607df93225f3080bcf1fd23dc1121a3cbf7b59329874f4bc047647429
diff --git a/games-misc/cowsay/cowsay-3.03-r2.ebuild b/games-misc/cowsay/cowsay-3.04.ebuild
index 4e46fe7c0f93..2186ca0454ba 100644
--- a/games-misc/cowsay/cowsay-3.03-r2.ebuild
+++ b/games-misc/cowsay/cowsay-3.04.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
-DESCRIPTION="configurable talking ASCII cow (and other characters)"
-HOMEPAGE="http://www.nog.net/~tony/warez/cowsay.shtml"
-SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
+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"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~x64-solaris"
-IUSE=""
 
 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}"
 
 src_prepare() {
 	sed	-i \
@@ -25,10 +31,12 @@ src_prepare() {
 	sed -i \
 		-e "s|%PREFIX%/share/cows|${EPREFIX}/usr/share/${P}/cows|" cowsay.1 \
 			|| die "sed cowsay.1 failed"
-	epatch \
-		"${FILESDIR}/${P}"-tongue.patch \
-		"${FILESDIR}/${P}"-mech.patch \
-		"${FILESDIR}/${P}"-utf8.patch
+
+	default
+}
+
+src_compile() {
+	./install.sh "${D}"
 }
 
 src_install() {
@@ -36,6 +44,7 @@ src_install() {
 	doman cowsay.1
 	dosym cowsay /usr/bin/cowthink
 	dosym cowsay.1 /usr/share/man/man1/cowthink.1
-	dodir /usr/share/${P}/cows
-	cp -r cows "${ED}"/usr/share/${P}/ || die "cp failed"
+	insinto /usr/share/${P}
+	doins -r cows
+	einstalldocs
 }
diff --git a/games-misc/cowsay/files/cowsay-3.03-mech.patch b/games-misc/cowsay/files/cowsay-3.04-mech.patch
index 10478ed6651d..9c9ff9d3fe32 100644
--- a/games-misc/cowsay/files/cowsay-3.03-mech.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-mech.patch
@@ -1,5 +1,5 @@
---- cows/mech-and-cow	2009-06-21 03:09:36.000000000 +0300
-+++ cows/mech-and-cow.cow	2010-08-22 01:04:02.670000262 +0300
+--- 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
 @@ -1,3 +1,5 @@
 +$the_cow = <<EOC;
 +${thouts}
diff --git a/games-misc/cowsay/files/cowsay-3.03-tongue.patch b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
index 517e96709c23..01123587611f 100644
--- a/games-misc/cowsay/files/cowsay-3.03-tongue.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
@@ -1,5 +1,5 @@
---- cows/head-in.cow.old	2007-05-09 20:28:08.000000000 +0200
-+++ cows/head-in.cow	2007-05-09 20:29:32.000000000 +0200
+--- 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
 @@ -7,6 +7,6 @@
      ^__^         /
      ($eyes)\\_______/  _________
diff --git a/games-misc/cowsay/files/cowsay-3.03-utf8.patch b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
index 6aed9c149e3d..3aeaf0d66c14 100644
--- a/games-misc/cowsay/files/cowsay-3.03-utf8.patch
+++ b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
@@ -1,6 +1,6 @@
 diff -Naur cowsay-3.03.orig//cowsay cowsay-3.03/cowsay
---- cowsay-3.03.orig//cowsay	2011-04-21 16:36:03.581377699 +0200
-+++ cowsay-3.03/cowsay	2011-04-21 16:37:07.968430100 +0200
+--- 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
 @@ -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
new file mode 100644
index 000000000000..4b8c47462d45
--- /dev/null
+++ b/games-misc/cowsay/files/cowsay-3.04-version.patch
@@ -0,0 +1,20 @@
+--- 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
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ 
+ ##
+-## Cowsay 3.03
++## Cowsay 3.04
+ ##
+ ## This file is part of cowsay.  (c) 1999-2000 Tony Monroe.
+ ##
+@@ -19,7 +19,7 @@
+     eval { $_ = Encode::decode_utf8($_,1) } for @ARGV;
+ }
+ 
+-$VERSION = "3.03";
++$VERSION = "3.04";
+ $progname = basename($0);
+ $eyes = "oo";
+ $tongue = "  ";
diff --git a/games-misc/cowsay/metadata.xml b/games-misc/cowsay/metadata.xml
index 78274e0fa550..69b606b9aed3 100644
--- a/games-misc/cowsay/metadata.xml
+++ b/games-misc/cowsay/metadata.xml
@@ -5,4 +5,7 @@
 	<email>games@gentoo.org</email>
 	<name>Gentoo Games Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">tnalpgge/rank-amateur-cowsay</remote-id>
+</upstream>
 </pkgmetadata>