savegame bugfix, bug #193201

Package-Manager: portage-2.1.3.9

4 files changed, 170 insertions, 9 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 452027a488ff..fbd7ba8134f1 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.15 2007/09/08 21:40:58 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.16 2007/09/27 23:58:39 nyhm Exp $
+
+*ufo-ai-2.1.1-r1 (27 Sep 2007)
+
+  27 Sep 2007; Tristan Heaven <nyhm@gentoo.org> +ufo-ai-2.1.1-r1.ebuild:
+  savegame bugfix, bug #193201
 
   08 Sep 2007; Tristan Heaven <nyhm@gentoo.org> ufo-ai-2.1.1.ebuild:
   HOMEPAGE update, bug #191694
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 875bcbbf06eb..69fbc03d3421 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -10,19 +10,24 @@ DIST music.tar.bz2 33767479 RMD160 a216e484e3421d0af165bb70365bcdb9a5285508 SHA1
 DIST ufoai-2.1.1-data.tar 267755520 RMD160 ddbf856710c18ed4b73061b14ed340b70b083ea4 SHA1 719e25c498b48f583d81500de81693853dee1ffa SHA256 5e92950f93d0dcef7fbdefc0c0da6f398b06476837bfce79243baa6227176f7c
 DIST ufoai-2.1.1-i18n.tar.bz2 1065252 RMD160 2eb8a9551eae2268dcfffdef3a6ad44f7becf04f SHA1 77942366e6c8db8741416a67071587ff115741bf SHA256 ed3467118be97bcd27f983567ba09f2cf5492841c10a595b2bc51b4d1c48738e
 DIST ufoai-2.1.1-source.tar.bz2 6896537 RMD160 cde3338705c41982c4ade660adbd1b26667c6c43 SHA1 b0d9e6edcbbe0ea1f64ce5d4a08e7cefe1f42b6c SHA256 9a2866aa94296c53d904f6f9bf314fc1f10d51220efeb1c154b7604d6f5ff0cb
+DIST ufoai-2.1.1-source_hotfix.tar.bz2 6896824 RMD160 2769419411e875b9d2313bfa255e3eab806b17cb SHA1 8b11434714231facb8af6420cdc4e7c290883910 SHA256 485c4e78ae73d28c4a06156805925047391a3ae571883275c1875bbeb1651129
 DIST ufoai_source_040218.zip 1548520 RMD160 7ca428ae08021ce7366bdaef02cbe6a0b5a99270 SHA1 683f216cf0cb466fff62b042a6d8b5f0d713e66a SHA256 6d6b5b3b8e045742cbbef77d1a042102310f8452b5b4e0be363f15a86b7af748
 EBUILD ufo-ai-0.10.040218.ebuild 1507 RMD160 3e069613c2fb417e0e945469267cd2071f375eaf SHA1 787ae54fe11a527ed657af8bce6ba98a1f219579 SHA256 9f62118a74c47a3170f23b5e17479fe6fa9437cfadcf312f720f0c258d38cf86
 MD5 f18adacb1f9f8bbc07d2a90d88999e56 ufo-ai-0.10.040218.ebuild 1507
 RMD160 3e069613c2fb417e0e945469267cd2071f375eaf ufo-ai-0.10.040218.ebuild 1507
 SHA256 9f62118a74c47a3170f23b5e17479fe6fa9437cfadcf312f720f0c258d38cf86 ufo-ai-0.10.040218.ebuild 1507
+EBUILD ufo-ai-2.1.1-r1.ebuild 3429 RMD160 5f215eeb06c64978405b3776f47343b54e445d95 SHA1 c290ebfffe4da46b4f42bdf29acd2190a0a0a98c SHA256 6318631aa3ef8aa79ca00e0fdfcc68a5c21029f5d2e8b1d0085179885b37dd69
+MD5 10cae8a332b0de287aa82fa9ed6c5b2d ufo-ai-2.1.1-r1.ebuild 3429
+RMD160 5f215eeb06c64978405b3776f47343b54e445d95 ufo-ai-2.1.1-r1.ebuild 3429
+SHA256 6318631aa3ef8aa79ca00e0fdfcc68a5c21029f5d2e8b1d0085179885b37dd69 ufo-ai-2.1.1-r1.ebuild 3429
 EBUILD ufo-ai-2.1.1.ebuild 3614 RMD160 115b653a912cbab59eff6c5aeda678de0d4a7772 SHA1 f7d0ab840e0ab898aa3f2dcc9780afffc2e3fd6a SHA256 d24790e9552fc37a96663c92749a7b8a339a74aa6ecee4deaac2cbd0259cc975
 MD5 b17b7793be302bc1f447081cf9c0c811 ufo-ai-2.1.1.ebuild 3614
 RMD160 115b653a912cbab59eff6c5aeda678de0d4a7772 ufo-ai-2.1.1.ebuild 3614
 SHA256 d24790e9552fc37a96663c92749a7b8a339a74aa6ecee4deaac2cbd0259cc975 ufo-ai-2.1.1.ebuild 3614
