Use virtual/jpeg.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

15 files changed, 49 insertions, 27 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 35856245d4b6..9e76df08aa74 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.64 2010/05/21 14:19:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.65 2010/07/23 20:55:11 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r2.ebuild:
+  Use virtual/jpeg.
 
 *gd-2.0.35-r2 (21 May 2010)
 
diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild
index b028f1371eb8..57872115984a 100644
--- a/media-libs/gd/gd-2.0.35-r1.ebuild
+++ b/media-libs/gd/gd-2.0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.12 2010/05/21 14:19:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.13 2010/07/23 20:55:11 ssuominen Exp $
 
 EAPI=1
 inherit autotools
@@ -15,8 +15,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~spar
 IUSE="fontconfig jpeg png truetype xpm"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
-	jpeg? ( >=media-libs/jpeg-6b:0 )
-	png? ( >=media-libs/libpng-1.2.43-r2:0
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4
 		sys-libs/zlib )
 	truetype? ( >=media-libs/freetype-2.1.5 )
 	xpm? ( x11-libs/libXpm x11-libs/libXt )"
diff --git a/media-libs/gd/gd-2.0.35-r2.ebuild b/media-libs/gd/gd-2.0.35-r2.ebuild
index c30ba582e9f3..7a0890b5f46b 100644
--- a/media-libs/gd/gd-2.0.35-r2.ebuild
+++ b/media-libs/gd/gd-2.0.35-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r2.ebuild,v 1.1 2010/05/21 14:19:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r2.ebuild,v 1.2 2010/07/23 20:55:11 ssuominen Exp $
 
 EAPI=1
 inherit autotools
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="fontconfig jpeg png truetype xpm"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
-	jpeg? ( >=media-libs/jpeg-6b:0 )
-	png? ( >=media-libs/libpng-1.2.43-r2:0
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4
 		sys-libs/zlib )
 	truetype? ( >=media-libs/freetype-2.1.5 )
 	xpm? ( x11-libs/libXpm x11-libs/libXt )"
diff --git a/media-libs/jasper/ChangeLog b/media-libs/jasper/ChangeLog
index 00728d7efc84..82f75248eaac 100644
--- a/media-libs/jasper/ChangeLog
+++ b/media-libs/jasper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/jasper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/ChangeLog,v 1.55 2010/02/21 07:03:56 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/ChangeLog,v 1.56 2010/07/23 20:47:49 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  jasper-1.900.1-r3.ebuild:
+  Use virtual/jpeg.
 
   21 Feb 2010; Jonathan Callen <abcd@gentoo.org> jasper-1.900.1-r3.ebuild:
   Transfer prefix keywords (no other changes)
diff --git a/media-libs/jasper/jasper-1.900.1-r3.ebuild b/media-libs/jasper/jasper-1.900.1-r3.ebuild
index 95ee81f18d32..06cba951dc3a 100644
--- a/media-libs/jasper/jasper-1.900.1-r3.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r3.ebuild,v 1.11 2010/02/21 07:03:56 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r3.ebuild,v 1.12 2010/07/23 20:47:49 ssuominen Exp $
 
 inherit libtool eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="opengl jpeg"
 
-RDEPEND="jpeg? ( media-libs/jpeg )
+RDEPEND="jpeg? ( virtual/jpeg )
 		opengl? ( virtual/opengl virtual/glut )"
 DEPEND="${RDEPEND}
 		app-arch/unzip"
diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index fc2eae981a3a..6d9719311458 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.117 2010/07/18 16:18:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.118 2010/07/23 20:40:22 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> lcms-1.19.ebuild,
+  lcms-2.0a.ebuild:
+  Use virtual/jpeg.
 
   18 Jul 2010; Markos Chandras <hwoarang@gentoo.org> lcms-2.0a.ebuild:
   Stable on amd64 wrt bug #328795
diff --git a/media-libs/lcms/lcms-1.19.ebuild b/media-libs/lcms/lcms-1.19.ebuild
index f4f8ea61b3a9..5f7d9c28ed55 100644
--- a/media-libs/lcms/lcms-1.19.ebuild
+++ b/media-libs/lcms/lcms-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.7 2010/03/24 18:12:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.8 2010/07/23 20:40:22 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbs
 IUSE="tiff jpeg zlib python"
 
 RDEPEND="tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg:0 )
