diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2021-08-15 16:45:12 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-08-15 17:41:08 -0400 |
| commit | de047f2a3886522a23b5b770116add3c5f36663f (patch) | |
| tree | fb1dcb994dae29fdf6b64f7ddb7b2393f9f5e866 | |
| parent | games-misc/cowsay: Change upstream in metadata.xml (diff) | |
| download | gentoo-de047f2a3886522a23b5b770116add3c5f36663f.tar.gz gentoo-de047f2a3886522a23b5b770116add3c5f36663f.tar.bz2 gentoo-de047f2a3886522a23b5b770116add3c5f36663f.zip | |
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@gentoo.org>
| -rw-r--r-- | games-misc/cowsay/cowsay-3.7.0.ebuild | 17 | ||||
| -rw-r--r-- | games-misc/cowsay/files/cowsay-3.7.0-head-in.patch (renamed from games-misc/cowsay/files/cowsay-3.0.7-head-in.patch) | 0 | ||||
| -rw-r--r-- | games-misc/cowsay/files/cowsay-3.7.0-mech-and-cow.patch (renamed from games-misc/cowsay/files/cowsay-3.0.7-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 e50f98fd85bd..46747419c8ac 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 index 4b22fc596a09..4b22fc596a09 100644 --- a/games-misc/cowsay/files/cowsay-3.0.7-head-in.patch +++ b/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 index b630e2289f86..75630b71806b 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} |