Fix building with libpng15 wrt #381413 by Diego Elio Pettenò

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

4 files changed, 54 insertions, 22 deletions

diff --git a/media-gfx/fbv/ChangeLog b/media-gfx/fbv/ChangeLog
index 1d5f0af33c6a..6a88ff03cc8a 100644
--- a/media-gfx/fbv/ChangeLog
+++ b/media-gfx/fbv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.19 2011/07/20 14:32:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.20 2011/09/14 11:31:48 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> fbv-1.0b.ebuild,
+  +files/fbv-1.0b-libpng15.patch:
+  Fix building with libpng15 wrt #381413 by Diego Elio Pettenò
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/media-gfx/fbv/Manifest b/media-gfx/fbv/Manifest
index 24af9b8cdfda..326becab545d 100644
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX fbv-1.0b-libpng15.patch 528 RMD160 b698b6725250bf720c2b8102c66221d64aec8157 SHA1 12b99ca887048168fdc1ee81c6fd6c440753e197 SHA256 46d3e21f64aea6630e648764678463781fbf9ecfe5728e4f53e603bade09721f
 AUX oob-segfault-fbv-1.0b.diff 559 RMD160 95ca87d8166bfdeae812aa3c9a69e7896f5130cf SHA1 3dc28bce9d372a380be76b58e1d44446820ad845 SHA256 ccc655a98fb41485d100178cf724fc7577c71bc571b227f25bf4921ebf601341
 DIST fbv-1.0b.tar.gz 18989 RMD160 d7b1c9542e8bcd38edf33a47fa87560716ef77d7 SHA1 96eb6d345286b50d32a985b7e447e2f9f7c96bed SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
-EBUILD fbv-1.0b.ebuild 1257 RMD160 741117f1c9115df3a4a54e2941efe1f54f71830e SHA1 d1198a6ed4fc2ccf4989a3d46c4d1ee0169de032 SHA256 640bfe1bd9ba02269cc3cc794c982c0626ab569223032ed6f23f795dfd811c25
-MISC ChangeLog 2511 RMD160 8222797d4c584f8cc844f90a2899988c7a4dd2c9 SHA1 fe4920add4ca7fa7fa95dfd1b5f3ed6098913353 SHA256 d6aa9633df0997c7ab18e9515f3508ab23a43d960c0321ec4ccd2d40011bb324
+EBUILD fbv-1.0b.ebuild 1250 RMD160 35a74505bdddc02986165ab7cae8f1d31f6487c1 SHA1 85590a0eddff618cbedda517bb3b45df30f2bcdf SHA256 6791579da5d9f2bac227b4a0733a12f6934128e3f9ec6e7ac380130e65196433
+MISC ChangeLog 2685 RMD160 606a311f31dfbe3f4c1440680d6f2b6a2d671419 SHA1 909adb45d7e7a851562f0c0ef58fc79cff8f7ecc SHA256 e22aac22f3204fab69b62e03e3cf58efb5f2d2b86e8d16dc434131c88f18c3ee
 MISC metadata.xml 269 RMD160 adcd5df087cf3200906fc1da91acd65126a90c5c SHA1 8a5793af1c2c8223fd3f4c1f6ac42e051dfdb8d2 SHA256 1407df3776bc737a3e807080744032b20021bb5ac6a77ef2f8ff24856f14d393
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4m5wIACgkQCaWpQKGI+9S9EwCfSMiadf+JgkXBQhbMjq+0us8r
-8XQAn1olZwfjpzUIkN0VFCoGAfeN4t+j
-=O2Vy
+iF4EAREIAAYFAk5wkNwACgkQXkR9YqOcLPH73QEAhD0tymJmkoayjOz8h/ZvpGuj
+qxSwVSLX4yoN/WyMuBgA/3QVc5K61w/AMRJ4SMN/fv4EqT9ytyIWLxhgYPwSBOnW
+=CL0B
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index 1d2d0861bf23..c53d51354ddc 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.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/media-gfx/fbv/fbv-1.0b.ebuild,v 1.14 2011/02/26 17:08:40 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.15 2011/09/14 11:31:48 ssuominen Exp $
 
-inherit toolchain-funcs eutils
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="simple program to view pictures on a linux framebuffer device"
 HOMEPAGE="http://freshmeat.net/projects/fbv/"
@@ -13,33 +14,39 @@ SLOT="0"
 KEYWORDS="~amd64 arm ~ppc ppc64 sh x86"
 IUSE="gif jpeg png"
 
-DEPEND="gif? ( media-libs/giflib )
+RDEPEND="gif? ( media-libs/giflib )
 	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/oob-segfault-fbv-${PV}.diff
-	sed -e 's/-lungif/-lgif/g' -i Makefile -i configure
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
 }
 
-src_compile() {
-	local myconf=""
-	myconf="${myconf} --without-bmp"
+src_configure() {
+	local myconf="--without-bmp"
+
 	use png || myconf="${myconf} --without-libpng"
 	use gif || myconf="${myconf} --without-libungif"
 	use jpeg || myconf="${myconf} --without-libjpeg"
+
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		${myconf} || die "configure failed"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+		${myconf} || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin fbv || die "dobin failed"
+	dobin fbv
 	doman fbv.1
 	dodoc ChangeLog README TODO VERSION
 }
diff --git a/media-gfx/fbv/files/fbv-1.0b-libpng15.patch b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
new file mode 100644
index 000000000000..dffbe48c3734
--- /dev/null
+++ b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
@@ -0,0 +1,20 @@
+--- png.c
++++ png.c
+@@ -69,7 +69,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
+@@ -161,7 +161,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);