+	jpeg? ( virtual/jpeg )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	python? ( >=dev-lang/swig-1.3.31 )"
diff --git a/media-libs/lcms/lcms-2.0a.ebuild b/media-libs/lcms/lcms-2.0a.ebuild
index 0147025f53d2..4fc1a2e2618c 100644
--- a/media-libs/lcms/lcms-2.0a.ebuild
+++ b/media-libs/lcms/lcms-2.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.0a.ebuild,v 1.6 2010/07/18 16:18:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.0a.ebuild,v 1.7 2010/07/23 20:40:22 ssuominen Exp $
 
 EAPI=2
 inherit libtool
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="jpeg static-libs tiff zlib"
 
-DEPEND="jpeg? ( media-libs/jpeg:0 )
+DEPEND="jpeg? ( virtual/jpeg )
 	tiff? ( media-libs/tiff )
 	zlib? ( sys-libs/zlib )"
 
diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog
index f29958b77d7a..94434dbeb8af 100644
--- a/media-libs/libmng/ChangeLog
+++ b/media-libs/libmng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.69 2010/06/21 09:08:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.70 2010/07/23 20:59:14 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libmng-1.0.10.ebuild:
+  Use virtual/jpeg.
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> libmng-1.0.10.ebuild:
   Restrict media-libs/lcms depend to old version.
diff --git a/media-libs/libmng/libmng-1.0.10.ebuild b/media-libs/libmng/libmng-1.0.10.ebuild
index e559ca53131a..e453edf56d07 100644
--- a/media-libs/libmng/libmng-1.0.10.ebuild
+++ b/media-libs/libmng/libmng-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.10.ebuild,v 1.11 2010/06/21 09:08:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.10.ebuild,v 1.12 2010/07/23 20:59:14 ssuominen Exp $
 
 EAPI=1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms"
 
-DEPEND=">=media-libs/jpeg-6b:0
+DEPEND="virtual/jpeg
 	>=sys-libs/zlib-1.1.4
 	lcms? ( =media-libs/lcms-1* )"
 
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 167bac030369..a75d7bd0761c 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.242 2010/07/14 01:08:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.243 2010/07/23 20:52:24 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  netpbm-10.49.00.ebuild:
+  Use virtual/jpeg.
 
   14 Jul 2010; Jeroen Roovers <jer@gentoo.org> netpbm-10.49.00.ebuild:
   Stable for HPPA (bug #319521).
diff --git a/media-libs/netpbm/netpbm-10.49.00.ebuild b/media-libs/netpbm/netpbm-10.49.00.ebuild
index 85961ec1b62b..9776d6cdc8cf 100644
--- a/media-libs/netpbm/netpbm-10.49.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.49.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.49.00.ebuild,v 1.9 2010/07/14 01:08:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.49.00.ebuild,v 1.10 2010/07/23 20:52:24 ssuominen Exp $
 
 EAPI=1
 inherit toolchain-funcs eutils multilib
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
 
-RDEPEND="jpeg? ( >=media-libs/jpeg-7:0 )
+RDEPEND="jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
 	tiff? ( >=media-libs/tiff-3.5.5 )
-	png? ( >=media-libs/libpng-1.2.43-r2:0 )
+	png? ( >=media-libs/libpng-1.4 )
 	xml? ( dev-libs/libxml2 )
 	zlib? ( sys-libs/zlib )
 	svga? ( media-libs/svgalib )
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 3a6a91b46f3d..627a05c65ad6 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.161 2010/07/19 01:08:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.162 2010/07/23 20:43:04 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.4.ebuild,
+  tiff-4.0.0_beta6.ebuild:
+  Use virtual/jpeg.
 
   19 Jul 2010; Joseph Jezak <josejx@gentoo.org> tiff-3.9.4.ebuild:
   Marked ppc stable for bug #324885.
diff --git a/media-libs/tiff/tiff-3.9.4.ebuild b/media-libs/tiff/tiff-3.9.4.ebuild
index 914d66ce2a75..3f939e344991 100644
--- a/media-libs/tiff/tiff-3.9.4.ebuild
+++ b/media-libs/tiff/tiff-3.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4.ebuild,v 1.9 2010/07/19 01:08:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4.ebuild,v 1.10 2010/07/23 20:43:04 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg static-libs zlib"
 
-DEPEND="jpeg? ( >=media-libs/jpeg-6b:0 )
+DEPEND="jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
 	zlib? ( sys-libs/zlib )"
 
diff --git a/media-libs/tiff/tiff-4.0.0_beta6.ebuild b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
index b977c1fdacf2..e222dfce51b3 100644
--- a/media-libs/tiff/tiff-4.0.0_beta6.ebuild
+++ b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.2 2010/06/21 22:10:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.3 2010/07/23 20:43:04 ssuominen Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg static-libs zlib"
 
-DEPEND="jpeg? ( >=media-libs/jpeg-6b:0 )
+DEPEND="jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
 	zlib? ( sys-libs/zlib )"