games-action/meritous: Add missing die, remove obsolete dodir

svn path=/sunrise/; revision=7604

diff --git a/games-action/meritous/ChangeLog b/games-action/meritous/ChangeLog
index 8b7d1639dc57c7575f4b4af8b74eff24d589d2ff..7d9c81fe78799a541ec3387fcbbfcc4dc278214e 100644 (file)
--- a/games-action/meritous/ChangeLog
+++ b/games-action/meritous/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  meritous-1.2.ebuild:
+  Add missing die, remove obsolete dodir
+
   04 Jan 2009; Erik Hahn (a_b) <erik_hahn@gmx.de> +meritous-1.2.ebuild,
   +files/Makefile-flags.patch, +metadata.xml:
   Add games-action/meritous (Bug #253779)

diff --git a/games-action/meritous/Manifest b/games-action/meritous/Manifest
index ebcf9e89046b3290a9878292d172e8bcf460baff..3f2f77c19f25c3c41b2fee72c3d6598337e16de1 100644 (file)
--- a/games-action/meritous/Manifest
+++ b/games-action/meritous/Manifest
@@ -1,6 +1,6 @@
 AUX Makefile-flags.patch 772 RMD160 4e56507d39251d606c798f3f501a42cb7fdae41c SHA1 5471944e653c3fd363b8ad2f885104074b6aa8b6 SHA256 255c0226265d5bb9b269b667de44855fd9f09cb88fbbab7641994c14ec475464
 DIST data-dir.patch 23839 RMD160 517b06b6228a63d3cd211392008cef5366014d41 SHA1 30dde1b4f6193cdaf68263a3353e7da8b51a75e1 SHA256 1344a4cf82b6379326e8174ebc349ffc9b0b0d7a31b2015b22b4b3d586d48055
 DIST meritous_v12_src.tar.bz2 2469389 RMD160 aaa880c80a85c524ec8bb344edab015f86132781 SHA1 05c315b17324451c131b4c1cbded2e9f5ae23176 SHA256 20b2086240c810c04fd0ce4a24f9d9c9dacbac47da61c26758943f1fdef7571d
-EBUILD meritous-1.2.ebuild 1075 RMD160 3a7599d7de3172743d5909d8ca4e1c50e63c28a1 SHA1 4c6e591ce5c797874a6a43ca50bccbe823b372db SHA256 a4fdbd5a28a6943195281a4e857e7e9213ab9104b20d11cffb1ed9524d724d6a
-MISC ChangeLog 283 RMD160 c806a6e6672135802321331a441ee7f531066e8d SHA1 d7149b4d6843827361760f0a4972a0a9a35a81bd SHA256 7bf19b6bcc4fae174f5cb41000befb5bacffef49380917ed862b92dd0616f138
+EBUILD meritous-1.2.ebuild 1042 RMD160 9ea48c33bc7409b60cb7d081e3340072d84fbd24 SHA1 e3cff720153662c84d08d5067ab3aa4670e54261 SHA256 1d50cdd61f54a2d964f16c3d2eb60af4edc2df416359d966f3fedef69c60dd16
+MISC ChangeLog 407 RMD160 b2c95cb3743b88e4b036a744b14c5a06b19a0d64 SHA1 8bcb3b4da2bacf2e551b77301f3811671162109a SHA256 8a03ed576a778d5e66aa88b9818144a63ca3ed547c997d4677df28fd28d1f51f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/games-action/meritous/meritous-1.2.ebuild b/games-action/meritous/meritous-1.2.ebuild
index 330a62a9d20b8d7c17881df085ac9b6ec7c7aa4c..14e8a8a0a67b4baa085d97fab198c1ad5083fd75 100644 (file)
--- a/games-action/meritous/meritous-1.2.ebuild
+++ b/games-action/meritous/meritous-1.2.ebuild
@@ -33,12 +33,11 @@ src_prepare() {
 }
 
 src_compile() {
-       CFLAGS="${CFLAGS} -DDATA_DIR=\\\"${GAMES_DATADIR}/meritous\\\""
-       emake CC=$(tc-getCC) default
+       CFLAGS="${CFLAGS} -DDATA_DIR=\\\"${GAMES_DATADIR}/meritous\\\"" \
+       emake CC=$(tc-getCC) default || die
 }
 
 src_install() {
-       dodir "${GAMES_DATADIR}/meritous" || die
        insinto "${GAMES_DATADIR}/meritous" || die
        doins -r dat/* || die
        dogamesbin meritous || die