-MISC ChangeLog 2071 RMD160 d45bbb36d9a5c6dc0e647b80e4722579a5f7b385 SHA1 b1f902376b05992580034c0c028843f93ae3eb1c SHA256 f1ab7cfa6f8f2defe7f6f169ec388732ecf71d60c678d622b1abf053efb0eaa7
-MD5 7ec9b6d03ed5b05d87e659c41820b101 ChangeLog 2071
-RMD160 d45bbb36d9a5c6dc0e647b80e4722579a5f7b385 ChangeLog 2071
-SHA256 f1ab7cfa6f8f2defe7f6f169ec388732ecf71d60c678d622b1abf053efb0eaa7 ChangeLog 2071
+MISC ChangeLog 2208 RMD160 ea01cfea1523af0281d7b1cec9e56a61443f324e SHA1 2efb7145c098b10ffbc7414b7b68737aa98ad282 SHA256 01748ae2235c4fb84f41564d81d6558c930e86bcfac471c646ed1ee8fd5d559a
+MD5 56d1dc21c3e5bb963830b1752080471b ChangeLog 2208
+RMD160 ea01cfea1523af0281d7b1cec9e56a61443f324e ChangeLog 2208
+SHA256 01748ae2235c4fb84f41564d81d6558c930e86bcfac471c646ed1ee8fd5d559a ChangeLog 2208
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +38,13 @@ SHA256 c5e099430f40f75c38035e261cc998e2c91b6bf349a4067e3d8d98b551c25bb1 files/di
 MD5 6c35cbd820c88224eef282981d150f91 files/digest-ufo-ai-2.1.1 994
 RMD160 01a0a4404078eff9ee6f5b296273a1b30a059211 files/digest-ufo-ai-2.1.1 994
 SHA256 cbd7708549d35834ae758ae048dd558f74b6b18bcfe9b5e29943a47716743739 files/digest-ufo-ai-2.1.1 994
