build against newer zlib (bug #452404); tidy

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

7 files changed, 206 insertions, 29 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/Manifest b/games-rpg/xu4/Manifest
index 3f165e41acfa..64d0da44e7f2 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -1,8 +1,10 @@
-AUX 0.9-savegame.patch 1861 RMD160 8246605a0dcf36769d6e4c4c0356a38d21f95728 SHA1 7a61912d20c551c2a5327f1e40340cc906dfb15c SHA256 29f2d391e59f91ce79b07efb036476d1f21cdcf150d9286e094dcdc56e1b575d
-AUX xu4-0.9-ldflags.patch 1793 RMD160 721e0254e9106ee992cec194aca33a5c35f28a41 SHA1 9429afbfd37a3a10bba477907c9c5bbbb89793a1 SHA256 28809292afb10f4c959cfb8c0f805c1d9d0ea1cf252fbb34171959aee4e529e8
-DIST u4upgrad.zip 632072 RMD160 863f4626089ad511a1b4dc60f9115c5f8a5b6a70 SHA1 052fb6ef53a689576d7a8148acb3380e859504d2 SHA256 400ac37311f3be74c1b2d7836561b2ead2b146f5162586865b0f4881225cca58
-DIST ultima4-1.01.zip 537487 RMD160 9711d2b1041d7d5577fed09d5271bcdeab9f1fdc SHA1 e8b633cefb107caaf618171652c92684261b54c2 SHA256 ec84ef08e9e38156622300065aa62260276fc8f1c1ff2774f7916e7c10db40dc
-DIST xu4-0.9.tar.gz 320090 RMD160 2129a2bd7e8789ffa901082c248957335b1e5e9d SHA1 6103c3903aeb771da946af5dfac6d83549de6f01 SHA256 26d7a957411e98474d3a06a0bf63a683208d3c35c0cf7afe90db992a934b0bf3
-EBUILD xu4-0.9.ebuild 1842 RMD160 e37111e58767ddf1b51bafb29289e0f38bc7a4bb SHA1 5f5d648d0c43f995b93515c06803243b91175471 SHA256 ef4c3ee70bc222c1a8f3e3ba48449f6f6552137a57b1363f569e722311e3dd24
-MISC ChangeLog 1051 RMD160 7e7d7e79aad8dd1cbea19374a6e5f1c07ae20e85 SHA1 e687f2b86e4c87b6926d121cc4623db83397a835 SHA256 3e5e51dc980f153e9bafb2d8c4823724f97919dd8e904d5edb1d7c729162d125
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX 0.9-savegame.patch 1717 SHA256 afa998014001ef9e9101ef4287e6997f836f60ea6cb0cc99131702bcf7e9d0ee SHA512 b20b71224e1d7f7289b4379e94e5c19d618eaaa2915407e5c315e5e788a4176f9a78971989a010de244b6a9781a2a5688cbfd3dab8e9ace5dc598d98d790ad83 WHIRLPOOL 16091ab6e78c454be3e59a2b3586e8c5c6c82dc82f1c9e15536d037b30d77170ba7f5b30ed0a48d91304dfbcc97a8021805f7cabdbf650c804edf7a6bc33b4f1
+AUX xu4-0.9-ldflags.patch 1721 SHA256 4e9db5bb8ec3d05133c8e62eeebf0adca7b9f5ee557130266ddaed054df4b08f SHA512 15806e450a2fab9ec673d7e5a67b63c676e756da76651d94bafa931c220115fda600f34c36c49f6cc6e51a548d5a85a09099a7e42003fd5a508470e087b37527 WHIRLPOOL 4d2144711e84e0658e0c82f188d62ad49423716e2a78b701577226333121005cc0489b3e965947286047f5d108da1fddec8eb653fd684348dd20e59ba53bb866
+AUX xu4-0.9-warnings.patch 468 SHA256 e6380245284e1b114429fd8cdd1be67751b258373bba8cbc04cbdac14e70f6cf SHA512 59758b4cc77fff633225b8a872054f191f10f66e30ff4327a7b71077d4f425506143a8f9a92dbbaf858b0cdc3f1b9c87abfb4bd9a93bc26ddcb768699aee0186 WHIRLPOOL aafcace348ea793210758712fece0a714b21f162b497b3e544216b398a333c3d1b7f794191fda6ee876b06c5853c66871ba2bc330b8192eeae0b6d1764a9eec1
+AUX xu4-0.9-zip.patch 4982 SHA256 d3deabc71ce9238998c72047fd5077fa8eb03251764ba45c0978b2e951bf9d4b SHA512 16b6e21c9470f864c2d31ab3973a9af2f1e24e3b5a262da2560b26b492239a2c308d61ee00efdf4ec200baa0a68c543102f7d2cb80de7c40efe544cda6558284 WHIRLPOOL 027dc5ebda792153c777bba28f2bf0c4283560e47bb2eaf7e4620985c0c73d7d2f8e2100b3ed12dd414854c8327326d7d210c98d1a3ca93ba76a744ee9316d37
+DIST u4upgrad.zip 632072 SHA256 400ac37311f3be74c1b2d7836561b2ead2b146f5162586865b0f4881225cca58 SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083 WHIRLPOOL 3d9c320efe24b29edca1f0d917dcaad1da7c1c6246c753b2366ada81552f43113bd57f335ca79adf2283cdab6ba24bf0c09aeb7802a33d3fdec5e0bbe1782d01
+DIST ultima4-1.01.zip 537487 SHA256 ec84ef08e9e38156622300065aa62260276fc8f1c1ff2774f7916e7c10db40dc SHA512 c86c29d51e21b93992316552fbaaec948e7e8048fea484f003f43ac82211f82fa587fb15db991cddf744f2c3ff0fc4d411cd51cc7650e13a5b520c4dc620518c WHIRLPOOL f3acdc021449e3b55adc7d0ea967c8f77cdd813a0f9316042ae8e906eb105b6297f19efc90fffbd9be747bca7d6b0ea4b0bbdc1729c906076e89498558250155
+DIST xu4-0.9.tar.gz 320090 SHA256 26d7a957411e98474d3a06a0bf63a683208d3c35c0cf7afe90db992a934b0bf3 SHA512 6c0b27472074d96a5f76e024c800bed89c57c29dbd760278c819ad8b024362480bda5f1584eb9fe64fd6f6cae0b3b8d8571c8cf533f25b842471803acd7cea8d WHIRLPOOL 428ee87920850e16ce411e0a2bd1656a68a61644d96349bf727cbedd041e6fe3c8c134e960eaf5205d0d3f9deeccd9de23cab2186567fbd8c80b382ac5c9f812
+EBUILD xu4-0.9.ebuild 1804 SHA256 9783769c5020c40ad4e3cd146684369aed402f8829c1f78d559678748636d55e SHA512 8818e243d79f1f84926e7df72eb3bfe09a34ad627ef2e626c452478659b9cd6701bbdc695ed066fea0654601183218ab66afaf5b76fe91cc32c23e87906bc47f WHIRLPOOL 627109f6a699f64796f0f18112ca67a9b0f533c48f0222d2a825fce4af2f884705a4a72bcc60128f46d10c02c47adc864b6b4ecacf251d8ccf3d33d5a591b28d
+MISC ChangeLog 1288 SHA256 4cb2d7c53864988fe46dd027a3258ea2416991ca6f6e5b50e028d7a6ec95b0b2 SHA512 c4194b218e3fcc15be086652ba0614b306addb535c53f43f52bc5dc09923fdf894bc206e19733fca7534dce6324208512e7dd4d6e0b83cf11b2aa9d22e5424b2 WHIRLPOOL 0afc5fa236e220fd802bf104da0a5c69a6bcf4b8b4a599a38655e705b6e6cc63c63a17d1f675eee2f8f819a316533135125a32c7f0a28c4963e42176123d54b5
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
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
 }