Fix `make check`.

Package-Manager: portage-2.1.2.2

4 files changed, 49 insertions, 13 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 2708706695c7..57fda593e35a 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.36 2007/03/19 19:14:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.37 2007/03/19 19:36:17 vapier Exp $
+
+  19 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/zziplib-0.13.49-SDL-test.patch, zziplib-0.13.49.ebuild:
+  Fix `make check`.
 
 *zziplib-0.13.49 (19 Mar 2007)
 
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 3a2f7e011be9..698fff4b4e75 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -9,6 +9,10 @@ AUX zziplib-0.13.45-sys-types.patch 357 RMD160 57e30336ebae16fb11f0283e897831f9e
 MD5 c041ba5cd4aeb8714dc6d02a07fe4818 files/zziplib-0.13.45-sys-types.patch 357
 RMD160 57e30336ebae16fb11f0283e897831f9eff221d3 files/zziplib-0.13.45-sys-types.patch 357
 SHA256 447463021ae82e9f01a8ac6a61245cc456bc941283b45288a8988b52d0b7f05a files/zziplib-0.13.45-sys-types.patch 357
+AUX zziplib-0.13.49-SDL-test.patch 1265 RMD160 5aec87fb95a201bfe8d80193c2d39cafe24e3133 SHA1 46919ae3559ae0f18a4b7d35195bf2fbd99cdc8a SHA256 6560d12eb4f457101b413fb8f24249df7ca041077ccb2e75d8c233f07dbaf9c2
+MD5 489ed967560c9e8573b40644dbf5ca61 files/zziplib-0.13.49-SDL-test.patch 1265
+RMD160 5aec87fb95a201bfe8d80193c2d39cafe24e3133 files/zziplib-0.13.49-SDL-test.patch 1265
+SHA256 6560d12eb4f457101b413fb8f24249df7ca041077ccb2e75d8c233f07dbaf9c2 files/zziplib-0.13.49-SDL-test.patch 1265
 DIST zziplib-0.13.36.tar.bz2 467327 RMD160 c8a4221fc9e471fc85f385938c02f6e82739f8b8 SHA1 48d516abb1cbe4daf1156061898f6b6e7900ab77 SHA256 f824af056b0b2e168cbce51126ece28c9e1273b68f8e22c0f20baeef6d616018
 DIST zziplib-0.13.38.tar.bz2 505132 RMD160 4f15c6a9353e7e428cbb8c2354520289f9fc1a10 SHA1 ee1bdd48ca08fa72d0f5c3d040f6c3c4c748446a SHA256 843dbf444160ed4c952d04dd4dc14537eb3a12d17751d5f9113143ff45b9b5cd
 DIST zziplib-0.13.45.tar.bz2 647307 RMD160 817428bd16fd8a5efd593920cea8596ffe169461 SHA1 8e57e4555de2a1fcc33ed292718bbaeeb84bfa63 SHA256 c458f22f05cbbb925e777491b29a1621be242da6e5b1bca89bfd25a2edefb592
@@ -25,14 +29,14 @@ EBUILD zziplib-0.13.45.ebuild 1211 RMD160 304cf6d9897d199a6eacabbf2565ab7b0fa0a3
 MD5 91bc48214a0a0cb8976259ec4fc4399a zziplib-0.13.45.ebuild 1211
 RMD160 304cf6d9897d199a6eacabbf2565ab7b0fa0a398 zziplib-0.13.45.ebuild 1211
 SHA256 ac40c048b3b09d552680a08e87d9967a828b68c1140ef189235cb3a5c73a8f53 zziplib-0.13.45.ebuild 1211
