Fix missing zlib.h include for Z_BEST_COMPRESSION wrt #361323 by "Alphat-PC".

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

4 files changed, 36 insertions, 19 deletions

diff --git a/media-gfx/fbgrab/ChangeLog b/media-gfx/fbgrab/ChangeLog
index c3730936c6ff..51d4c8757cd4 100644
--- a/media-gfx/fbgrab/ChangeLog
+++ b/media-gfx/fbgrab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbgrab
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/ChangeLog,v 1.13 2008/05/18 19:23:25 solar Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/ChangeLog,v 1.14 2011/03/31 20:20:13 ssuominen Exp $
+
+  31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> fbgrab-1.0.ebuild,
+  +files/fbgrab-1.0-zlib_h.patch:
+  Fix missing zlib.h include for Z_BEST_COMPRESSION wrt #361323 by "Alphat-PC".
 
   18 May 2008; <solar@gentoo.org> fbgrab-1.0.ebuild:
   - Keyworded ~arm and made cross compile aware
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index 4ffb14a900da..8e49fa7cf180 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX fbgrab-1.0-zlib_h.patch 263 RMD160 6b620c1c1e72e91970f1fb3a69337915045df828 SHA1 2f01c08b7ed5b24220beeaf90536adc57ce520d8 SHA256 fffbd6136989d303ecbaceae285973e3cca9e3c1494e237df5b264738cf913f6
 DIST fbgrab-1.0.tar.gz 11928 RMD160 6af8dede565cd65d2dc699e6c85e2281f158f84e SHA1 f5c298648736ae5bb0069a571a0f9b976a432f80 SHA256 9158241a20978dcc4caf0692684da9dd3640fd6f5c8b72581bd099198d670510
-EBUILD fbgrab-1.0.ebuild 831 RMD160 a71872cd61e9c6f2b36584a2f6f4b1a75d203b47 SHA1 a5006df16938251819da81d1f02caed6de141fb3 SHA256 a0784c1ea6b12e26fb5a888984307b2a0ae5c01ec717806abd4c383a747fd52e
-MISC ChangeLog 1672 RMD160 12b45725ff2fc8451411408d331e85addf7e1913 SHA1 6023d8aeda5d60804ee19a5327380827e4b7fa6b SHA256 cbf6476b18ec90bc35d36b47317360ee7c430c5bc9c09e52a589dc9645314755
+EBUILD fbgrab-1.0.ebuild 901 RMD160 fa7cda3a7e0d40f35519243096f34d1331cd5925 SHA1 821cfec49bbe75d93177c303db479332fc0727a7 SHA256 2f41ebfa5f4a4f3a5ba6c3ef56ec0243fb8bebebf624f1915a885094d1c1a6a9
+MISC ChangeLog 1864 RMD160 a2f256a85fcf56ec16c132155b5f45e690163f88 SHA1 f0be8131a4e0c1c348bcefb5e3f9fef538ecf386 SHA256 c8203b85dedb02619c21c0f8a8a49c82485e3e33314a977f5bfd3fa01e356cb4
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkk7vXoACgkQ67wieSYcaxeaeACgultxEIhUm6EgsYiFftBFk4J7
-D/gAoJ5f9X8hJAZTuThe6VHC3K2yFoja
-=0Gru
+iF4EAREIAAYFAk2U4i8ACgkQXkR9YqOcLPGGqgD/bt0IZKRmUP3ObzG3IoCGvrK2
+qA19knxgtKg/O7NZSVIBAJaKBw+bTIMvinwIETjEx3BYBhH048Jm6n3d3+ZvWhSO
+=Q1w5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbgrab/fbgrab-1.0.ebuild b/media-gfx/fbgrab/fbgrab-1.0.ebuild
index e0afa1e48002..32b858811737 100644
--- a/media-gfx/fbgrab/fbgrab-1.0.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0.ebuild,v 1.12 2008/12/07 12:11:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbgrab/fbgrab-1.0.ebuild,v 1.13 2011/03/31 20:20:13 ssuominen Exp $
 
-inherit toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Framebuffer screenshot utility"
 HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
@@ -13,23 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ppc ~sparc x86"
 IUSE=""
 
-DEPEND="media-libs/libpng"
+RDEPEND="media-libs/libpng
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-1.0
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "s:gcc :\$(CC) :" \
 		-e "s:splint:#splint:" \
 		-e "s:-Wall:-Wall ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}:" \
-		Makefile
+		Makefile || die
+
+	epatch "${FILESDIR}"/${P}-zlib_h.patch
 }
 
 src_compile() {
-	tc-export CC
-	emake CC="${CC}" || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
diff --git a/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch b/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
new file mode 100644
index 000000000000..8318ab468994
--- /dev/null
+++ b/media-gfx/fbgrab/files/fbgrab-1.0-zlib_h.patch
@@ -0,0 +1,10 @@
+--- fbgrab.c
++++ fbgrab.c
+@@ -22,6 +22,7 @@
+ 
+ #include <getopt.h>
+ #include <sys/vt.h>   /* to handle vt changing */
++#include <zlib.h>     /* Z_BEST_COMPRESSION */
+ #include <png.h>      /* PNG lib */
+ #include <linux/fb.h> /* to handle framebuffer ioctls */
+