* [gentoo-commits] repo/gentoo:master commit in: games-misc/cowsay/, games-misc/cowsay/files/
@ 2021-08-15 21:41 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-08-15 21:41 UTC (permalink / raw
To: gentoo-commits
commit: de047f2a3886522a23b5b770116add3c5f36663f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 20:45:12 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 21:41:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de047f2a
games-misc/cowsay: misc fixes
* 3.0.7 -> 3.7.0 for patch versions (seems like a typo)
* use prefix= instead of sed for prefix, not much better
but it's the normal way
* ... add sed for man page's %PREFIX% that the Makefile doesn't handle
* fix mech-and-cow lack of extension, patch attempted to do a
rename but a normal non-git patch can't do this
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-misc/cowsay/cowsay-3.7.0.ebuild | 17 +++++++++++++----
...y-3.0.7-head-in.patch => cowsay-3.7.0-head-in.patch} | 0
...ch-and-cow.patch => cowsay-3.7.0-mech-and-cow.patch} | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/games-misc/cowsay/cowsay-3.7.0.ebuild b/games-misc/cowsay/cowsay-3.7.0.ebuild
index e50f98fd85b..46747419c8a 100644
--- a/games-misc/cowsay/cowsay-3.7.0.ebuild
+++ b/games-misc/cowsay/cowsay-3.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DESCRIPTION="Configurable talking ASCII cow (and other characters)"
HOMEPAGE="https://cowsay.diamonds https://github.com/cowsay-org/cowsay"
-SRC_URI="https://github.com/cowsay-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/cowsay-org/cowsay/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -15,12 +15,21 @@ RDEPEND="dev-lang/perl"
BDEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-3.0.7-head-in.patch"
- "${FILESDIR}/${PN}-3.0.7-mech-and-cow.patch"
+ "${FILESDIR}/${P}-head-in.patch"
+ "${FILESDIR}/${P}-mech-and-cow.patch"
)
src_prepare() {
default
- sed -i 's#/usr/local#/${EPREFIX}/usr#' Makefile || die
+ # no |g leaves one %PREFIX% but it makes sense in context
+ sed -i "s|%PREFIX%|${EPREFIX}/usr|" cowsay.1 || die
+
+ # patch fixes the file but need extension to be recognized
+ mv share/cows/mech-and-cow{,.cow} || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ einstalldocs
}
diff --git a/games-misc/cowsay/files/cowsay-3.0.7-head-in.patch b/games-misc/cowsay/files/cowsay-3.7.0-head-in.patch
similarity index 100%
rename from games-misc/cowsay/files/cowsay-3.0.7-head-in.patch
rename to games-misc/cowsay/files/cowsay-3.7.0-head-in.patch
diff --git a/games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch b/games-misc/cowsay/files/cowsay-3.7.0-mech-and-cow.patch
similarity index 92%
rename from games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch
rename to games-misc/cowsay/files/cowsay-3.7.0-mech-and-cow.patch
index b630e2289f8..75630b71806 100644
--- a/games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch
+++ b/games-misc/cowsay/files/cowsay-3.7.0-mech-and-cow.patch
@@ -1,5 +1,5 @@
--- a/share/cows/mech-and-cow
-+++ b/share/cows/mech-and-cow.cow
++++ b/share/cows/mech-and-cow
@@ -1,3 +1,5 @@
+$the_cow = <<EOC;
+${thouts}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/cowsay/, games-misc/cowsay/files/
@ 2021-08-15 21:41 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-08-15 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 7f8104fb3c272c9eedb3887ade77340cb9cd7c76
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sun Jul 18 16:28:28 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 21:41:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8104fb
games-misc/cowsay: Bump to 3.7.0 and switch to (more) active upstream
The bumped ebuild
- uses an upstream that seems to maintain the original cowsay,
- is shorter because upstream found out about Makefiles :-]
- bumps the ebuild to EAPI=8
- renames and adoptes the old patches and drops unnecessary ones.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-misc/cowsay/Manifest | 1 +
games-misc/cowsay/cowsay-3.7.0.ebuild | 26 ++++++++++++++++++++++
games-misc/cowsay/files/cowsay-3.0.7-head-in.patch | 10 +++++++++
.../cowsay/files/cowsay-3.0.7-mech-and-cow.patch | 18 +++++++++++++++
4 files changed, 55 insertions(+)
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index e313d321ec2..9c36f3e1178 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1 +1,2 @@
DIST cowsay-3.04.tar.gz 31961 BLAKE2B 93e6e9cb31b8902ee6bccda0f997fa651fa83e0504ccab3e7fbbc5cfddc11256f6adea1ea1b4e2bcf8085746eb4194e8332bfee886d1f3d05ad2b6ac3422eea8 SHA512 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51
+DIST cowsay-3.7.0.tar.gz 34030 BLAKE2B a986ee689ca6856b99dcc148533abfbc81759da6fbabee9ab1ba86e7b288d3bff575706c1e12d6dd809e2e5091ce8d9bdcae51ffefccbfb356fc75ab199c4e8f SHA512 92c169350049d894c36ec753f0b7eb9250da7839d9f1eedcad1ff5d9f2cff188bd1509dabd3b4dd562bdd0e660e80e6a437c7f260ce5b2376b7ef624f0ee673b
diff --git a/games-misc/cowsay/cowsay-3.7.0.ebuild b/games-misc/cowsay/cowsay-3.7.0.ebuild
new file mode 100644
index 00000000000..e50f98fd85b
--- /dev/null
+++ b/games-misc/cowsay/cowsay-3.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Configurable talking ASCII cow (and other characters)"
+HOMEPAGE="https://cowsay.diamonds https://github.com/cowsay-org/cowsay"
+SRC_URI="https://github.com/cowsay-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="dev-lang/perl"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.7-head-in.patch"
+ "${FILESDIR}/${PN}-3.0.7-mech-and-cow.patch"
+)
+
+src_prepare() {
+ default
+
+ sed -i 's#/usr/local#/${EPREFIX}/usr#' Makefile || die
+}
diff --git a/games-misc/cowsay/files/cowsay-3.0.7-head-in.patch b/games-misc/cowsay/files/cowsay-3.0.7-head-in.patch
new file mode 100644
index 00000000000..4b22fc596a0
--- /dev/null
+++ b/games-misc/cowsay/files/cowsay-3.0.7-head-in.patch
@@ -0,0 +1,10 @@
+--- a/share/cows/head-in.cow
++++ b/share/cows/head-in.cow
+@@ -7,6 +7,6 @@
+ ^__^ /
+ ($eyes)\\_______/ _________
+ (__)\\ )=( ____|_ \\_____
+- $tongue ||----w | \\ \\ \\_____ |
++ $tongue ||----w | \\ \\ \\_____ |
+ || || || ||
+ EOC
diff --git a/games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch b/games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch
new file mode 100644
index 00000000000..b630e2289f8
--- /dev/null
+++ b/games-misc/cowsay/files/cowsay-3.0.7-mech-and-cow.patch
@@ -0,0 +1,18 @@
+--- a/share/cows/mech-and-cow
++++ b/share/cows/mech-and-cow.cow
+@@ -1,3 +1,5 @@
++$the_cow = <<EOC;
++${thouts}
+ ,-----.
+ | |
+ ,--| |-.
+@@ -14,8 +16,4 @@
+ (__)\ )\/\ /' / | `i
+ ||----w | ___,;`----'.___L_,-'`\__
+ || || i_____;----\.____i""\____\
+-
+-
+-
+-
+-
++EOC
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-misc/cowsay/, games-misc/cowsay/files/
@ 2021-09-22 22:26 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-09-22 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 795dfc603bc6929716911173d80fbc8855c1a7c7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 21:53:44 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 22:25:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795dfc60
games-misc/cowsay: drop 3.04-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-misc/cowsay/Manifest | 1 -
games-misc/cowsay/cowsay-3.04-r1.ebuild | 55 -----------------------
games-misc/cowsay/files/cowsay-3.04-mech.patch | 18 --------
games-misc/cowsay/files/cowsay-3.04-tongue.patch | 10 -----
games-misc/cowsay/files/cowsay-3.04-utf8.patch | 16 -------
games-misc/cowsay/files/cowsay-3.04-version.patch | 20 ---------
6 files changed, 120 deletions(-)
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
index 9c36f3e1178..9e52b16097a 100644
--- a/games-misc/cowsay/Manifest
+++ b/games-misc/cowsay/Manifest
@@ -1,2 +1 @@
-DIST cowsay-3.04.tar.gz 31961 BLAKE2B 93e6e9cb31b8902ee6bccda0f997fa651fa83e0504ccab3e7fbbc5cfddc11256f6adea1ea1b4e2bcf8085746eb4194e8332bfee886d1f3d05ad2b6ac3422eea8 SHA512 99d21ef9a7c7c76056cb7acb2c771fbdabfedde4f6edb5d3035337c59f9e88944690d1b43282c32827ad79339199716366c8be73b0dea09063ec2d52220c1b51
DIST cowsay-3.7.0.tar.gz 34030 BLAKE2B a986ee689ca6856b99dcc148533abfbc81759da6fbabee9ab1ba86e7b288d3bff575706c1e12d6dd809e2e5091ce8d9bdcae51ffefccbfb356fc75ab199c4e8f SHA512 92c169350049d894c36ec753f0b7eb9250da7839d9f1eedcad1ff5d9f2cff188bd1509dabd3b4dd562bdd0e660e80e6a437c7f260ce5b2376b7ef624f0ee673b
diff --git a/games-misc/cowsay/cowsay-3.04-r1.ebuild b/games-misc/cowsay/cowsay-3.04-r1.ebuild
deleted file mode 100644
index 00de9a111ce..00000000000
--- a/games-misc/cowsay/cowsay-3.04-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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-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
-)
-
-src_prepare() {
- sed -i \
- -e "1 c\#!${EPREFIX}/usr/bin/perl"\
- -e 's/\$version/\$VERSION/g'\
- -e "s:%PREFIX%/share/cows:${EPREFIX}/usr/share/${P}/cows:" \
- -e '/getopts/ i\$Getopt::Std::STANDARD_HELP_VERSION=1;' cowsay \
- || die "sed cowsay failed"
- sed -i \
- -e "s|%PREFIX%/share/cows|${EPREFIX}/usr/share/${P}/cows|" cowsay.1 \
- || die "sed cowsay.1 failed"
-
- default
-}
-
-src_compile() {
- :;
-}
-
-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
deleted file mode 100644
index a180ef49cb3..00000000000
--- a/games-misc/cowsay/files/cowsay-3.04-mech.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/cows/mech-and-cow
-+++ b/cows/mech-and-cow.cow
-@@ -1,3 +1,5 @@
-+$the_cow = <<EOC;
-+${thouts}
- ,-----.
- | |
- ,--| |-.
-@@ -14,8 +16,4 @@
- (__)\ )\/\ /' / | `i
- ||----w | ___,;`----'.___L_,-'`\__
- || || i_____;----\.____i""\____\
--
--
--
--
--
-+EOC
diff --git a/games-misc/cowsay/files/cowsay-3.04-tongue.patch b/games-misc/cowsay/files/cowsay-3.04-tongue.patch
deleted file mode 100644
index 7b620b3499c..00000000000
--- a/games-misc/cowsay/files/cowsay-3.04-tongue.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cows/head-in.cow
-+++ b/cows/head-in.cow
-@@ -7,6 +7,6 @@
- ^__^ /
- ($eyes)\\_______/ _________
- (__)\\ )=( ____|_ \\_____
-- $tongue ||----w | \\ \\ \\_____ |
-+ $tongue ||----w | \\ \\ \\_____ |
- || || || ||
- EOC
diff --git a/games-misc/cowsay/files/cowsay-3.04-utf8.patch b/games-misc/cowsay/files/cowsay-3.04-utf8.patch
deleted file mode 100644
index 6e015d36ce6..00000000000
--- a/games-misc/cowsay/files/cowsay-3.04-utf8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/cowsay
-+++ b/cowsay
-@@ -12,6 +12,13 @@
- use Getopt::Std;
- use Cwd;
-
-+if (${^UTF8LOCALE}) {
-+ binmode STDIN, ':utf8';
-+ binmode STDOUT, ':utf8';
-+ require Encode;
-+ eval { $_ = Encode::decode_utf8($_,1) } for @ARGV;
-+}
-+
- $VERSION = "3.03";
- $progname = basename($0);
- $eyes = "oo";
diff --git a/games-misc/cowsay/files/cowsay-3.04-version.patch b/games-misc/cowsay/files/cowsay-3.04-version.patch
deleted file mode 100644
index 8c9a1400699..00000000000
--- a/games-misc/cowsay/files/cowsay-3.04-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cowsay
-+++ b/cowsay
-@@ -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 = " ";
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-22 22:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-15 21:41 [gentoo-commits] repo/gentoo:master commit in: games-misc/cowsay/, games-misc/cowsay/files/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2021-08-15 21:41 Ionen Wolkens
2021-09-22 22:26 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox