From: Tristan Heaven <tristan@gentoo.org>
Date: Wed, 4 Apr 2007 20:51:56 +0000 (+0000)
Subject: use games_get_libdir
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc4a9e738e786e1cf92e2a7f7d773ef216da3025;p=gentoo.git

use games_get_libdir
Package-Manager: portage-2.1.2.3
---

diff --git a/games-strategy/castle-combat/Manifest b/games-strategy/castle-combat/Manifest
index db1ca41d6219..1e5b217dafdd 100644
--- a/games-strategy/castle-combat/Manifest
+++ b/games-strategy/castle-combat/Manifest
@@ -7,10 +7,10 @@ EBUILD castle-combat-0.7.4.ebuild 992 RMD160 7678236a3dcb28139601bc07b99a965f9e7
 MD5 de69d7f0fbfa05683d350e1760798e74 castle-combat-0.7.4.ebuild 992
 RMD160 7678236a3dcb28139601bc07b99a965f9e7d9402 castle-combat-0.7.4.ebuild 992
 SHA256 5e84c36b54a93ace833eca3f4178c83ba763ec1988ec44fb00c8fac61691eea7 castle-combat-0.7.4.ebuild 992
-EBUILD castle-combat-0.8.1.ebuild 959 RMD160 3f93d6997e5bab56f6578b63ffce6a72d6dd8201 SHA1 346b77959f96ddd3d563a7818bf325b1b0fee9dc SHA256 cca0c1a309335cf1da8c712ae7a8fae230af96479427568a1879fcfe3a7a8f61
-MD5 54b97ff0252504759cfa0e21f84277e1 castle-combat-0.8.1.ebuild 959
-RMD160 3f93d6997e5bab56f6578b63ffce6a72d6dd8201 castle-combat-0.8.1.ebuild 959
-SHA256 cca0c1a309335cf1da8c712ae7a8fae230af96479427568a1879fcfe3a7a8f61 castle-combat-0.8.1.ebuild 959
+EBUILD castle-combat-0.8.1.ebuild 1165 RMD160 1ddf6c361edeae44205472172c8b3a84c4765d62 SHA1 198a5de719ff8594029a4165d45cae1c4d05c81f SHA256 71079d25e95d9caca04c68cefb82e04a3cebaa5080ea51c46fc6a5b580064d72
+MD5 acab004eb95857eb32b4e8f01edbeaf2 castle-combat-0.8.1.ebuild 1165
+RMD160 1ddf6c361edeae44205472172c8b3a84c4765d62 castle-combat-0.8.1.ebuild 1165
+SHA256 71079d25e95d9caca04c68cefb82e04a3cebaa5080ea51c46fc6a5b580064d72 castle-combat-0.8.1.ebuild 1165
 MISC ChangeLog 1128 RMD160 78cb8265c5f4306f8dc028cde9fc5c19e9fab666 SHA1 670284db81b0b6965e8421cd14851e5b3e0653e9 SHA256 26202019f3042d23b14f754e7cd801a57fadbf18251350c032a4259d632af93f
 MD5 2624b02b79d146646a10c5b728e98ec5 ChangeLog 1128
 RMD160 78cb8265c5f4306f8dc028cde9fc5c19e9fab666 ChangeLog 1128
@@ -26,9 +26,9 @@ MD5 25ced7ed81020a2ddcb28dcb69067fcd files/digest-castle-combat-0.8.1 262
 RMD160 908b5da6176faf4a4b17ca2d9af6fd407341c6d2 files/digest-castle-combat-0.8.1 262
 SHA256 8500dfba6e3e251eede8318464a894918328ebe59f3aa4c638bbaedb4bff3d02 files/digest-castle-combat-0.8.1 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFdv3mkT4lNIS36YERArhjAJ43oXySgoaJxgziP1nYDGhpFjFYzACgi2BZ
-8AnuEN40LGwPehAmCvljlVY=
-=fPo9
+iD8DBQFGFA/ydz7hIScOURERAhZDAJ9rMI3msTqO/iniBZnUK5taXS+A2wCeIuvs
+eJrjueNiTYbYKV49aCM7U98=
+=VgTi
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/castle-combat/castle-combat-0.8.1.ebuild b/games-strategy/castle-combat/castle-combat-0.8.1.ebuild
index 4b6e972a150a..6d1f5e1ebb1d 100644
--- a/games-strategy/castle-combat/castle-combat-0.8.1.ebuild
+++ b/games-strategy/castle-combat/castle-combat-0.8.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/castle-combat/castle-combat-0.8.1.ebuild,v 1.1 2006/07/29 23:05:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/castle-combat/castle-combat-0.8.1.ebuild,v 1.2 2007/04/04 20:51:56 nyhm Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A clone of the old arcade game Rampart"
 HOMEPAGE="http://www.linux-games.com/castle-combat/"
-SRC_URI="mirror://sourceforge/castle-combat/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,19 +19,21 @@ DEPEND="dev-python/twisted
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i -e "s:src:${GAMES_LIBDIR}/${PN}:"	\
-		castle-combat.py
-	sed -i -e "/data_path =/s:\"data:\"${GAMES_DATADIR}/${PN}:"	\
-		src/common.py
+	sed -i "s:src:$(games_get_libdir)/${PN}:" ${PN}.py \
+		|| die "sed ${PN}.py failed"
+	sed -i "/data_path =/s:\"data:\"${GAMES_DATADIR}/${PN}:" src/common.py \
+		|| die "sed common.py failed"
 }
 
 src_install() {
-	newgamesbin castle-combat.py castle-combat
-	insinto ${GAMES_LIBDIR}/${PN}
-	doins src/*
-	insinto ${GAMES_DATADIR}/${PN}
-	doins -r data/{colourba.ttf,gfx,sound}
-	dohtml -r data/font_read_me.html data/doc
+	newgamesbin ${PN}.py ${PN} || die "newgamesbin failed"
+	insinto "$(games_get_libdir)"/${PN}
+	doins src/* || die "doins src failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data/{colourba.ttf,gfx,sound} || die "doins data failed"
+	newicon data/gfx/castle.png ${PN}.png
+	make_desktop_entry ${PN} Castle-Combat
+	dohtml data/font_read_me.html data/doc/rules.html
 	dodoc TODO
 	prepgamesdirs
 }