Fix building with libpng15 (missing zlib.h include) wrt #383223 by Diego Elio Pettenò

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

4 files changed, 40 insertions, 20 deletions

diff --git a/app-emulation/fuse/ChangeLog b/app-emulation/fuse/ChangeLog
index e803f9ad8e31..13a1bee237af 100644
--- a/app-emulation/fuse/ChangeLog
+++ b/app-emulation/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/fuse
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.33 2011/05/02 20:01:15 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/ChangeLog,v 1.34 2011/09/17 13:28:31 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> fuse-1.0.0.ebuild,
+  +files/fuse-1.0.0-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #383223 by Diego Elio
+  Pettenò
 
 *fuse-1.0.0 (02 May 2011)
 
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 4100d2530960..84f692acbb33 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX fuse-0.7.0-gcc4.patch 725 RMD160 5d89b4e67c19a7d4c087f6e13f71ce2f87957bb2 SHA1 ba8420be70c1e050e5ca31fc7afee298978827e9 SHA256 b891245b9c66d3be267a18e704bcbadc1bbead821c541744a4301c00c2815e99
+AUX fuse-1.0.0-libpng15.patch 187 RMD160 4bc84b281670e596d105271035e6257816ebdeaa SHA1 a696d8f56c1e4e1f85f56b284c58f89778d05668 SHA256 a2099911f20d78ec8621c108aa534785e9ec45bb1d826b0603acebdb575f8b0f
 DIST fuse-0.10.0.2.tar.gz 1579106 RMD160 d6f3f8b10669573b62be38dcc63b35add743e0fe SHA1 1d43619a92f2557666a165af5d0b5eca87497d55 SHA256 843d5a17b7956d81741f3280910252a29f543a02cf99a177ab78bdb7dc778672
 DIST fuse-0.7.0.tar.gz 872031 RMD160 38abec9f44677f0f5b86b99bc0127a62cc7fb9cf SHA1 36e0485183bd1bbfc9140b8ebb9f0a4bf197ffe6 SHA256 266177f8d9cd8959fc2b4358b56afb343f98fb56e5d4da352589ac1d49ce32e7
 DIST fuse-1.0.0.tar.gz 1628751 RMD160 32d9249266f6083a8cb565ef7b4a5f26b9fa6d5e SHA1 9bf164ca069a0b599002c49b56a1d30519e2aac0 SHA256 a00add3abc0148247f7990e6feebcc32d82ebe857897d9426e5230222425aeb9
 EBUILD fuse-0.10.0.2-r3.ebuild 2534 RMD160 d542251506986da09bbf5fd72fdd95ba7d2cc5de SHA1 d1d878a23563f867dbafe14700c6df50b906bce2 SHA256 db6490fe660ea1a20cd4cf05df6e3ed3e16bd5220eac8d269373f87f829a261d
 EBUILD fuse-0.7.0.ebuild 1801 RMD160 35d50277bcc4df092dcdacd1c29ff473825f1cea SHA1 493ac7610516fd1b73b0c9dc161fe7cf44c7af2f SHA256 4155a2ab5348dc8f18d81d72e166ac747f0247feb140bc21c04a71d1b4ce132d
-EBUILD fuse-1.0.0.ebuild 2488 RMD160 e57af6160b2331bb3fa8d05213abfa97108694a3 SHA1 d4fe7c153904fb19b7a5c02c70394e554eac541f SHA256 67cdaa67770bd37d6c15aba1e4855060fda8338d1ee4676332ca5a9fe4b5096a
-MISC ChangeLog 4692 RMD160 2e49d2d32e43d5ca804481b341701860ee137261 SHA1 11e0eafe1c1d52258ffc01f866835e8af8ed4ff3 SHA256 9a4144c4cd6cf5d574f98d4249f3c553a0e8c65078a299a870bce009ae0502f8
+EBUILD fuse-1.0.0.ebuild 2481 RMD160 f6ec747cdd50a7fbdb75a0668cea60409e057b96 SHA1 0af48d72550a482c7e958ce029ee3fc55806bb73 SHA256 f227e0bfa88ae49b000b3598422835246306cb29c0b35d9534b47b521bae9063
+MISC ChangeLog 4893 RMD160 d05d982fcc59fe89b4862f94828740d4b7ed88c9 SHA1 3d36bc7e02b6bd517f394ba046f14172c8da1857 SHA256 2f983686609a805e7dff2699f33aa688b3becbe90010fad556639d63d195017f
 MISC metadata.xml 630 RMD160 757bf50350d78bec3ec7ce2fdfbbf603c683c0a6 SHA1 d60ab432cc7a568bd206b3bf9ccd8dcedf77d7cc SHA256 b9928c4a4157eea231d5e82351a889c502ceaa65304a01aa7c9b19fe85f0edb2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2/Dm4ACgkQdIssYB9vBoOajACfetmSAFRV8vpEfqGHu5TyGuDE
-GLoAn19Ou6/aFdUXyeQMRLOqaDEPNd8l
-=GBvg
+iF4EAREIAAYFAk50oLsACgkQXkR9YqOcLPFrGgD/U6yQcR43Ht4ygyjNuUrtWLw1
+fy0p2cGzaytidGcPC+4BAKnKbW9xr3IZ03hJhgh14u8SrfBRpuuip+jAPvKGkS0/
+=QHG8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch b/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch
new file mode 100644
index 000000000000..3da2d672c47b
--- /dev/null
+++ b/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch
@@ -0,0 +1,10 @@
+--- screenshot.c
++++ screenshot.c
+@@ -48,6 +48,7 @@
+ 
+ #ifdef USE_LIBPNG
+ 
++#include <zlib.h>
+ #include <png.h>
+ 
+ static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
diff --git a/app-emulation/fuse/fuse-1.0.0.ebuild b/app-emulation/fuse/fuse-1.0.0.ebuild
index e2dcecbaa94e..114c05728f07 100644
--- a/app-emulation/fuse/fuse-1.0.0.ebuild
+++ b/app-emulation/fuse/fuse-1.0.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-1.0.0.ebuild,v 1.1 2011/05/02 20:01:15 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fuse/fuse-1.0.0.ebuild,v 1.2 2011/09/17 13:28:31 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
+inherit eutils
 
 DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
 HOMEPAGE="http://fuse-emulator.sourceforge.net"
@@ -45,14 +46,21 @@ RDEPEND="~app-emulation/libspectrum-1.0.0
 						!alsa? ( ao? ( media-libs/libao ) )
 						joystick? ( media-libs/libjsw ) ) ) ) ) )
 	dev-libs/glib:2
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng sys-libs/zlib )
 	xml? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-util/pkgconfig"
 
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
 src_configure() {
 	local guiflag
+
 	if use gtk; then
 		guiflag=""
 	elif use sdl; then
@@ -66,7 +74,9 @@ src_configure() {
 	else  # We default to X user interface
 		guiflag="--without-gtk"
 	fi
-	econf --without-win32 \
+
+	econf \
+		--without-win32 \
 		${guiflag} \
 		$(use_with gpm) \
 		$(use_with alsa) \
@@ -75,16 +85,10 @@ src_configure() {
 		$(use_enable joystick ui-joystick) \
 		$(use_with xml libxml2) \
 		$(use_with png ) \
-		$(use_enable memlimit smallmem) \
-		|| die "econf failed!"
-}
-
-src_compile() {
-	emake || die "emake failed!"
+		$(use_enable memlimit smallmem)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog README THANKS
+	default
 	doman man/fuse.1
 }