fix install (bug #542560)

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 23 insertions, 8 deletions

diff --git a/games-engines/scummvm-tools/ChangeLog b/games-engines/scummvm-tools/ChangeLog
index a3ada7da2c9c..a6bab11982b1 100644
--- a/games-engines/scummvm-tools/ChangeLog
+++ b/games-engines/scummvm-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.66 2015/02/19 06:22:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.67 2015/03/09 21:53:24 mr_bones_ Exp $
+
+  09 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scummvm-tools-1.7.0-binprefix.patch, scummvm-tools-1.7.0.ebuild:
+  fix install (bug #542560)
 
   19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
   scummvm-tools-1.7.0.ebuild:
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 87cc1f9eeffc..9614fb3f03b2 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,4 +1,5 @@
+AUX scummvm-tools-1.7.0-binprefix.patch 539 SHA256 23d256f53d9fcf9a1989c03bbac5470673215a9f22c1ffd4ed787b9b5f22a511 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3 WHIRLPOOL aa9f690f96c808796a4ae808e50756b9de1fc220077bbfc7ba74c0e7c6a16432105d58787eec4878084889c3717f3538bd81fc6c15b925eb95c23b9a1cd138d5
 DIST scummvm-tools-1.7.0.tar.bz2 956801 SHA256 b4005c3d68e4c5bda4fa9e31f3998fc5b45b7c9381890ed3d5f0b57f77a62589 SHA512 6a04307912327cb91fb4e1689b67ce621c3e28cbd5460c20974384907d21cb266e9d00b74a6991813366d2c34f966d79dc12e71750d083c82b89a2ec654b04b1 WHIRLPOOL 2034eb3817b5e11b0ba626f2b2b88a2e29a973e538f7a43cafffa0247792c4292821dfa20decd18842155938a65cb74af35b18dbf5d0da61b2d4c18e1b1dc2fc
-EBUILD scummvm-tools-1.7.0.ebuild 1463 SHA256 fb79dd906d7e4c193f4b87845890ed149e246a0b9751e85f4afab23f210ae94e SHA512 e24b1dae1182b29e414f5762a94418b6f321dcf7bd3e538f8b7423b96792565b06e0caf25b19366ac9465388e436abe5de354f60f66f38c5166fd87609907294 WHIRLPOOL 41def2b475eb384edfebb435cb26a7f0261fef567f654b8ca2efebd5a3004c4f020724839067c89d07ecde98de4346a4e36afd7f48a5a29046b4709235360c6e
-MISC ChangeLog 8687 SHA256 0f6f718937cc881cdf7aa01dbbbda4d803325fd8903833363eedee7a22b8e3b6 SHA512 5fcbec5f8243383142388b6c34c5c03b8e43cbcd841426e1e15fdae7b4686dd70356969037bd718bd2436dae710ff2cbd8dc67b908502316ece7a378f4907f93 WHIRLPOOL 3a4e143b49a8684f35cf0a7893eff49d94d5f15985b4af58df376def104502364860d44566cf3b6fa594582e1c52b9b94da37354d7bccf9aa9f094f8b30a8445
+EBUILD scummvm-tools-1.7.0.ebuild 1486 SHA256 930477b16ad24bab85951156e27c9e0562055cc359bd1d07b525c602bf3b984e SHA512 dc1ba458180144ec2669b9c424c91c5e339b0e0c0d489fe3e192615170187b5c5105e1bb7eca819b3ff7ae5a61b00b2338b8a86c6b57ed31a46e213c2559895e WHIRLPOOL c207b1ced96a01ad8f409d17e46f7c08cf32010fb37e68516762eec52b3f416846bc4f348733b5a5f81578de0b937b52fe5bb884bbd1a132cdbe1b9faaa5214c
+MISC ChangeLog 8845 SHA256 e2ce2de21699a2cfeafc5f20a4693c7b9e8a439180972b80414a7a9857d45439 SHA512 731b0a48b2a6f472b432c3a6436868e23071da3b73608e46b69e1e1647471e5c7e1bc8cf73a931c943271e32e195c6a24d2af3c2054450b184edf32f2726579b WHIRLPOOL 41d94dded0998fe79eb82e12a55eb76a6461b0cd5d76bd69d2f477d9bc8a010e17976eed7c0d585094dd19305e30a488df48d39172201c3d6f44e4f01fec11e6
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch
new file mode 100644
index 000000000000..604db075395c
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-1.7.0-binprefix.patch
@@ -0,0 +1,11 @@
+--- scummvm-tools-1.7.0.orig/Makefile.common
++++ scummvm-tools-1.7.0/Makefile.common
+@@ -312,7 +312,7 @@
+ install: $(TARGETS)
+ 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
+-	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done
++	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; done
+ 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
+ 	$(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools
+ 
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
index d09f264148d0..595e33965230 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild,v 1.6 2015/02/19 06:22:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild,v 1.7 2015/03/09 21:53:24 mr_bones_ Exp $
 
 EAPI=5
 WX_GTK_VER=2.8
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	rm -rf *.bat dists/win32
 	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+	epatch "${FILESDIR}/${P}-binprefix.patch"
 }
 
 src_configure() {
@@ -39,6 +40,7 @@ src_configure() {
 		--mandir=/usr/share/man \
 		--prefix="${GAMES_PREFIX}" \
 		--libdir="${GAMES_PREFIX}/lib" \
+		--datadir="${GAMES_DATADIR}" \
 		$(use_enable flac) \
 		$(use_enable iconv) \
 		$(use_enable iconv freetype) \
@@ -48,10 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	local f
-	for f in $(find . -type f -perm +1 -print); do
-		newgamesbin $f ${PN}-${f##*/} || die
-	done
+	emake DESTDIR="${D}" EXEPREFIX="${PN}-" install
 	dodoc README TODO
 	prepgamesdirs
 }