Version bump to the latest release. Upstream now use hand-crafted build system :/ Fix locale init.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 158 insertions, 10 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 74c977ebf51a..53f9fb0a905b 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/ufo-ai
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.36 2012/01/22 16:35:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.37 2012/05/01 09:10:28 scarabeus Exp $
+
+*ufo-ai-2.4 (01 May 2012)
+
+  01 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/ufo-ai-2.4-locale.patch, +ufo-ai-2.4.ebuild:
+  Version bump to the latest release. Upstream now use hand-crafted build system
+  :/ Fix locale init.
 
   22 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> ufo-ai-2.3.1-r1.ebuild:
   Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF change) wrt #383179
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 7e89584f4244..43c778bd7a99 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -2,20 +2,30 @@
 Hash: SHA1
 
 AUX ufo-ai-2.3.1-libpng15.patch 309 RMD160 dab2096b23dabe5ae9e136444c5b050644921120 SHA1 1cca3465463c0864642a0b92a7f90aa74fc8bfcd SHA256 4dcc415591476a86fcf2a82f6e18fbef8609dbd8865053445c4f37bdabc8dd89
+AUX ufo-ai-2.4-locale.patch 744 RMD160 e84d98ccf9a2978ec88d1c872de59e98efc1c876 SHA1 74c53422a06808c6e8f4975108330318b8148975 SHA256 edf333eea46aaea2a43529d4d323d2b317a9376c39e5952a2b92d7bf25fe110b
 DIST 1maps.pk3 242016 RMD160 45709c9a28493bc37488c0f960d9b73ceb7f3534 SHA1 b18baa412a1c372dd8b78b525a09d886a61b11c3 SHA256 8cdb8c231c0ba98900d97012b62c5cef72ab5710fe3f087e534496a66f7b0e4e
 DIST ufoai-2.3.1-data.tar 533196800 RMD160 30ba39315718bccd13ffc56e49719a04b3bbd806 SHA1 a322c3bb92b29a0265567e84b1d3287078cfae91 SHA256 79b302351d22ea55e1d5c2fceed757a518908673c12ac3e7972f541f68c2a9ad
 DIST ufoai-2.3.1-source.tar.bz2 9847575 RMD160 77a1499962ec69c138ccb03f54187f87e0429a68 SHA1 f339e9399eae6ef4661ad8b9d4f68205904810d3 SHA256 6f9fbe69c91843b48fc29efa3a3584aa2659b78be1a6a00d5868c5d77fec69d1
+DIST ufoai-2.4-data.tar 937062400 RMD160 a7cba9b2cf89d20cbacf0680b4927520245af0af SHA1 2998c979ee597a1473c3277f8db14821e907999f SHA256 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7
+DIST ufoai-2.4-source.tar.bz2 16875353 RMD160 93c9405a291db48a7767b41c37be29e028111963 SHA1 153ba796131f00fe98f96e56888376afee039aa5 SHA256 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f
 EBUILD ufo-ai-2.3.1-r1.ebuild 2817 RMD160 62bf8b8e1b488c2440f008a517a773b778c45070 SHA1 3a56712f6c9b5ccbdeb14bacf4f42a5e4fd9c68f SHA256 a7496f3ae9273df7ff440ccbfa55089dac5ebbc83aa44d6f849c93dfdde3fbe4
-MISC ChangeLog 5259 RMD160 e27873e79a9da40a6e206ee00f004171a9bcadd1 SHA1 d3db82fc972400a893ecb2e3cbf5c2dc3d6e5cef SHA256 557b3c9c7a91cd399c758a0d87209fdda23be669229fbe752870bece1f28da5e
+EBUILD ufo-ai-2.4.ebuild 2779 RMD160 be157d6e3f79abf354c509ff8f8953636770e47b SHA1 6b53f6ded31b0e0fd0340420aa1bc57bc23f23d3 SHA256 40b249901697fbf5458404fe65ebd68f96fe1ac3e7cda61c0b1446dac6271c3b
+MISC ChangeLog 5499 RMD160 71b9e23aa4f7f3dc67faccad33a6577e816b4992 SHA1 c9d8f6e0a79a155db54e8ef5b2e9f443ca9e9d11 SHA256 21eabb01936b80525d0eeb68b8843e53d9acbe7095d84d315e68db206fe9572b
 MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPHDpKAAoJEEdUh39IaPFN85EH/0lTYoepyom6ad0CHx3EhDRi
