Corrected Slotting of media-libs/libpng and media-libs/tiff

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

9 files changed, 34 insertions, 28 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 1f0170448574..722747f649ae 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.151 2011/09/08 09:20:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.152 2011/11/12 12:16:34 jlec Exp $
+
+  12 Nov 2011; Justin Lecher <jlec@gentoo.org> qt-gui-4.6.2.ebuild,
+  qt-gui-4.6.2-r1.ebuild, qt-gui-4.6.3.ebuild, qt-gui-4.6.3-r2.ebuild,
+  qt-gui-4.7.2.ebuild, qt-gui-4.7.3.ebuild, qt-gui-4.7.3-r1.ebuild,
+  qt-gui-4.7.4.ebuild:
+  Corrected Slotting of media-libs/libpng and media-libs/tiff
 
 *qt-gui-4.7.4 (08 Sep 2011)
 
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
index a25e1b83b2ab..a219cb044878 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2-r1.ebuild,v 1.4 2010/11/07 19:31:49 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2-r1.ebuild,v 1.5 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
 	virtual/jpeg
-	>=media-libs/libpng-1.2.43-r2:0
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtk? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	!aqua? (
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
index bb18f64f898d..47ddbc807b04 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2.ebuild,v 1.11 2010/12/05 19:53:27 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.12 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xine
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
 	virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtk? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
index a3d251ba68be..e0ebad43ffbc 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.3-r2.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-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.3 2011/08/17 16:56:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.4 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
 	virtual/jpeg
-	>=media-libs/libpng-1.4
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtk? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
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 3a7eb2c6427a..66ed9ddda174 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
+# Copyright 1999-2011 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.11 2010/12/23 07:55:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.12 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3suppor
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2
 	virtual/jpeg
-	>=media-libs/libpng-1.4
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtk? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild b/x11-libs/qt-gui/qt-gui-4.7.2.ebuild
index 13ba3f772a38..1d7e0aff4b22 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.2.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-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.9 2011/07/13 12:49:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.10 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild
index e0b2970e16e9..75de3e606e93 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.3-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-libs/qt-gui/qt-gui-4.7.3-r1.ebuild,v 1.1 2011/08/14 17:57:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3-r1.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/qt-gui/qt-gui-4.7.3.ebuild b/x11-libs/qt-gui/qt-gui-4.7.3.ebuild
index b509b9106cb3..b0d4aef74a66 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.3.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.3.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-libs/qt-gui/qt-gui-4.7.3.ebuild,v 1.1 2011/05/10 20:06:02 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.3.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild
index 49409ee79c48..7fecb6e774db 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.4.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-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.1 2011/09/08 09:20:08 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.2 2011/11/12 12:16:34 jlec Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -13,7 +13,7 @@ IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt
 RDEPEND="media-libs/fontconfig
 	media-libs/freetype:2
 	virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	sys-libs/zlib
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
@@ -31,7 +31,7 @@ RDEPEND="media-libs/fontconfig
 	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig