Version bump to 2.2.1 Bug #206145 by Jaak Ristioja

Package-Manager: portage-2.1.4.4

5 files changed, 164 insertions, 6 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index a21fff72f248..9c57a4ea3d31 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.19 2008/08/24 14:56:35 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.20 2008/10/04 19:46:06 tupone Exp $
+
+*ufo-ai-2.2.1 (04 Oct 2008)
+
+  04 Oct 2008; <tupone@gentoo.org> +files/ufo-ai-2.2.1-gentoo.patch,
+  +ufo-ai-2.2.1.ebuild:
+  Version bump to 2.2.1 Bug #206145 by Jaak Ristioja
 
   24 Aug 2008; Tupone Alfredo <tupone@gentoo.org>
   +files/ufo-ai-2.1.1-dprintf.patch, ufo-ai-2.1.1-r1.ebuild:
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 1737c4f14a0b..cf50785f442d 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -2,17 +2,21 @@
 Hash: SHA1
 
 AUX ufo-ai-2.1.1-dprintf.patch 416 RMD160 7c345bc0243062bc45cda3daafa1fff2098c7f75 SHA1 545a8335f91a2f0c95ff4476b806bf68a81dd09a SHA256 5c101f7ba1fd8bb8a52d8bf1c063c71194bff6a9451b211a49b129fe934120bc
+AUX ufo-ai-2.2.1-gentoo.patch 2273 RMD160 2cb17341e638a955cf6fcde610a9bbf67c3ee797 SHA1 74814edd9747de7077eaabf6c4ef2e16960126b7 SHA256 62711814268a142bb0ba304b0645735f077a5cc984c36b0f1e781a4c03759ff2
 DIST music.tar.bz2 33767479 RMD160 a216e484e3421d0af165bb70365bcdb9a5285508 SHA1 9ab42094077e4fda6db5bef0f4f0fc971ac1f3c2 SHA256 1d4bdabcd5f30657fbec49d0af02c8b4a6ce42e208bdc101172c667de4781751
 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_hotfix.tar.bz2 6896824 RMD160 2769419411e875b9d2313bfa255e3eab806b17cb SHA1 8b11434714231facb8af6420cdc4e7c290883910 SHA256 485c4e78ae73d28c4a06156805925047391a3ae571883275c1875bbeb1651129
+DIST ufoai-2.2.1-data.tar 390502400 RMD160 af91dd473f59c73e705181759059bd37ba215f62 SHA1 eb071333478bd6860179e12d8655301980f87d60 SHA256 639c37867733feb5c8cf0852cee6a183c4bc6cd8e31f4c39356b275790a6bd0a
+DIST ufoai-2.2.1-source.tar.bz2 7640531 RMD160 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99 SHA1 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb SHA256 0c0ff8fc72038963e44ae0420eacedbd7dfe4f9115527ec3554d8c707d0d5ee5
 EBUILD ufo-ai-2.1.1-r1.ebuild 3569 RMD160 e1873f25ca7a7f27e3e4bd8e99b546c003912291 SHA1 90064a48c3bd66e58ad5cd41695a8f0b159591a5 SHA256 b70c16c6222ed5d4b65f37af2d90ecfa71eb2742b043429e1b54afb567c1a21f
