Use virtual/jpeg.

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

4 files changed, 14 insertions, 10 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index b54fef80657b..835306acc92c 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.107 2010/07/05 13:08:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.108 2010/07/23 22:27:02 ssuominen Exp $
+
+  23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  qt-gui-4.5.3-r2.ebuild, qt-gui-4.6.3.ebuild:
+  Use virtual/jpeg.
 
   05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> qt-gui-4.6.2.ebuild:
   ppc64 stable wrt #297299
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 1b06a6de51a2..1d8acc4226a8 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -4,9 +4,9 @@ AUX qt-4.5.3-libpng14.patch 1545 RMD160 1bfc03a474c3ff5f55144fece013031dc2425b1b
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
-EBUILD qt-gui-4.5.3-r2.ebuild 6052 RMD160 b0fa46b2bc261242ea8406ce27a94f6cf25660d7 SHA1 011c02f7ef36a52e4376e4c086de27dea89e2932 SHA256 836b6ac4bc1d242546fb3e17151955cad51c3a07ccaa3d926e308a299a6a7baa
+EBUILD qt-gui-4.5.3-r2.ebuild 6056 RMD160 9528aaf46f06bb76b9ed14be938ebeb55e7e886e SHA1 4fdce9e09ce4905450e909804c6697bac14f1cf0 SHA256 c41f08163177c02f93027c3309924702f8e11484c0f5effbac72a9bf8f7459e0
 EBUILD qt-gui-4.6.2-r1.ebuild 5343 RMD160 8b29fb4432b5008a944d50f9cdc1ab80519f58c9 SHA1 341597ed0999cf4c9959e95d3ec46656841f7bbc SHA256 7db29fd43799274c1db970329b9cd749ac7159da3e3d87566e1a80da6a1b984d
 EBUILD qt-gui-4.6.2.ebuild 5217 RMD160 745e3b2b49251a1994a83663fb336147b9ef96d3 SHA1 89f0d84ef6f2e9b479ea5638e5c88d7ad7c5cd74 SHA256 e27cc8e7fdd3c5386d434c1c2c181bbdae2be7d6f5385344be1fd3bb7f56feb2
-EBUILD qt-gui-4.6.3.ebuild 5339 RMD160 99c9d5bc4dedbcb04f63763eec131face9d999ac SHA1 c2f2dffe0f763fbc6206b3c0cd8c58abaf0006ed SHA256 b4c5fd9a718c049c76c07536249bc18c013d450182252139ed2322057122d60d
-MISC ChangeLog 16789 RMD160 ccfb3c1937256994f61980b6f7896cccaa62d9fc SHA1 7131f03cfb58a3b5a255c20fe385b49fb3303d27 SHA256 2b509f9a296b280f60aa1cabfc2d39633eb2f4bf20b2600562e528a2d9875ad9
+EBUILD qt-gui-4.6.3.ebuild 5327 RMD160 aa64505121f01f35de6dd9befce53dd185fcbc74 SHA1 1871ad2ed02ab712f4607a2626f2791edf6a8ac0 SHA256 960af22e9e8eb1cb491cb5e1a9dc97b45d99ae5422f3b09bf772ef8f89339259
+MISC ChangeLog 16911 RMD160 e1fbbe0af6ea6aee4e1c6c52c8ceabc43e315f42 SHA1 c18bca92dda5d067087a18baf1933ffe89b0442a SHA256 4bc40837f38430a124ad23700f484ead96faedc430a9357bd4aa3bf490369037
 MISC metadata.xml 851 RMD160 8180a368a140c2223e3c0d99bac31a0b1284b639 SHA1 84f35f3fe344072bd38c58cf7ed39a4bbfbecbff SHA256 7129b71867455575817f2f6915813ca84a059a8f878a73782278700edd50ab31
diff --git a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
index baf691a968be..a8ef3bd519b5 100644
--- a/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.5.3-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/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.9 2010/07/04 11:53:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.5.3-r2.ebuild,v 1.10 2010/07/23 22:27:02 ssuominen Exp $
 
 EAPI="2"
 inherit eutils qt4-build
@@ -12,8 +12,8 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xine
 
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
-	media-libs/jpeg
-	media-libs/libpng
+	virtual/jpeg
+	>=media-libs/libpng-1.4
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
index 88ca5a49f71e..ca262ed71f4e 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.3.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.3.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/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.1 2010/06/08 12:17:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.2 2010/07/23 22:27:02 ssuominen Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -12,8 +12,8 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor
 
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
-	media-libs/jpeg:0
-	>=media-libs/libpng-1.2.43-r2:0
+	virtual/jpeg
+	>=media-libs/libpng-1.4
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]