commit: 792b6ec850000b9c70bbbda54aeac80d5fdf7c33
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 02:27:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 6 18:18:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792b6ec8
games-misc/cowsay: port to EAPI 7, fix ${D} in src_compile, Prefix install
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{cowsay-3.04.ebuild => cowsay-3.04-r1.ebuild} | 21 +++++++++++++--------
games-misc/cowsay/files/cowsay-3.04-mech.patch | 4 ++--
games-misc/cowsay/files/cowsay-3.04-tongue.patch | 4 ++--
games-misc/cowsay/files/cowsay-3.04-utf8.patch | 5 ++---
games-misc/cowsay/files/cowsay-3.04-version.patch | 4 ++--
5 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/games-misc/cowsay/cowsay-3.04.ebuild
b/games-misc/cowsay/cowsay-3.04-r1.ebuild
similarity index 80%
rename from games-misc/cowsay/cowsay-3.04.ebuild
rename to games-misc/cowsay/cowsay-3.04-r1.ebuild
index dd1855cb7d0..76cdd412270 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,6 +6,7 @@ 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"
@@ -13,13 +14,13 @@ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86
~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 9c9ff9d3fe3..a180ef49cb3 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 01123587611..7b620b3499c 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 3aeaf0d66c1..6e015d36ce6 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 4b8c47462d4..8c9a1400699 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
