Disable internal jpeg/z depends on tiff #395753 by Diego Elio Pettenò.

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 8720dbdfa8874201f1c9aef7af0d28ac06b4f686..b0f2b9352c1251fdc53e51aef6956222b29530ea 100644 (file)
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/netpbm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.261 2011/12/05 00:03:07 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.262 2012/01/03 01:36:12 vapier Exp $
+
+  03 Jan 2012; Mike Frysinger <vapier@gentoo.org> netpbm-10.56.00.ebuild:
+  Disable internal jpeg/z depends on tiff #395753 by Diego Elio Pettenò.
 
 *netpbm-10.56.00 (05 Dec 2011)
 

diff --git a/media-libs/netpbm/netpbm-10.56.00.ebuild b/media-libs/netpbm/netpbm-10.56.00.ebuild
index e942cbd6a694febf7ff27310ecd30e9eb9528098..a2f21d1504280b296097529c9ac76856af74fa15 100644 (file)
--- a/media-libs/netpbm/netpbm-10.56.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.56.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.1 2011/12/05 00:03:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.2 2012/01/03 01:36:12 vapier Exp $
 
 EAPI="3"
 
@@ -101,6 +101,9 @@ src_configure() {
 
        # Gentoo build options
        TIFFLIB = $(netpbm_config tiff)
+       # Let tiff worry about its own dependencies #395753
+       TIFFLIB_NEEDS_JPEG = N
+       TIFFLIB_NEEDS_Z = N
        JPEGLIB = $(netpbm_config jpeg)
        PNGLIB = $(netpbm_config png)
        ZLIB = $(netpbm_config zlib z)