Fix building with libpng15 (missing zlib.h include) wrt #378715 by Diego Elio Pettenò. Fix missing virtual/jpeg, media-libs/libpng and sys-libs/zlib dependencies (see image.c for reference).

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

4 files changed, 32 insertions, 17 deletions

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index a0b2e1cc2e35..b2514872bf36 100644
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.21 2011/03/25 17:10:45 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.22 2011/09/14 15:13:19 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.33-r1.ebuild,
+  +files/xrmap-2.33-libpng15.patch:
+  Fix building with libpng15 (missing zlib.h include) wrt #378715 by Diego Elio
+  Pettenò. Fix missing virtual/jpeg, media-libs/libpng and sys-libs/zlib
+  dependencies (see image.c for reference).
 
 *xrmap-2.33-r1 (25 Mar 2011)
 
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 291fd1d7a580..a5d07ed65462 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX xrmap-2.33-Makefile.kit.patch 701 RMD160 97661e2d5e7d5e34db533f66bd3eb6373d4f900a SHA1 01393e37ee1ef8a0dc59415589ad89fcf531493f SHA256 839a5672acd290d24aee62de2ecb30aee584cff7ea7475ef95d778a9ad9125b6
 AUX xrmap-2.33-as-needed.patch 564 RMD160 3760717e2478cab2d2cec0afb26e903480906e31 SHA1 0e5009b2556e3ffcdd8ef102b6191dd0c4aa19f2 SHA256 54ec3017ca34a4a195b79555e0dfe4d2e04df7c80782a52e3719b90745217c86
+AUX xrmap-2.33-libpng15.patch 159 RMD160 715cb38ae83115f6e5994dc918c2cf9c9cdedd1d SHA1 505ddcfd7b33d2a92a99b92de56e41837595d743 SHA256 144cd2745262aadccb71bc0ab47686710c109fca30cdb70208f3afdee62768e8
 AUX xrmap-2.33-parallel-make.patch 940 RMD160 c1eaca645849f81bd70c3608572e0942b036fcb9 SHA1 ba7de59da457d5be948c006d05f3aa1812845872 SHA256 8e40d3819c0a3d598401ad3386709c833c66d578c097eff8652def5901e0d928
 DIST CIA_WDB2.jpd.gz 7391060 RMD160 80fe751ba61405d7b7b7ecdfaf3a9d8e7b9e06b8 SHA1 5d5695c21059dce13ede1f7d5c2a4dfe19b52dd2 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1
 DIST anthems-1.3.tar.bz2 204506 RMD160 d259a5a891227f27a0f1e8bd5530b0d70fea90f5 SHA1 362fd89839f0990d55e9abc82b2d6fe61efd9616 SHA256 69457f8834e004192884abdccfe4b46d75a08c8c7c5f8e8dae3efe46ef022662
@@ -14,18 +15,14 @@ DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1
 DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
 DIST xrmap-2.33.tar.bz2 1224699 RMD160 6c025976f98046315a370405f043aaf2cd05a12d SHA1 bd6392e1732754f5421615ff16ef625e703fbb5b SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
 EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32
-EBUILD xrmap-2.33-r1.ebuild 3563 RMD160 c860a9153f7b3579256bfba47f98aa78c7348ffe SHA1 c7d4406f3b3711e3a4faa9e46ae814d5916104a6 SHA256 e3231e7a9371e439af5c3d39e3b4cd6f59ff7a660a792b46e7191e9fdfbafb8c
+EBUILD xrmap-2.33-r1.ebuild 3565 RMD160 ba80b4e040acf6253c088b2bc861d8289e8b3a14 SHA1 05bee21908d1446fa8684ef8d983af97fb7786c9 SHA256 42cfc1d14551c7a180a75c1fdfcecc98b7bc623285e917de1dfa17a831ae477b
 EBUILD xrmap-2.33.ebuild 2358 RMD160 15819efe33f54db7ae5160f46182e2f4e4570996 SHA1 03241ef116a735f57e32ce5b4ca1347c3427c686 SHA256 327af5cc9fa73e4623d4fe23172ff90d0e36d72bd9e59d01840b7053abed116d
-MISC ChangeLog 3043 RMD160 b7aa28b07ed18fddf2cbe0224439944b1d149346 SHA1 2b65f88da73c8e0707cc547f9969a8c29b346fdd SHA256 9e3b959eb19fbc8c538f179143be92020de6f52091d9b77ad29c162cb74dcbd6
+MISC ChangeLog 3356 RMD160 5dfafebec6fc5cb6e6d2cc0f8cc47c5c6bc24f4b SHA1 ac454b7d299391ee360e74d16e092c47be6189f0 SHA256 ea13c63f6238c1063ab8921c12ce46921bd5d24afaec471646b9f5e1f3a19b57
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNjMyjAAoJEMxKBLrQri3oWpQIALVq6F+FzNKTII3WwEePVJah
-zjKYDQ9ritn/Y+TPbzeHgqyOWPgbtzbp/z/jSjB0t+XA+L7rIdO/GfGH0sVeVRIi
-vP2Fyq1Lmu9/KRqRVlfWdqc8U/gJzU1bhXi3R/rTczzGzXeeeCTFqCI4BUqXC34/
-9OMv7Cxswm4vJoy5HuSXhWx6xHfSoOkn+JcMf64amg6+BDTMJE1tuhfo116phpQj
-tB9H8QkvhRXF4AtXrOSiPKimA+3+yNevQKjiEBCEa8EuyTrfDzK1GI+LVzwt/RaP
-kFRqbhSiKYzxfDfABuIIprJdYztsWwiYeaQcLQoI+jKINWqIwM0Za62sRFTI0k8=
-=3LmQ
+iF4EAREIAAYFAk5wxMYACgkQXkR9YqOcLPEbNQD/WZRlWv465uF1C9HuCHggjRxv
+/A/i9d5Ce6azPakDjfEBAIEL25BVNgZlciIFF3sQVHQxvTKWALW/DyvpJEnKeEK0
+=Jx5w
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
new file mode 100644
index 000000000000..48cd29a430f2
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
@@ -0,0 +1,10 @@
+--- image.c
++++ image.c
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <zlib.h> /* gzFile */
+ #include <png.h>
+ #include <jpeglib.h>
+ 
diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
index d27a1c8969ef..436119c7acd6 100644
--- a/x11-misc/xrmap/xrmap-2.33-r1.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.1 2011/03/25 17:10:45 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.2 2011/09/14 15:13:19 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -22,11 +22,13 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="zlib"
+IUSE=""
 
 CDEPEND="x11-libs/libX11
 	x11-libs/libXpm
-	zlib? ( sys-libs/zlib )"
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	sys-libs/zlib"
 RDEPEND="${CDEPEND}
 	x11-misc/xdg-utils
 	app-text/gv
@@ -44,8 +46,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
-	use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 
 	sed  -e 's,^\(X11DIR=\).*,\1/usr/,g' \
 		 -e 's,^\(EDITOR=\).*,\1less,g'   \