-uynHMX10guwuQQp2JY1oirBLkkyUT1LiW6Bnv+E43z9UEGUJ/L+fuvEN6pJCXycd
-2ZGwPsKW9vmMkv4ZxNzX3BVz0UNCT4xY5dsb+Ou+AJvOCEWu0n/U88P1p+AotDiG
-KNGSZCZMzLEtnatxfUouMyOFjaRcnHkDb1wzoT/ugtwdQ6EbhD6Qz3q6pr4kP8e9
-B5zYEWc4e4WDzkoMXkzKz4rYV0eaTcANSu2dpKHhUN1T/PHgku8BudjvhpjnAwZw
-821cwpKw8erd8rXkr3kyfaLnp0GvIN22TIHblcEp/n1nITAGWXuZitfE2uAVV2o=
-=CAyt
+iQIcBAEBAgAGBQJPn6iLAAoJEOSiRoyO7jvoTpYP+wfQOdTz8kS2Noz1zoZhIR3I
+Hs3uNE+OnurpaQpDcd+x0VazaTN9Rg1FSknRwm/rfa8pP5iVGK8WgvqhSzGYXpyb
+OpGDhWSU42f6uRjDqluqUFxIP24U9X5S6v73kXt9v93PT+rp915BWTVjTQU5k4jH
++mWFumosxh6eQ2QmKXL6cuPcxXSzn8mUkWP44kp18r/4VFOJYk4BY1D7guWqejeq
+k4s11HLczcJy3lUyE05VqTQV1yqwG8tRFHU2CqU9s+yF9jglc2WLZh7E0L1DfjbY
+e5yoqbg6i858RSTkOTLVvLEPU5pAYjD+DUJ351Rj6LcNFxZGWhHA+S2sVS2LQVg5
+kQVpQ1k8F/i7tDGDGZXbnAa4fKfmh57+lI47zwrE5AjI/T3dCDrBsnRMeffmZg0j
+BvHhmEPM3uZu6CqVx2BwYlv65nbm8ocXJdFtH4cUhmUZrq0c3snwGSwBiHLvikYn
+Xb27ClPjf2Fw2qJTqimK1Y+t1Gcq9+hhs5zzNB8NIpO24bVeQZnMQ3aZHvqPVFPQ
+Jwwj1cgclYCzSh+aU7LO95TSLL7v7tJdc9QUkwfId7ePz3IaFd44n+y15UNo856q
+zN+BvWP3T+EjQd/tQNYuj3f52ebHGKSo0zo4lAJ7QVnxkQVxCcovZgGgnj+LhWSH
+1ZA0c5on5aCQs4uQcNaI
+=NECr
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
new file mode 100644
index 000000000000..632e0d4fdc0d
--- /dev/null
+++ b/games-strategy/ufo-ai/files/ufo-ai-2.4-locale.patch
@@ -0,0 +1,15 @@
+diff -urN ufoai-2.4-source.old//src/client/cl_main.c ufoai-2.4-source/src/client/cl_main.c
+--- ufoai-2.4-source.old//src/client/cl_main.c	2012-05-01 10:59:51.720868619 +0200
++++ ufoai-2.4-source/src/client/cl_main.c	2012-05-01 11:00:57.235869759 +0200
+@@ -1180,7 +1180,11 @@
+ 	if (fs_i18ndir->string[0] != '\0')
+ 		Q_strncpyz(languagePath, fs_i18ndir->string, sizeof(languagePath));
+ 	else
++#ifdef LOCALEDIR
++		Q_strncpyz(languagePath, LOCALEDIR, sizeof(languagePath));
++#else
+ 		Com_sprintf(languagePath, sizeof(languagePath), "%s/"BASEDIRNAME"/i18n/", FS_GetCwd());
++#endif
+ 	Com_DPrintf(DEBUG_CLIENT, "...using mo files from %s\n", languagePath);
+ 	bindtextdomain(TEXT_DOMAIN, languagePath);
+ 	bind_textdomain_codeset(TEXT_DOMAIN, "UTF-8");
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
new file mode 100644
index 000000000000..559a390cacbc
--- /dev/null
+++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 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.4.ebuild,v 1.1 2012/05/01 09:10:28 scarabeus Exp $
+
+EAPI=3
+
+inherit eutils flag-o-matic 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
+	http://mattn.ninex.info/1maps.pk3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug dedicated 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
+		virtual/jpeg
+		media-libs/libpng:0
+		media-libs/libogg
+		media-libs/libvorbis
+		x11-proto/xf86vidmodeproto
+	)
+	net-misc/curl
+	sys-devel/gettext
+	sys-libs/zlib
+	editor? (
+		dev-libs/libxml2
+		virtual/jpeg
+		media-libs/openal
+		x11-libs/gtkglext
+		x11-libs/gtksourceview:2.0
+	)"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}-source
+
+src_prepare() {
+	has_version '>=sys-libs/zlib-1.2.5.1-r1' && sed -i \
+		-e '1i#define OF(x) x' src/common/ioapi.h
+
+	epatch "${FILESDIR}"/${P}-locale.patch
+
+	cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die
+	mv "${WORKDIR}"/base/ "${S}"/ || die
+}
+
+src_configure() {
+	local myconf
+	# they are special and provide hand batched configure file
+	myconf="
+		--disable-dependency-tracking
+		$(use_enable !debug release)
+		$(use_enable editor ufo2map)
+		$(use_enable editor uforadiant)
+		--enable-ufoded
+		--bindir="${GAMES_BINDIR}"
+		--libdir="$(games_get_libdir)"
+		--datadir="${GAMES_DATADIR}/${PN/-}"
+		--localedir="${EPREFIX}/usr/share/locale/"
+		--prefix="${GAMES_PREFIX}"
+	"
+	echo "./configure ${myconf}"
+	./configure ${myconf} || die
+}
+
+src_compile() {
+	emake || die
+	emake lang || die
+
+	if use editor; then
+		emake uforadiant || die
+	fi
+}
+
+src_install() {
+	newicon src/ports/linux/ufo.png ${PN}.png || die
+	dobin ufoded || die
+	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
+	if ! use dedicated; then
+		dobin ufo || die
+		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
+	fi
+
+	if use editor; then
+		dobin ufo2map ufomodel || die
+	fi
+
+	# install data
+	insinto "${GAMES_DATADIR}"/${PN/-}
+	doins -r base || die
+	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/game.so"
+	dogameslib base/game.so
+
+	# move translations where they belong
+	dodir "${GAMES_DATADIR_BASE}/locale" || die
+	mv "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/"* \
+		"${ED}/${GAMES_DATADIR_BASE}/locale/" || die
+	rm -rf "${ED}/${GAMES_DATADIR}/${PN/-}/base/i18n/" || die
+
+	prepgamesdirs
+}