-EBUILD zziplib-0.13.49.ebuild 1134 RMD160 c428cbd3b3dfe4da27156fd303965cea7a023964 SHA1 ec439be937c6c9948214534c4d8d02b557fc41b1 SHA256 39d7b851f06a1ee436ac4fa4eed956cf94afbe72583d48ed8f9fc1d166c13d94
-MD5 8a15796af2f6d8121d03096ece25762e zziplib-0.13.49.ebuild 1134
-RMD160 c428cbd3b3dfe4da27156fd303965cea7a023964 zziplib-0.13.49.ebuild 1134
-SHA256 39d7b851f06a1ee436ac4fa4eed956cf94afbe72583d48ed8f9fc1d166c13d94 zziplib-0.13.49.ebuild 1134
-MISC ChangeLog 4469 RMD160 d68041e7c79b440160fe8284102557ca14972154 SHA1 ac9bd543a098b754d3711efe04d21568b3ac9eb1 SHA256 0a4c0e256f036730e731923ca4ddfef660406266c625ca833fa8ec15dba16659
-MD5 48efb2f58dd184981a124c89659ab273 ChangeLog 4469
-RMD160 d68041e7c79b440160fe8284102557ca14972154 ChangeLog 4469
-SHA256 0a4c0e256f036730e731923ca4ddfef660406266c625ca833fa8ec15dba16659 ChangeLog 4469
+EBUILD zziplib-0.13.49.ebuild 1176 RMD160 8d30099083f1ed80f4b6938b0d68fb22ad3d113e SHA1 c3a3a6f4d092ebbc22b273b683207c4a60404684 SHA256 cd58aef3ba62ca2c1f92b557d7042d8774fcee6edea3ff6bdf8b83f595753d7c
+MD5 99c00c41b16ee3dd6fb0360d9b46dd0b zziplib-0.13.49.ebuild 1176
+RMD160 8d30099083f1ed80f4b6938b0d68fb22ad3d113e zziplib-0.13.49.ebuild 1176
+SHA256 cd58aef3ba62ca2c1f92b557d7042d8774fcee6edea3ff6bdf8b83f595753d7c zziplib-0.13.49.ebuild 1176
+MISC ChangeLog 4605 RMD160 97317992dacf6e621b83676fa5aa292ff7cb7f73 SHA1 5b333ec20bbbf70c8462787fbafac4ebb091bee8 SHA256 c6533bc04d66e251c72e563b9dfc6e93da7d193f3d28f77db55d0c17974b5222
+MD5 f654bb6992bc713fb2b299092e999fb5 ChangeLog 4605
+RMD160 97317992dacf6e621b83676fa5aa292ff7cb7f73 ChangeLog 4605
+SHA256 c6533bc04d66e251c72e563b9dfc6e93da7d193f3d28f77db55d0c17974b5222 ChangeLog 4605
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
 MD5 86d067c70c3a362f7761faf2776050bd metadata.xml 285
 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f metadata.xml 285
@@ -52,7 +56,7 @@ SHA256 6e27d3b19af82aec25fcc4f074821dd1b68f9fd5d87c23afd0a6866fbd8b4c11 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/uE08bi6rjpTunYRAtBSAKDFe+Ps+AR8Nw9urKZ4wlzMSOEVGgCfXRHV
-uPylIRr85Obv2VRMPluoVM0=
-=1QeG
+iD8DBQFF/uY98bi6rjpTunYRAnLDAKDZCyc2ynqrW9S/CccjaHLwuyg9+wCgvQWb
+kKm/nvyEEAkNssVNKTmS4PM=
+=jcUJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
new file mode 100644
index 000000000000..dc272ed25ffe
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.49-SDL-test.patch
@@ -0,0 +1,27 @@
+zzip-config doesnt exist, so we need to use the .pc file
+
+--- SDL/Makefile.in
++++ SDL/Makefile.in
+@@ -244,8 +244,8 @@
+ sdl_DATA = SDL_rwops_zzip.c SDL_rwops_zzip.h
+ EXTRA_DIST = $(sdl_DATA)
+ zzcatsdl_SOURCES = SDL_rwops_zzcat.c
+-zzcatsdl_LDFLAGS = `sdl-config --libs`   `./zzip-config --libs` 
+-zzcatsdl_cflags = `sdl-config --cflags` `./zzip-config --cflags`
++zzcatsdl_LDFLAGS = `sdl-config --libs`   `pkg-config ../zzip/zziplib.pc --libs` 
++zzcatsdl_cflags = `sdl-config --cflags` `pkg-config ../zzip/zziplib.pc --cflags`
+ 
+ ### if it wouldn't be for the zzip-config then we could write it like this
+ # zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
+@@ -544,9 +544,9 @@
+ 	uninstall-sdlDATA
+ 
+ 
+-SDL_rwops_zzip.$(OBJEXT) :  zzip-config  @srcdir@/SDL_rwops_zzip.c
++SDL_rwops_zzip.$(OBJEXT) :  ../zzip/zziplib.pc  @srcdir@/SDL_rwops_zzip.c
+ 	$(COMPILE) $(zzcatsdl_cflags) -c @srcdir@/SDL_rwops_zzip.c  -o $@ 
+-SDL_rwops_zzcat.$(OBJEXT) : zzip-config  @srcdir@/SDL_rwops_zzcat.c
++SDL_rwops_zzcat.$(OBJEXT) : ../zzip/zziplib.pc  @srcdir@/SDL_rwops_zzcat.c
+ 	$(COMPILE) $(zzcatsdl_cflags) -c @srcdir@/SDL_rwops_zzcat.c -o $@
+ zzcatsdl$(EXEEXT): SDL_rwops_zzip.$(OBJEXT) SDL_rwops_zzcat.$(OBJEXT)
+ 	$(LINK)    SDL_rwops_zzip.$(OBJEXT) SDL_rwops_zzcat.$(OBJEXT) \
diff --git a/dev-libs/zziplib/zziplib-0.13.49.ebuild b/dev-libs/zziplib/zziplib-0.13.49.ebuild
index e19945764093..fe8b65d632b0 100644
--- a/dev-libs/zziplib/zziplib-0.13.49.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.1 2007/03/19 19:14:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.2 2007/03/19 19:36:17 vapier Exp $
 
 inherit libtool fixheadtails eutils
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-SDL-test.patch
 	ht_fix_file configure docs/Makefile.in uses/depcomp
 	elibtoolize
 }