version bump; clean old - ebuild submitted by Locke Shinseiko via bug #324869

(Portage version: 2.1.8.3/cvs/Linux i686)

6 files changed, 118 insertions, 193 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index c7b3cb52dc39..f5834e6d6f2e 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.25 2010/03/10 18:37:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.26 2010/07/07 21:06:06 mr_bones_ Exp $
+
+*ufo-ai-2.3 (07 Jul 2010)
+
+  07 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org> -ufo-ai-2.2.1.ebuild,
+  -files/ufo-ai-2.2.1-gentoo.patch, -files/ufo-ai-2.2.1-libpng14.patch,
+  -files/ufo-ai-2.2.1-noelfonshared.patch, +ufo-ai-2.3.ebuild:
+  version bump; clean old - ebuild submitted by Locke Shinseiko via bug
+  #324869
 
   10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ufo-ai-2.2.1.ebuild,
   +files/ufo-ai-2.2.1-libpng14.patch:
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
deleted file mode 100644
index 5fed2ad8a4e5..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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/files/ufo-ai-2.2.1-libpng14.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch
deleted file mode 100644
index 357a8f739099..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/308863
-http://ufoai.svn.sourceforge.net/viewvc/ufoai/ufoai/trunk/src/client/renderer/r_image.c?r1=28392&r2=28395
-
---- src/renderer/r_image.c
-+++ src/renderer/r_image.c
-@@ -207,7 +207,7 @@ static int R_LoadPNG (const char *name,
- 		return 0;
- 
- 	/* Parse the PNG file */
--	if ((png_check_sig(PngFileBuffer.buffer, 8)) == 0) {
-+	if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) != 0) {
- 		Com_Printf("LoadPNG: Not a PNG file: %s\n", name);
- 		FS_FreeFile(PngFileBuffer.buffer);
- 		return 0;
-@@ -254,7 +254,7 @@ static int R_LoadPNG (const char *name,
- 		png_set_palette_to_rgb(png_ptr);
- 	/* convert 1-2-4 bits grayscale images to 8 bits grayscale */
- 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- 		png_set_tRNS_to_alpha(png_ptr);
- 
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch
deleted file mode 100644
index 18b3a7da2bd2..000000000000
--- a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/files.c.old	2010-03-01 09:07:30.000000000 +0100
-+++ src/common/files.c	2010-03-01 09:08:18.000000000 +0100
-@@ -894,6 +894,8 @@
- 	/* start up with base by default */
- 	FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string));
- 
-+	FS_AddGameDirectory("@GAMES_LIBDIR@");
-+
- 	/* then add a '.ufoai/base' directory in home directory by default */
- 	if (fs_usehomedir->integer)
- 		FS_AddHomeAsGameDirectory(BASEDIRNAME);
diff --git a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
deleted file mode 100644
index 992c9ff4ea2f..000000000000
--- a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 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.8 2010/03/10 18:37:22 ssuominen Exp $
-
-EAPI=2
-inherit eutils 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_prepare() {
-	# move data from packages to source dir
-	mv "${WORKDIR}/base" "${S}" || die
-
-	# Set basedir & fixes bug in finding text files - it should use fs_basedir
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-noelfonshared.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		-e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		src/common/files.c \
-		src/tools/gtkradiant/games/ufoai.game \
-		src/client/cl_main.c \
-		src/client/cl_language.c \
-		|| die "sed failed"
-
-	sed -i \
-		-e "s:jpeg_mem_src:_&:" \
-		src/{renderer/r_image,tools/ufo2map/common/imagelib}.c || die
-}
-
-src_configure() {
-	egamesconf \
-		$(use_enable mmx) \
-		--enable-release \
-		$(use_enable editor ufo2map) \
-		--enable-dedicated \
-		$(use_enable !dedicated client) \
-		--with-shaders
-}
-
-src_compile() {
-	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"
-	mv base/game.so . \
-		|| die "Failed moving game library"
-}
-
-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"
-	if ! use dedicated ; then
-		# client
-		newgamesbin ufo ${PN} || die "Failed installing client"
-		make_desktop_entry ${PN} "UFO: Alien Invasion"
-	fi
-
-	if use editor ; then
-		dogamesbin ufo2map || die "Failed installing editor"
-	fi
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe game.so || die "Failed installing game library"
-
-	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
-}
diff --git a/games-strategy/ufo-ai/ufo-ai-2.3.ebuild b/games-strategy/ufo-ai/ufo-ai-2.3.ebuild
new file mode 100644
index 000000000000..eebe0a751a88
--- /dev/null
+++ b/games-strategy/ufo-ai/ufo-ai-2.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/07/07 21:06:06 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils 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="debug dedicated doc editor"
+
+# 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-image[jpeg,png]
+		media-libs/sdl-ttf
+		media-libs/sdl-mixer
+		media-libs/jpeg
+		media-libs/libpng
+		media-libs/libogg
+		media-libs/libvorbis
+		x11-proto/xf86vidmodeproto
+	)
+	net-misc/curl
+	sys-devel/gettext
+	sys-libs/zlib
+	editor? (
+		dev-libs/libxml2
+		media-libs/jpeg
+		x11-libs/gtkglext
+		x11-libs/gtksourceview
+	)"
+
+DEPEND="${RDEPEND}
+	doc? (
+		virtual/latex-base
+		dev-tex/pdftex
+		dev-texlive/texlive-latexextra
+	)"
+
+S=${WORKDIR}/${MY_P}-source
+
+src_prepare() {
+	mv "${WORKDIR}"/base/ "${S}"/ || die "Moving data failed"
+}
+
+src_configure() {
+	egamesconf \
+		$(use_enable !debug release) \
+		$(use_enable editor ufo2map) \
+		$(use_enable editor uforadiant) \
+		--enable-dedicated \
+		$(use_enable !dedicated client) \
+		--bindir="${GAMES_BINDIR}" \
+		--datarootdir="${GAMES_DATADIR_BASE}" \
+		--datadir="${GAMES_DATADIR}" \
+		--localedir="${GAMES_DATADIR}/${PN/-}/base/i18n/"
+}
+
+src_compile() {
+	if use doc ; then
+		emake pdf-manual || die "emake pdf-manual failed"
+	fi
+
+	emake || die "emake failed"
+	emake lang || die "emake lang failed"
+
+	if use editor; then
+		emake uforadiant || die "emake uforadiant failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_exec || die
+
+	newicon src/ports/linux/ufo.png ${PN}.png || die
+	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
+	if ! use dedicated ; then
+		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
+	fi
+
+	# install data
+	insinto "${GAMES_DATADIR}"/${PN/-}/base/
+	doins base/*.pk3 || die
+
+	if use doc ; then
+		dodoc src/docs/tex/ufo-manual_EN.pdf || die
+	fi
+
+	# move translations where they belong
+	dodir "${GAMES_DATADIR_BASE}/locale" || die
+	mv "${D}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \
+		"${D}/${GAMES_DATADIR_BASE}/locale/" || die
+	rm -rf "${D}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die
+	dosym "${GAMES_DATADIR_BASE}/locale/" "${GAMES_DATADIR}/${PN/-}/base/i18n" || die
+
+	prepgamesdirs
+}