-MISC ChangeLog 2651 RMD160 8c783f5085a46d266b02b5f009ab0d85f5f3eb61 SHA1 fbda762a4aed87bb2d99fe1f95f974508e313348 SHA256 db53a2dda33399e6454c9ac3e2fac5ea3ecb5e8ec1d57c6ba3d93aa65e1ca33c
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+EBUILD ufo-ai-2.2.1.ebuild 2511 RMD160 e0cd7122adcf0b1ae6d0757a23e800fbe4a9f2bf SHA1 8d6745a428bf1484c7c47f2fd67e9cc4ba6ee43a SHA256 665a490b73132fc2bde158060b3f0798c802dce8b0fe43f8fdfd02cd4245bafd
+MISC ChangeLog 2827 RMD160 2b71bb1dc910328e8dbcb7dea1bb0e4c58e8cc59 SHA1 604daae362ba34ca6411eb7f6f4ddde71483b1e3 SHA256 69854dca7867c0411d46dab789019cf0ff1494240c353c4dd3bbedab14947983
+MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkixds0ACgkQFByi98F1FAjRKwCfSgSNuvzricN7iZptloAUOKgT
-KCcAnjS4C3w9tGc5zktI+S1pmtLlwbXj
-=mmbQ
+iEYEARECAAYFAkjnyGcACgkQVrx5UrvSjseHaQCbB1s8BwvUZdx/BIkX9KNamUdo
+qZAAnjDEN5TCrpu2OJFeJjauM45gCmdT
+=uALY
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-gentoo.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-gentoo.patch
new file mode 100644
index 000000000000..5fed2ad8a4e5
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-gentoo.patch
@@ -0,0 +1,44 @@
+--- src/common/files.c.old	2008-10-04 18:09:14.000000000 +0200
++++ src/common/files.c	2008-10-04 18:10:45.000000000 +0200
+@@ -889,7 +889,7 @@
+ 
+ 	/* basedir <path> */
+ 	/* allows the game to run from outside the data tree */
+-	fs_basedir = Cvar_Get("fs_basedir", ".", CVAR_NOSET, "Allows the game to run from outside the data tree");
++	fs_basedir = Cvar_Get("fs_basedir", "@GENTOO_DATADIR@", CVAR_NOSET, "Allows the game to run from outside the data tree");
+ 
+ 	/* start up with base by default */
+ 	FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string));
+--- src/tools/gtkradiant/games/ufoai.game.old	2008-10-04 18:22:56.000000000 +0200
++++ src/tools/gtkradiant/games/ufoai.game	2008-10-04 18:23:28.000000000 +0200
+@@ -3,7 +3,7 @@
+   type="q2"
+   name="UFO:Alien Invasion"
+   enginepath_win32="c:/ufoai/"
+-  enginepath_linux="/usr/local/games/ufoai/"
++  enginepath_linux="@GENTOO_DATADIR@"
+   enginepath_macos="/Applications/UFOAI/"
+   engine_win32="ufo.exe"
+   engine_linux="ufo"
+--- src/client/cl_main.c.old	2008-10-04 18:24:57.000000000 +0200
++++ src/client/cl_main.c	2008-10-04 18:26:05.000000000 +0200
+@@ -2506,7 +2506,7 @@
+ 	if (*fs_i18ndir->string)
+ 		Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath));
+ 	else
+-		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd());
++		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", "@GENTOO_DATADIR@");
+ 	Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath);
+ 	bindtextdomain(TEXT_DOMAIN, languagePath);
+ 	bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8");
+--- src/client/cl_language.c.old	2008-10-04 18:27:17.000000000 +0200
++++ src/client/cl_language.c	2008-10-04 19:03:04.000000000 +0200
+@@ -133,7 +133,7 @@
+ 	if (*fs_i18ndir->string)
+ 		Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath));
+ 	else
+-		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd());
++		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", "@GENTOO_DATADIR@");
+ 	Com_DPrintf(DEBUG_CLIENT, "CL_LanguageTest()... using mo files from '%s'\n", languagePath);
+ 	Q_strcat(languagePath, localeID, sizeof(languagePath));
+ 	Q_strcat(languagePath, "/LC_MESSAGES/ufoai.mo", sizeof(languagePath));
diff --git a/games-strategy/ufo-ai/metadata.xml b/games-strategy/ufo-ai/metadata.xml
index d3c2cc926f0b..8c35ca6b8d21 100644
--- a/games-strategy/ufo-ai/metadata.xml
+++ b/games-strategy/ufo-ai/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<use>
+    <flag name='editor'>Build map editor</flag>
+</use>
 </pkgmetadata>
diff --git a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
new file mode 100644
index 000000000000..3d8e2ae9fdcb
--- /dev/null
+++ b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 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.2.1.ebuild,v 1.1 2008/10/04 19:46:06 tupone Exp $
+
+inherit eutils autotools games
+
+MY_P="${P/o-a/oa}"
+
+DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
+HOMEPAGE="http://ufoai.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2
+	mirror://sourceforge/ufoai/${MY_P}-data.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated doc editor mmx"
+
+# Dependencies and more instructions can be found here:
+# http://ufoai.ninex.info/wiki/index.php/Compile_for_Linux
+RDEPEND="!dedicated? (
+		virtual/opengl
+		virtual/glu
+		media-libs/libsdl
+		media-libs/sdl-ttf
+		media-libs/sdl-mixer
+		media-libs/jpeg
+		media-libs/libpng
+		media-libs/libogg
+		media-libs/libvorbis
+		x11-proto/xf86vidmodeproto
+	)
+	editor? ( media-libs/jpeg )
+	net-misc/curl
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S=${WORKDIR}/${MY_P}-source
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# move data from packages to source dir
+	mv "${WORKDIR}/base" "${S}"
+
+	# Set basedir & fixes bug in finding text files - it should use fs_basedir
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		src/common/files.c \
+		src/tools/gtkradiant/games/ufoai.game \
+		src/client/cl_main.c \
+		src/client/cl_language.c \
+		|| die "sed failed"
+}
+
+src_compile() {
+	egamesconf \
+		$(use_enable mmx) \
+		--enable-release \
+		$(use_enable editor ufo2map) \
+		--enable-dedicated \
+		$(use_enable !dedicated client) \
+		--with-shaders
+
+	emake lang || die "emake langs failed"
+
+	if use doc ; then
+		emake pdf-manual || die "emake pdf-manual failed (USE=doc)"
+	fi
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# server
+	dogamesbin ufoded || die "Failed installing server"
+	newicon src/ports/linux/installer/data/ufo.xpm ${PN}.xpm \
+		|| die "Failed installing icon"
+	make_desktop_entry ${PN}-ded "UFO: Alien Invasion Server" ${PN}.xpm
+	if ! use dedicated ; then
+		# client
+		newgamesbin ufo ${PN} || die "Failed installing client"
+		make_desktop_entry ${PN} "UFO: Alien Invasion" ${PN}.xpm
+	fi
+
+	if use editor ; then
+		dogamesbin ufo2map || die "Failed installing editor"
+	fi
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r base || die "doins -r failed"
+	if use doc ; then
+		dodoc src/docs/tex/ufo-manual_EN.pdf || die "Failed installing manual"
+	fi
+
+	prepgamesdirs
+}