work with dash (bug #527110)

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

4 files changed, 46 insertions, 11 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/Manifest b/games-arcade/batrachians/Manifest
index 1b543ad7d1ba..78d3d5b16982 100644
--- a/games-arcade/batrachians/Manifest
+++ b/games-arcade/batrachians/Manifest
@@ -1,4 +1,5 @@
+AUX batrachians-0.1.6-makefile.patch 1083 SHA256 641f9be5fe4806ab54f2e9adc5d06a631dcd48f841ef193996f864b65c38b30d SHA512 9fb3d84f864b7cad0ace0e288969871824cae110f879ba8fe512969c7b1aef370c375bde57caedf5bf2bc7e5f00a9f2819fdc7de6d710c989bb474382a84e77a WHIRLPOOL aeb77ac8237a5cfbdeb962f5533caa41eafb8c3f9154dd2893e59711a008427b3870a024f5ad69959542a7223bca436fb9e97209db2473cb25c2e6730d5beaad
 DIST batrachians-0.1.6.tar.gz 198088 SHA256 6511a939e9b3e0c5d0683f2a33389e6da9ff4d9c15e1d27ebcc4e2ba55868e18 SHA512 d3022712627061f9828e1f3baa7207053884f1f4c0348768d4ac073673ff1bcf14c95cedf01031b8bd36a6b684bf239af0f381df41aa18d49218320a8bea3b68 WHIRLPOOL 100d31b7153575507fb88e1e97b9df2606158391d2dba1e8ba7bfc549eda778f82c026be6352495784a4cb016261db52e1ac0854afc0463afc32e22bbef2e70f
-EBUILD batrachians-0.1.6.ebuild 1137 SHA256 3084316ed1a1778245448a9d08d51d87b6456a5a3fe8d677c84f58f2a0b088d5 SHA512 0c58f8daae32a10115cdfd0fd58af331b52f3c819bfe0f946408b9e7294f5033b2f24ab978a914d53c62ae0da8049a04407fdec1f09b37d71176ac7d721944ec WHIRLPOOL fb9411c0c6f785072740f1dc878d4f1e2080a4b87db52c94ad910a67db6ba67c0dbb15724f150d2bb53528bb8ff9fb962adf453a389e5dbd87d183a3cae657b7
-MISC ChangeLog 1632 SHA256 8c1ed04799ecfa484539d08c2e0bc8a08496d56d409c05f442ea174f605e7754 SHA512 99f34372a487802caf643a864d1b751eb1a791ad447131ed1e051177a749da52f947ce5c8fbec0f70650c445f5a5c8824ebff4cd70ffca7a367660d34340f027 WHIRLPOOL d4998111e32530139ed4c69e84a0054e5640f434345ba93cb711eeaf5582e55c9bbc8a831a00d40b4b42aa00387d1a65c5a4931e98770fabf7190a27cfb481dc
+EBUILD batrachians-0.1.6.ebuild 951 SHA256 d8fa80a030061e52b7f0016554eabca0ca924dc3a78f32613c211d59148d6e43 SHA512 96ddc867c61e6489580ec419625b692505270059ce55a95ac09aaff9fade04b0e6885eb144857bd208f50d632ad909cf501e4185a8cd422ec66c3f66dcd9c914 WHIRLPOOL 02a8e15f33d7fdc438fa58ac0261c4d68389ed1f14cf88e1422246b4493a129542777cf2fb7dce681a846d567b764f9b4e0d00fd75daea3948997a6a59dc65dc
+MISC ChangeLog 1788 SHA256 56954120fba07e13d7d86ef55d4810ce4158000c1714b33ceefbdda9a658cc52 SHA512 b8ac72144625c8c98c0fb946216631d7bb57c3168c1c450c121af0dd1afc6a02bdc4397c8bbb9e6530eca72738b8fcb02408ab5867413dd84de5893b09c16c91 WHIRLPOOL 183aec41052796f550531cf466d9be811af531305234b582bedafea3f688f516deef08a0515d693b167ec40d4549cc613ba039d96d911c1e3da7d1ca159d1bbd
 MISC metadata.xml 292 SHA256 a31e9dc062719f882e69ceec2abdfdc7a63aa572c10239cf527fd1ea6eb6156c SHA512 638c9109d398455df2588d39184edbd8066cc71399515c35f6fa39e4312d163c2876be29131900b54180800de78800975c20fa68ade29b6d884d9cbf6f4ab7d5 WHIRLPOOL ebf4f4424a0b7a6e33fe7f03a7c69ee3598906b4a23c9815634e2d095c795f9cd944f3d7aa76881cda5b3d986c8417a088783cb2687ef38d71bea53ffd340392
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
+ 
+