Fix install path when not using the default GAMES_DATADIR

Package-Manager: portage-2.1.2_pre2-r7

4 files changed, 24 insertions, 21 deletions

diff --git a/games-strategy/dopewars/ChangeLog b/games-strategy/dopewars/ChangeLog
index 3f043eee20d8..51838e22b9ea 100644
--- a/games-strategy/dopewars/ChangeLog
+++ b/games-strategy/dopewars/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/dopewars
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.15 2006/10/05 18:44:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.16 2006/10/09 15:03:27 nyhm Exp $
+
+  09 Oct 2006; Tristan Heaven <nyhm@gentoo.org> dopewars-1.5.12.ebuild:
+  Fix install path when not using the default GAMES_DATADIR
 
   05 Oct 2006; Tristan Heaven <nyhm@gentoo.org> dopewars-1.5.12.ebuild:
   Fix gettext dependency
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 6e5fd517d57f..09c0189ca94f 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,16 +1,16 @@
-DIST dopewars-1.5.12.tar.gz 1419725
-EBUILD dopewars-1.5.12.ebuild 1667 RMD160 6535072a4f89337ba4b401118311d76b5b69fe00 SHA1 f53754e0be4b7ad3a83c923c6551ed8832dc7312 SHA256 0f424c1a1b444fdda683014102e5a114a0f95495975e4ddddc02e48e9dc18273
-MD5 69eb148bd698922a014c8532912ae7fe dopewars-1.5.12.ebuild 1667
-RMD160 6535072a4f89337ba4b401118311d76b5b69fe00 dopewars-1.5.12.ebuild 1667
-SHA256 0f424c1a1b444fdda683014102e5a114a0f95495975e4ddddc02e48e9dc18273 dopewars-1.5.12.ebuild 1667
-MISC ChangeLog 4509 RMD160 e08488a1cd09afd05a97253944c1749dcfb7704a SHA1 7d40b7513b72ae6a9a89935489e0e606077daec0 SHA256 acb03917db96f0a7364d5a1c849d657f067eade21818cd0ee5d236b8285c31e1
-MD5 c9f25f7a264ca126d1e3d5b117d34c83 ChangeLog 4509
-RMD160 e08488a1cd09afd05a97253944c1749dcfb7704a ChangeLog 4509
-SHA256 acb03917db96f0a7364d5a1c849d657f067eade21818cd0ee5d236b8285c31e1 ChangeLog 4509
+DIST dopewars-1.5.12.tar.gz 1419725 RMD160 66c86bceb67657a9fb2ef7944b1a069dafab8ae0 SHA1 ad46a38e225680e591b078eeec563d47b96684bc SHA256 23059dcdea96c6072b148ee21d76237ef3535e5be90b3b2d8239d150feee0c19
+EBUILD dopewars-1.5.12.ebuild 1694 RMD160 ef30cda328386bc38fd744a8e415f1a2dcc9ae00 SHA1 be4c416e8c51b600c9b949b54c1fc33dcfd2725e SHA256 c819d8cbe4654d94dfe11810d240b8f6deda2b9354b38635e09540dcd256a25e
+MD5 10e79511f656504e38abba7bf0c5faad dopewars-1.5.12.ebuild 1694
+RMD160 ef30cda328386bc38fd744a8e415f1a2dcc9ae00 dopewars-1.5.12.ebuild 1694
+SHA256 c819d8cbe4654d94dfe11810d240b8f6deda2b9354b38635e09540dcd256a25e dopewars-1.5.12.ebuild 1694
+MISC ChangeLog 4642 RMD160 135e567b07a4ff8b4391cc67abfa5769cdc3c811 SHA1 e958b60c4396645195169da267940a480c996bee SHA256 8e76174bbbd18abf9bcc569d18af53a0a6a57c5bca27e7a0477cdf8de2f55284
+MD5 403726cdc653ff221d71812f4b12c60a ChangeLog 4642
+RMD160 135e567b07a4ff8b4391cc67abfa5769cdc3c811 ChangeLog 4642
+SHA256 8e76174bbbd18abf9bcc569d18af53a0a6a57c5bca27e7a0477cdf8de2f55284 ChangeLog 4642
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 0cff99a4a26ea3e5fa116560b00db64a files/digest-dopewars-1.5.12 68
-RMD160 409b88e9e99d65c77c9d347a2c89b7e7782ec114 files/digest-dopewars-1.5.12 68
-SHA256 9b70ec2090a361c73d3eee069503c5996c0540e15066ed70bc01ffd8547258b7 files/digest-dopewars-1.5.12 68
+MD5 8b5c47bdf2725a2caaeddca74c9c8b74 files/digest-dopewars-1.5.12 250
+RMD160 6793b48d65461e48a3122ec9ae7b8a2da3ad6545 files/digest-dopewars-1.5.12 250
+SHA256 d0876813a2e745d471cb10256e40ca7af4c083db655a469de5bcf1811ebad965 files/digest-dopewars-1.5.12 250
diff --git a/games-strategy/dopewars/dopewars-1.5.12.ebuild b/games-strategy/dopewars/dopewars-1.5.12.ebuild
index 678b832cfb00..0b1dea7d9e65 100644
--- a/games-strategy/dopewars/dopewars-1.5.12.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/dopewars-1.5.12.ebuild,v 1.2 2006/10/05 18:44:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/dopewars-1.5.12.ebuild,v 1.3 2006/10/09 15:03:27 nyhm Exp $
 
 inherit games
 
@@ -15,10 +15,7 @@ IUSE="nls ncurses gtk gnome esd sdl"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )
 	esd? ( media-sound/esound )
-	gtk? (
-		=x11-libs/gtk+-2*
-		dev-libs/glib
-	)
+	gtk? ( =x11-libs/gtk+-2* )
 	nls? ( virtual/libintl )
 	sdl? (
 		media-libs/libsdl
@@ -62,12 +59,13 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
+	dodir /usr/share
 	cd "${D}/${GAMES_DATADIR}"
-	use gnome && mv gnome ../ || rm -rf gnome
-	mv pixmaps ../
+	use gnome && mv gnome "${D}/usr/share" || rm -rf gnome
+	mv pixmaps "${D}/usr/share"
 	dohtml -r doc/*/*
 	rm -rf doc
 
diff --git a/games-strategy/dopewars/files/digest-dopewars-1.5.12 b/games-strategy/dopewars/files/digest-dopewars-1.5.12
index 7351f62ba046..2194e7568071 100644
--- a/games-strategy/dopewars/files/digest-dopewars-1.5.12
+++ b/games-strategy/dopewars/files/digest-dopewars-1.5.12
@@ -1 +1,3 @@
 MD5 debf749de9053dc2fb2e74c37ae06206 dopewars-1.5.12.tar.gz 1419725
+RMD160 66c86bceb67657a9fb2ef7944b1a069dafab8ae0 dopewars-1.5.12.tar.gz 1419725
+SHA256 23059dcdea96c6072b148ee21d76237ef3535e5be90b3b2d8239d150feee0c19 dopewars-1.5.12.tar.gz 1419725