build against newer zlib (bug #452404); tidy

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 196 insertions, 21 deletions

diff --git a/games-rpg/xu4/ChangeLog b/games-rpg/xu4/ChangeLog
index b49b9a5cb590..facb2e644e58 100644
--- a/games-rpg/xu4/ChangeLog
+++ b/games-rpg/xu4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/xu4
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.8 2010/09/30 04:20:39 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.9 2013/01/15 22:36:42 mr_bones_ Exp $
+
+  15 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/xu4-0.9-warnings.patch, +files/xu4-0.9-zip.patch,
+  files/0.9-savegame.patch, files/xu4-0.9-ldflags.patch, xu4-0.9.ebuild:
+  build against newer zlib (bug #452404); tidy
 
   30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> xu4-0.9.ebuild,
   +files/xu4-0.9-ldflags.patch:
@@ -26,4 +31,3 @@
   22 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +files/0.9-savegame.patch, +xu4-0.9.ebuild:
   Initial commit; ebuild by me to fix bug #45767
-
diff --git a/games-rpg/xu4/files/0.9-savegame.patch b/games-rpg/xu4/files/0.9-savegame.patch
index a0c4906b06ed..44a52dd40e95 100644
--- a/games-rpg/xu4/files/0.9-savegame.patch
+++ b/games-rpg/xu4/files/0.9-savegame.patch
@@ -1,5 +1,5 @@
---- src/savegame.c.orig	2004-06-22 01:11:47.000000000 -0700
-+++ src/savegame.c	2004-06-22 01:14:42.000000000 -0700
+--- src/savegame.c.orig
++++ src/savegame.c
 @@ -21,23 +21,24 @@
  char *partySavFilename() {
      char *fname;
@@ -61,8 +61,8 @@
      return fname;
  }
      
---- src/u4.c.orig	2004-06-22 01:28:38.000000000 -0700
-+++ src/u4.c	2004-06-22 01:30:30.000000000 -0700
+--- src/u4.c.orig
++++ src/u4.c
 @@ -38,6 +38,10 @@
      osxInit(argv[0]);
  #endif
diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
index c41600ad5148..560cdc33f1d9 100644
--- a/games-rpg/xu4/files/xu4-0.9-ldflags.patch
+++ b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
@@ -1,5 +1,5 @@
---- src/Makefile.common.old	2010-09-30 06:12:23.000000000 +0200
-+++ src/Makefile.common	2010-09-30 06:15:22.000000000 +0200
+--- src/Makefile.common.old
++++ src/Makefile.common
 @@ -68,25 +68,25 @@
  mkutils::  dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT)
  
diff --git a/games-rpg/xu4/files/xu4-0.9-warnings.patch b/games-rpg/xu4/files/xu4-0.9-warnings.patch
new file mode 100644
index 000000000000..58b35316ac0d
--- /dev/null
+++ b/games-rpg/xu4/files/xu4-0.9-warnings.patch
@@ -0,0 +1,26 @@
+--- u4.orig/src/u4.c
++++ u4/src/u4.c
+@@ -3,6 +3,8 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+--- u4.orig/u4.desktop
++++ u4/u4.desktop
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Ultima 4
+ Comment=Ultima 4 (xu4)
+ Exec=u4
+-Icon=u4.png
+-Terminal=0
++Icon=u4
++Terminal=false
+ Type=Application
+-Categories=Application;Game;RolePlaying;
++Categories=Game;RolePlaying;
diff --git a/games-rpg/xu4/files/xu4-0.9-zip.patch b/games-rpg/xu4/files/xu4-0.9-zip.patch
new file mode 100644
index 000000000000..c2d2053cb3f8
--- /dev/null
+++ b/games-rpg/xu4/files/xu4-0.9-zip.patch
@@ -0,0 +1,144 @@
+--- src/unzip.c.orig
++++ src/unzip.c
+@@ -493,7 +493,7 @@
+ /*
+   Get Info about the current file in the zipfile, with internal only info
+ */
+-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
++local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
+                                                   unz_file_info *pfile_info,
+                                                   unz_file_info_internal 
+                                                   *pfile_info_internal,
+--- src/unzip.h.orig
++++ src/unzip.h
+@@ -8,7 +8,7 @@
+    Encryption and multi volume ZipFile (span) are not supported.
+    Old compressions used by old PKZip 1.x are not supported
+ 
+-   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
++   THIS IS AN ALPHA VERSION. AT THIS STAGE _Z_OF DEVELOPPEMENT, SOMES API OR STRUCTURE
+    CAN CHANGE IN FUTURE VERSION !!
+    I WAIT FEEDBACK at mail info@winimage.com
+    Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+@@ -111,7 +111,7 @@
+     tm_unz tmu_date;
+ } unz_file_info;
+ 
+-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
++extern int ZEXPORT unzStringFileNameCompare _Z_OF ((const char* fileName1,
+ 												 const char* fileName2,
+ 												 int iCaseSensitivity));
+ /*
+@@ -124,7 +124,7 @@
+ */
+ 
+ 
+-extern unzFile ZEXPORT unzOpen OF((const char *path));
++extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
+ /*
+   Open a Zip file. path contain the full pathname (by example,
+      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
+@@ -135,14 +135,14 @@
+ 	   of this unzip package.
+ */
+ 
+-extern int ZEXPORT unzClose OF((unzFile file));
++extern int ZEXPORT unzClose _Z_OF((unzFile file));
+ /*
+   Close a ZipFile opened with unzipOpen.
+   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+   return UNZ_OK if there is no problem. */
+ 
+-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
++extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
+ 					unz_global_info *pglobal_info));
+ /*
+   Write info about the ZipFile in the *pglobal_info structure.
+@@ -150,7 +150,7 @@
+   return UNZ_OK if there is no problem. */
+ 
+ 
+-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
++extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
+ 										   char *szComment,
+ 					   uLong uSizeBuf));
+ /*
+@@ -163,20 +163,20 @@
+ /***************************************************************************/
+ /* Unzip package allow you browse the directory of the zipfile */
+ 
+-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
++extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
+ /*
+   Set the current file of the zipfile to the first file.
+   return UNZ_OK if there is no problem
+ */
+ 
+-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
++extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
+ /*
+   Set the current file of the zipfile to the next file.
+   return UNZ_OK if there is no problem
+   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+ */
+ 
+-extern int ZEXPORT unzLocateFile OF((unzFile file, 
++extern int ZEXPORT unzLocateFile _Z_OF((unzFile file, 
+ 				     const char *szFileName,
+ 				     int iCaseSensitivity));
+ /*
+@@ -189,7 +189,7 @@
+ */
+ 
+ 
+-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
++extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
+ 					     unz_file_info *pfile_info,
+ 					     char *szFileName,
+ 					     uLong fileNameBufferSize,
+@@ -215,20 +215,20 @@
+    from it, and close it (you can close it before reading all the file)
+    */
+ 
+-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
++extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
+ /*
+   Open for reading data the current file in the zipfile.
+   If there is no error, the return value is UNZ_OK.
+ */
+ 
+-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
++extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
+ /*
+   Close the file in zip opened with unzOpenCurrentFile
+   Return UNZ_CRCERROR if all the file was read but the CRC is not good
+ */
+ 
+ 												
+-extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
++extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file, 
+ 					  voidp buf,
+ 					  unsigned len));
+ /*
+@@ -242,17 +242,17 @@
+     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+ */
+ 
+-extern z_off_t ZEXPORT unztell OF((unzFile file));
++extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
+ /*
+   Give the current position in uncompressed data
+ */
+ 
+-extern int ZEXPORT unzeof OF((unzFile file));
++extern int ZEXPORT unzeof _Z_OF((unzFile file));
+ /*
+   return 1 if the end of file was reached, 0 elsewhere 
+ */
+ 
+-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
++extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
+ 											 voidp buf,
+ 											 unsigned len));
+ /*
diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild
index 2333c0acd2c7..5b65ea9c7b0b 100644
--- a/games-rpg/xu4/xu4-0.9.ebuild
+++ b/games-rpg/xu4/xu4-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.11 2010/09/30 04:20:39 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.12 2013/01/15 22:36:42 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,7 +18,7 @@ IUSE=""
 
 RDEPEND="dev-libs/libxml2
 	media-libs/sdl-mixer[timidity]
-	media-libs/libsdl"
+	media-libs/libsdl[audio,video]"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -28,24 +28,25 @@ src_unpack() {
 	# xu4 will read the data files right out of the zip files
 	# but we want the docs from the original.
 	unpack ${P}.tar.gz
-	cp "${DISTDIR}"/{ultima4-1.01.zip,u4upgrad.zip} . \
-		|| die "cp failed"
+	cp "${DISTDIR}"/{ultima4-1.01.zip,u4upgrad.zip} . || die
 	cd "${WORKDIR}"
 	mv ultima4-1.01.zip ultima4.zip
 	mkdir u4-dos
 	cd u4-dos
-	unzip -q ../ultima4.zip || die "unzip failed"
+	unzip -q ../ultima4.zip || die
 }
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-savegame.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-zip.patch \
+		"${FILESDIR}"/${P}-warnings.patch
 	sed -i \
 		-e "s:/usr/local/lib/u4:$(games_get_libdir)/u4:" src/u4file.c \
-		|| die "sed u4file failed"
+		|| die
 	sed -i \
 		-e 's:-Wall:$(E_CFLAGS):' src/Makefile \
-		|| die "sed Makefile failed"
+		|| die
 }
 
 src_compile() {
@@ -55,7 +56,7 @@ src_compile() {
 		bindir="${GAMES_BINDIR}" \
 		datadir="/usr/share" \
 		libdir="$(games_get_libdir)" \
-		|| die "emake failed"
+		|| die
 }
 
 src_install() {
@@ -65,9 +66,9 @@ src_install() {
 		bindir="${D}${GAMES_BINDIR}" \
 		datadir="${D}/usr/share" \
 		libdir="${D}$(games_get_libdir)" \
-		install || die "make install failed"
+		install || die
 	dodoc AUTHORS README doc/*txt "${WORKDIR}/u4-dos/ULTIMA4/"*TXT
 	insinto "$(games_get_libdir)/u4"
-	doins "${WORKDIR}/"*zip || die "doins failed"
+	doins "${WORKDIR}/"*zip || die
 	prepgamesdirs
 }