Use virtual/jpeg wrt #327487.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 23 insertions, 19 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 495c9fd16b45..add3a024182f 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.124 2010/04/11 20:31:14 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.125 2010/11/07 21:34:44 ssuominen Exp $
+
+  07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> links-2.2.ebuild,
+  links-2.3_pre1.ebuild:
+  Use virtual/jpeg wrt #327487.
 
 *links-2.3_pre1 (11 Apr 2010)
 
diff --git a/www-client/links/links-2.2.ebuild b/www-client/links/links-2.2.ebuild
index 3524769780f3..2e7939100e1a 100644
--- a/www-client/links/links-2.2.ebuild
+++ b/www-client/links/links-2.2.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/www-client/links/links-2.2.ebuild,v 1.10 2010/02/26 16:29:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.2.ebuild,v 1.11 2010/11/07 21:34:44 ssuominen Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=none
@@ -28,21 +28,21 @@ IUSE="bzip2 directfb fbcon gpm jpeg livecd png sdl ssl svga tiff unicode X zlib"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	gpm? ( sys-libs/gpm )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	fbcon? ( >=media-libs/libpng-1.2.1
-		>=media-libs/jpeg-6b
+	png? ( >=media-libs/libpng-1.4 )
+	jpeg? ( virtual/jpeg )
+	fbcon? ( >=media-libs/libpng-1.4
+		virtual/jpeg
 		sys-libs/gpm )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svga? ( >=media-libs/svgalib-1.4.3
-		>=media-libs/libpng-1.2.1 )
+		>=media-libs/libpng-1.4 )
 	X? ( x11-libs/libXext
-		>=media-libs/libpng-1.2.1 )
+		>=media-libs/libpng-1.4 )
 	directfb? ( dev-libs/DirectFB )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	sys-libs/ncurses
-	livecd? ( >=media-libs/libpng-1.2.1
-		>=media-libs/jpeg-6b
+	livecd? ( >=media-libs/libpng-1.4
+		virtual/jpeg
 		sys-libs/gpm )"
 
 DEPEND="${RDEPEND}
diff --git a/www-client/links/links-2.3_pre1.ebuild b/www-client/links/links-2.3_pre1.ebuild
index c4ed3dba5297..549fa96f5b33 100644
--- a/www-client/links/links-2.3_pre1.ebuild
+++ b/www-client/links/links-2.3_pre1.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/www-client/links/links-2.3_pre1.ebuild,v 1.1 2010/04/11 20:31:14 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.3_pre1.ebuild,v 1.2 2010/11/07 21:34:44 ssuominen Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=none
@@ -27,21 +27,21 @@ IUSE="bzip2 directfb fbcon gpm jpeg livecd png sdl ssl svga tiff unicode X zlib"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	gpm? ( sys-libs/gpm )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	fbcon? ( >=media-libs/libpng-1.2.1
-		>=media-libs/jpeg-6b
+	png? ( >=media-libs/libpng-1.4 )
+	jpeg? ( virtual/jpeg )
+	fbcon? ( >=media-libs/libpng-1.4
+		virtual/jpeg
 		sys-libs/gpm )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	svga? ( >=media-libs/svgalib-1.4.3
-		>=media-libs/libpng-1.2.1 )
+		>=media-libs/libpng-1.4 )
 	X? ( x11-libs/libXext
-		>=media-libs/libpng-1.2.1 )
+		>=media-libs/libpng-1.4 )
 	directfb? ( dev-libs/DirectFB )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	sys-libs/ncurses
-	livecd? ( >=media-libs/libpng-1.2.1
-		>=media-libs/jpeg-6b
+	livecd? ( >=media-libs/libpng-1.4
+		virtual/jpeg
 		sys-libs/gpm )"
 
 DEPEND="${RDEPEND}