+MD5 59ff1ed15ed4c84e00f836dc37eac56b files/digest-ufo-ai-2.1.1-r1 1015
+RMD160 8ac21479d037d9fe4de919a7b3e92fa8224426bb files/digest-ufo-ai-2.1.1-r1 1015
+SHA256 c00b5068ba6769b8cb88e03773127fd0f275982791af0a6d28dcf2a9db2d5102 files/digest-ufo-ai-2.1.1-r1 1015
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG4xbwdz7hIScOURERAmxgAJ4hn14WPa8hYL2LmK2KbNC2EG8JqACghozE
-pHjVZNKPtvXM6WPpPLvNsKs=
-=p4sV
+iD8DBQFG/EPDdz7hIScOURERAs4dAJ9rn3LFvST7wkflTuSXSIfvC7y/tACgjIcK
+81NrxY96Yx5Xz/5MzoVmuv4=
+=fDbB
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/files/digest-ufo-ai-2.1.1-r1 b/games-strategy/ufo-ai/files/digest-ufo-ai-2.1.1-r1
new file mode 100644
index 000000000000..c66a48c68232
--- /dev/null
+++ b/games-strategy/ufo-ai/files/digest-ufo-ai-2.1.1-r1
@@ -0,0 +1,12 @@
+MD5 7a832663638fa6eeedd0abd187edbe63 music.tar.bz2 33767479
+RMD160 a216e484e3421d0af165bb70365bcdb9a5285508 music.tar.bz2 33767479
+SHA256 1d4bdabcd5f30657fbec49d0af02c8b4a6ce42e208bdc101172c667de4781751 music.tar.bz2 33767479
+MD5 ae2ebfeaf34afab92638e128c76860b9 ufoai-2.1.1-data.tar 267755520
+RMD160 ddbf856710c18ed4b73061b14ed340b70b083ea4 ufoai-2.1.1-data.tar 267755520
+SHA256 5e92950f93d0dcef7fbdefc0c0da6f398b06476837bfce79243baa6227176f7c ufoai-2.1.1-data.tar 267755520
+MD5 e3d628c3bfde98b933620c6c30160666 ufoai-2.1.1-i18n.tar.bz2 1065252
+RMD160 2eb8a9551eae2268dcfffdef3a6ad44f7becf04f ufoai-2.1.1-i18n.tar.bz2 1065252
+SHA256 ed3467118be97bcd27f983567ba09f2cf5492841c10a595b2bc51b4d1c48738e ufoai-2.1.1-i18n.tar.bz2 1065252
+MD5 f7c7a15074c2eb5916bf791df89ebee0 ufoai-2.1.1-source_hotfix.tar.bz2 6896824
+RMD160 2769419411e875b9d2313bfa255e3eab806b17cb ufoai-2.1.1-source_hotfix.tar.bz2 6896824
+SHA256 485c4e78ae73d28c4a06156805925047391a3ae571883275c1875bbeb1651129 ufoai-2.1.1-source_hotfix.tar.bz2 6896824
diff --git a/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..cdb069ebd454
--- /dev/null
+++ b/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.1.1-r1.ebuild,v 1.1 2007/09/27 23:58:39 nyhm Exp $
+
+inherit eutils autotools games
+
+MY_P=${P/-}
+DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="http://ufoai.ninex.info/"
+SRC_URI="mirror://sourceforge/ufoai/music.tar.bz2
+	mirror://sourceforge/ufoai/${MY_P}-data.tar
+	mirror://sourceforge/ufoai/${MY_P}-source_hotfix.tar.bz2
+	mirror://sourceforge/ufoai/${MY_P}-i18n.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa arts debug dedicated dga doc ipv6 jack master oss paranoid"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	dga? ( x11-libs/libXxf86dga )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}-source
+dir=${GAMES_DATADIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local libdir=$(games_get_libdir)/${PN}
+	# Set libdir
+	sed -i \
+		-e "s:libPath, \"\.\":libPath, \"${libdir}\":" \
+		src/{client,ports/linux}/*.c || die "sed *.c failed"
+
+	sed -i \
+		-e "s:\"s_libdir\", \"\":\"s_libdir\", \"${libdir}\":" \
+		src/client/snd_ref.c || die "sed snd_ref.c failed"
+
+	sed -i \
+		-e "s:game\.so\", path:game\.so\", \"${libdir}\":" \
+		src/ports/linux/sys_linux.c || die "sed sys_linux.c failed"
+
+	# Set basedir
+	sed -i \
+		-e "s:\"fs_basedir\", \"\.\":\"fs_basedir\", \"${dir}\":" \
+		src/qcommon/files.c || die "sed files.c failed"
+
+	sed -i \
+		-e "s:/usr/local/games/ufoai:${dir}:" \
+		src/tools/gtkradiant/games/ufoai.game || die "sed ufoai.game failed"
+
+	# Fixes bug in finding text files - it should use fs_basedir
+	sed -i \
+		-e "s:FS_GetCwd():\"${dir}\":" \
+		src/qcommon/common.c || die "sed common.c failed"
+
+	eautoreconf
+}
+
+src_compile() {
+# Forces building of client.
+# gettext is required to show the intro text.
+# egamesconf fails with openal.
+#		$(use_with openal)
+	egamesconf \
+		$(use_enable dedicated) \
+		$(use_enable master) \
+		$(use_enable !debug release) \
+		$(use_enable paranoid) \
+		--with-vid-glx \
+		--with-vid-vidmode \
+		--with-sdl \
+		--with-snd-sdl \
+		$(use_with alsa snd-alsa) \
+		$(use_with arts snd-arts) \
+		$(use_with jack snd-jack) \
+		$(use_with oss snd-oss) \
+		$(use_with dga vid-dga) \
+		$(use_with ipv6) \
+		--with-gettext \
+		--without-openal \
+		|| die "egamesconf failed"
+
+	emake || die "emake failed"
+
+	if use doc ; then
+		emake docs || die "emake docs failed"
+	fi
+}
+
+src_install() {
+	# ufo is usually started by a "ufoai" wrapper script.
+	# Might as well standardize on the ebuild name, for minimum confusion.
+	newgamesbin ufo ${PN} || die
+	newicon src/ports/linux/installer/data/ufo.xpm ${PN}.xpm || die
+	make_desktop_entry ${PN} "UFO: Alien Invasion" ${PN}.xpm
+
+	if use dedicated ; then
+		dogamesbin ufoded || die
+	fi
+
+	if use master ; then
+		dogamesbin ufomaster || die
+	fi
+
+	if [[ -f ufo2map ]] ; then
+		dogamesbin ufo2map || die
+	fi
+
+	exeinto "$(games_get_libdir)/${PN}"
+	doexe *.so base/game.so || die "doexe ${f} failed"
+
+	insinto "${dir}"
+	doins -r "${WORKDIR}"/{base,music} || die "doins -r failed"
+
+	if use doc ; then
+		dohtml -r "${WORKDIR}"/docs/html/*
+	fi
+
+	prepgamesdirs
+}