version bump; clean old; fixes bug #260183

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 33 insertions, 20 deletions

diff --git a/games-arcade/cdogs-sdl/ChangeLog b/games-arcade/cdogs-sdl/ChangeLog
index f59ea8bbd70d..37a2a70e99c4 100644
--- a/games-arcade/cdogs-sdl/ChangeLog
+++ b/games-arcade/cdogs-sdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/cdogs-sdl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cdogs-sdl/ChangeLog,v 1.2 2007/08/28 16:58:15 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cdogs-sdl/ChangeLog,v 1.3 2009/02/26 21:47:21 mr_bones_ Exp $
+
+*cdogs-sdl-0.4 (26 Feb 2009)
+
+  26 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -cdogs-sdl-0.3.ebuild, +cdogs-sdl-0.4.ebuild:
+  version bump; clean old; fixes bug #260183
 
   28 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org> cdogs-sdl-0.3.ebuild:
   x86 and tidy ebuild
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 499273447c5b..b7b206678789 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,5 +1,5 @@
-DIST cdogs-data-2006-08-16.tar.bz2 213791 RMD160 f901b8ef766ef666bec7182b8255608b6c6275e2 SHA1 6bf2c5872f5cc60bf3eb85248c942bd2584adc1a SHA256 6defd5a61bb6115e5551c01beaa9df259734350b56d5710d3c561ddbf2a7b711
-DIST cdogs-sdl-0.3.tar.bz2 153429 RMD160 04000e4b716617305b771d521aae1e432ddda614 SHA1 128999926d87f0bd8aec3feb920e4ebf7bef1dc7 SHA256 1b48814112ba43566fab13c6144e48827ea7d5488d47871d24bfbc2aa85e8ba9
-EBUILD cdogs-sdl-0.3.ebuild 1277 RMD160 623924b2fc63a324d26e23911cc2f6da78a64cbb SHA1 e9960db0cf85a88a6e689b386d79e8815c3b08fe SHA256 17d68c4bcac73f070c4ddc2cedb8d3bd57a0a3e0662e506bcfa3d4d1feb71870
-MISC ChangeLog 497 RMD160 ac0033483f7d4f763b1ecb4f056fbb058408da35 SHA1 ced8a500e0c09fcfa337e85dac8956679fe6c9dc SHA256 7c8eabdc92adc500fd4ba67269be1f2a2d899de7a2ec3fd0033ecd59d254125b
+DIST cdogs-data-2007-07-06.tar.bz2 218810 RMD160 b4fde498e91a35614ca976ebcf0999046b3f24ff SHA1 a99400f3991e456e7f25d9cc2a93c6dd3138b6e0 SHA256 6c5a10dee1a131f353853223fddf9208c0695f076d4e18a22e9f82800a94ebdc
+DIST cdogs-sdl-0.4.tar.bz2 164804 RMD160 e8bf45abf60bf41261949fb40bf2ea6e15d77a34 SHA1 35093151884e106075f5c9bd241f8a004cb52b73 SHA256 63b7cabf6040c939735b4776e3f0fa90df711ee5a94b2387afca2d07b9876fd6
+EBUILD cdogs-sdl-0.4.ebuild 1365 RMD160 8499d705422408151bb5f4ea62e35f5c2edda820 SHA1 acb18b9e38341bf4a867dbdacad58241ae221edf SHA256 4d6eb134f4b8d30fe8beaaf9ead4859064da6653da0ea74ba6f7b5cbd409a214
+MISC ChangeLog 676 RMD160 a978a43748f31d75d9a14e228f181b5c2cd1cf51 SHA1 9daa0bf10fa6ec9603b4ed29dc56d959d854b08f SHA256 96594982c4b8092676b932d601cf801e0f03ff9f9d64d013bd976610b03fd02b
 MISC metadata.xml 468 RMD160 2bf6df0f97d765653a569bc2400331234761e2db SHA1 3a9d4d5867bd81d55e1060c3e152d052d01a04ea SHA256 90469e88a8bfa943093a9b0cebcce431c15cf96949b501874792e378cfe04992
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-0.3.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-0.4.ebuild
index 51e5999ee932..860ce0f7f1cb 100644
--- a/games-arcade/cdogs-sdl/cdogs-sdl-0.3.ebuild
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-0.4.ebuild
@@ -1,33 +1,41 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/cdogs-sdl/cdogs-sdl-0.3.ebuild,v 1.2 2007/08/28 16:58:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/cdogs-sdl/cdogs-sdl-0.4.ebuild,v 1.1 2009/02/26 21:47:21 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
-CDOGS_DATA="cdogs-data-2006-08-16"
-
+CDOGS_DATA="cdogs-data-2007-07-06"
 DESCRIPTION="A port of the old DOS arcade game C-Dogs"
 HOMEPAGE="http://lumaki.com/code/cdogs"
-SRC_URI="http://icculus.org/${PN}/files/src/${P}.tar.bz2
-	http://icculus.org/${PN}/files/data/${CDOGS_DATA}.tar.bz2"
+SRC_URI="http://icculus.org/cdogs-sdl/files/src/${P}.tar.bz2
+	http://icculus.org/cdogs-sdl/files/data/${CDOGS_DATA}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/sdl-mixer"
+DEPEND="media-libs/libsdl
+	media-libs/sdl-mixer"
 
 S=${WORKDIR}/${P}/src
 
 src_unpack() {
 	unpack ${A}
 	mv ${CDOGS_DATA} ${P}/data || die "Failed moving data around"
-	cd "${S}"
+}
+
+src_prepare() {
 	sed -i \
 		-e "/^CF_OPT/d" \
+		-e "/^CC/d" \
 		Makefile \
-		|| die "Failed patching Makefile"
+		|| die "sed failed"
+	sed -i \
+		-e "/\bopen(/s/)/, 0666)/" \
+		files.c \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -39,12 +47,11 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		BINDIR="${GAMES_BINDIR}" \
-		DATADIR="${GAMES_DATADIR}/${PN}" \
-		install || die "emake install failed"
+	dogamesbin cdogs || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r ../data/*
 	newicon ../data/cdogs_icon.png ${PN}.png
 	dodoc ../doc/{README,AUTHORS,ChangeLog,README_DATA,TODO,original_readme.txt}
-	make_desktop_entry "cdogs -fullscreen" ${PN}
+	make_desktop_entry "cdogs -fullscreen" C-Dogs
 	prepgamesdirs
 }