Fix building with sys-libs/zlib >= 1.2.5.1-r1 (OF change) wrt #383179

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

3 files changed, 28 insertions, 19 deletions

diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog
index 527edbd2dcef..74c977ebf51a 100644
--- a/games-strategy/ufo-ai/ChangeLog
+++ b/games-strategy/ufo-ai/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/ufo-ai
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.35 2011/08/20 08:08:34 aballier Exp $
+# 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 $
+
+  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
 
   20 Aug 2011; Alexis Ballier <aballier@gentoo.org> ufo-ai-2.3.1-r1.ebuild:
   virtual/latex-base provides pdftex, drop useless pdftex dep
diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest
index 1408c5f81e86..7e89584f4244 100644
--- a/games-strategy/ufo-ai/Manifest
+++ b/games-strategy/ufo-ai/Manifest
@@ -5,13 +5,17 @@ AUX ufo-ai-2.3.1-libpng15.patch 309 RMD160 dab2096b23dabe5ae9e136444c5b050644921
 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
-EBUILD ufo-ai-2.3.1-r1.ebuild 2830 RMD160 73c0470308bb6934124d95f87a617bce0622dec0 SHA1 486d9b100f906f24268aeb3d6f0647beae497845 SHA256 24f3ef886cdf80238a62bf0d82f731851522907b07da9b92619f48976fd4ba59
-MISC ChangeLog 5107 RMD160 8a78738ed2ecf4e37e65bdc0f3e5c8084c9d94b0 SHA1 119165bfbd0faf91e5884af130d4f108f0df512b SHA256 c8de0aad6e93080736dfa487990d933ffcf043fd74bf754d1cbc2479914fd754
+EBUILD ufo-ai-2.3.1-r1.ebuild 2817 RMD160 62bf8b8e1b488c2440f008a517a773b778c45070 SHA1 3a56712f6c9b5ccbdeb14bacf4f42a5e4fd9c68f SHA256 a7496f3ae9273df7ff440ccbfa55089dac5ebbc83aa44d6f849c93dfdde3fbe4
+MISC ChangeLog 5259 RMD160 e27873e79a9da40a6e206ee00f004171a9bcadd1 SHA1 d3db82fc972400a893ecb2e3cbf5c2dc3d6e5cef SHA256 557b3c9c7a91cd399c758a0d87209fdda23be669229fbe752870bece1f28da5e
 MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Pa4gACgkQvFcC4BYPU0pt7ACgu/hyzpvbU/yrmT82RU6574V3
-e+kAmQG/+xdDSFTOVzOEh7O0F6ynFTP7
-=o+AV
+iQEcBAEBAgAGBQJPHDpKAAoJEEdUh39IaPFN85EH/0lTYoepyom6ad0CHx3EhDRi
+uynHMX10guwuQQp2JY1oirBLkkyUT1LiW6Bnv+E43z9UEGUJ/L+fuvEN6pJCXycd
+2ZGwPsKW9vmMkv4ZxNzX3BVz0UNCT4xY5dsb+Ou+AJvOCEWu0n/U88P1p+AotDiG
+KNGSZCZMzLEtnatxfUouMyOFjaRcnHkDb1wzoT/ugtwdQ6EbhD6Qz3q6pr4kP8e9
+B5zYEWc4e4WDzkoMXkzKz4rYV0eaTcANSu2dpKHhUN1T/PHgku8BudjvhpjnAwZw
+821cwpKw8erd8rXkr3kyfaLnp0GvIN22TIHblcEp/n1nITAGWXuZitfE2uAVV2o=
+=CAyt
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild
index dbff64ada82d..0b128c8bad28 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3.1-r1.ebuild,v 1.6 2011/08/20 08:08:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.3.1-r1.ebuild,v 1.7 2012/01/22 16:35:28 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
 
-MY_P="${P/o-a/oa}"
+MY_P=${P/o-a/oa}
 
 DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
 HOMEPAGE="http://ufoai.sourceforge.net/"
@@ -28,7 +28,7 @@ RDEPEND="!dedicated? (
 		media-libs/sdl-ttf
 		media-libs/sdl-mixer
 		virtual/jpeg
-		media-libs/libpng
+		media-libs/libpng:0
 		media-libs/libogg
 		media-libs/libvorbis
 		x11-proto/xf86vidmodeproto
@@ -37,7 +37,7 @@ RDEPEND="!dedicated? (
 	sys-devel/gettext
 	sys-libs/zlib
 	editor? (
-		dev-libs/libxml2:2
+		dev-libs/libxml2
 		virtual/jpeg
 		media-libs/openal
 		x11-libs/gtkglext
@@ -53,9 +53,11 @@ 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}-libpng15.patch
 	cp "${DISTDIR}"/1maps.pk3 "${WORKDIR}"/base/ || die
-	mv "${WORKDIR}"/base/ "${S}"/ || die "Moving data failed"
+	mv "${WORKDIR}"/base/ "${S}"/ || die
 }
 
 src_configure() {
@@ -73,15 +75,15 @@ src_configure() {
 }
 
 src_compile() {
-	if use doc ; then
-		emake pdf-manual || die "emake pdf-manual failed"
+	if use doc; then
+		emake pdf-manual || die
 	fi
 
-	emake || die "emake failed"
-	emake lang || die "emake lang failed"
+	emake || die
+	emake lang || die
 
 	if use editor; then
-		emake uforadiant || die "emake uforadiant failed"
+		emake uforadiant || die
 	fi
 }
 
@@ -90,7 +92,7 @@ src_install() {
 
 	newicon src/ports/linux/ufo.png ${PN}.png || die
 	make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN}
-	if ! use dedicated ; then
+	if ! use dedicated; then
 		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
 	fi