diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-10-28 16:12:55 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-10-28 16:12:55 +0000 |
| commit | a426ca61091f5fb52b0c10df667bf4941b14a63b (patch) | |
| tree | f1ec23cfe8ed64c495ad46ec9e78a9a25ba0a3ce /games-arcade | |
| parent | Update supported linguas. (diff) | |
| download | gentoo-2-a426ca61091f5fb52b0c10df667bf4941b14a63b.tar.gz gentoo-2-a426ca61091f5fb52b0c10df667bf4941b14a63b.tar.bz2 gentoo-2-a426ca61091f5fb52b0c10df667bf4941b14a63b.zip | |
work with dash (bug #527110)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/batrachians/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/batrachians/batrachians-0.1.6.ebuild | 11 | ||||
| -rw-r--r-- | games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch | 35 |
3 files changed, 43 insertions, 9 deletions
diff --git a/games-arcade/batrachians/ChangeLog b/games-arcade/batrachians/ChangeLog index 7317d73b7060..f9d21d380acb 100644 --- a/games-arcade/batrachians/ChangeLog +++ b/games-arcade/batrachians/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/batrachians # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/batrachians/ChangeLog,v 1.12 2014/08/25 20:47:30 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/batrachians/ChangeLog,v 1.13 2014/10/28 16:12:55 mr_bones_ Exp $ + + 28 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> + +files/batrachians-0.1.6-makefile.patch, batrachians-0.1.6.ebuild: + work with dash (bug #527110) 25 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -batrachians-0.1.5.ebuild: diff --git a/games-arcade/batrachians/batrachians-0.1.6.ebuild b/games-arcade/batrachians/batrachians-0.1.6.ebuild index 74276fddd1dc..9c2e171c589e 100644 --- a/games-arcade/batrachians/batrachians-0.1.6.ebuild +++ b/games-arcade/batrachians/batrachians-0.1.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/batrachians/batrachians-0.1.6.ebuild,v 1.3 2014/07/27 10:39:12 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/batrachians/batrachians-0.1.6.ebuild,v 1.4 2014/10/28 16:12:55 mr_bones_ Exp $ EAPI=5 -inherit autotools gnome2-utils games +inherit autotools eutils gnome2-utils games DESCRIPTION="A fly-eating frog video game" HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/batrachians.html" @@ -19,12 +19,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - sed -i \ - -e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \ - -e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \ - -e "/^pixmapdir/ s:=.*:=/usr/share/icons/hicolor/48x48/apps/:" \ - src/Makefile.am \ - || die "sed failed" + epatch "${FILESDIR}"/${P}-makefile.patch eautoreconf } diff --git a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch b/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch new file mode 100644 index 000000000000..f01fdfb0da8d --- /dev/null +++ b/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch @@ -0,0 +1,35 @@ +diff -ru batrachians-0.1.6.orig/src/Makefile.am batrachians-0.1.6/src/Makefile.am +--- batrachians-0.1.6.orig/src/Makefile.am 2011-04-18 21:25:53.000000000 -0400 ++++ batrachians-0.1.6/src/Makefile.am 2014-10-27 23:19:58.292260669 -0400 +@@ -20,7 +20,7 @@ + -DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \ + -DPKGSOUNDDIR=\"$(pkgsounddir)\" + +-pkgsounddir = $(datadir)/sounds/$(PACKAGE) ++pkgsounddir = $(datadir)/$(PACKAGE)/sounds + pkgsound_DATA = \ + sounds/game-starts.wav \ + sounds/game-ends.wav \ +@@ -29,18 +29,18 @@ + sounds/frog-jumps.wav \ + sounds/tongue-out.wav + +-desktopentrydir = $(datadir)/applications ++desktopentrydir =/usr/share/applications + desktopentry_DATA = $(PACKAGE).desktop + +-pixmapdir = $(datadir)/pixmaps ++pixmapdir =/usr/share/icons/hicolor/48x48/apps/ + pixmap_DATA = images/$(PACKAGE).png + + + check: all + if HAVE_GETOPT_LONG + test "`./$(PACKAGE) --version`" = "$(PACKAGE) $(VERSION)" +- ./$(PACKAGE) --version >& /dev/null +- ./$(PACKAGE) --help >& /dev/null ++ ./$(PACKAGE) --version > /dev/null 2>&1 ++ ./$(PACKAGE) --help > /dev/null 2>&1 + endif + + |