Drop redundant dep on dev-util/pkgconfig; remove unused files.

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

7 files changed, 16 insertions, 43 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 722747f649ae..0d57b78e0f23 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,11 @@
 # 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.152 2011/11/12 12:16:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.153 2011/11/20 20:23:41 pesa Exp $
+
+  20 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt-gui-4.6.3.ebuild,
+  qt-gui-4.6.3-r2.ebuild, -files/qt-gui-4.7.0-qtreeview-regression-fix.patch,
+  qt-gui-4.7.2.ebuild, qt-gui-4.7.4.ebuild, -files/hardcoded_fonts.patch:
+  Drop redundant dep on dev-util/pkgconfig; remove unused files.
 
   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,
diff --git a/x11-libs/qt-gui/files/hardcoded_fonts.patch b/x11-libs/qt-gui/files/hardcoded_fonts.patch
deleted file mode 100644
index 65706e0d3169..000000000000
--- a/x11-libs/qt-gui/files/hardcoded_fonts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp
-===================================================================
---- qt-x11-opensource-src-4.5.0-beta1.orig/src/gui/text/qfont.cpp
-+++ qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp
-@@ -1767,7 +1767,7 @@ static void initFontSubst()
-     // default substitutions
-     static const char *initTbl[] = {
- 
--#if defined(Q_WS_X11)
-+#if 0
-         "arial",        "helvetica",
-         "times new roman", "times",
-         "courier new",  "courier",
diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch b/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch
deleted file mode 100644
index 711850aba8ea..000000000000
--- a/x11-libs/qt-gui/files/qt-gui-4.7.0-qtreeview-regression-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
-index b797776..40b51fe 100644
---- a/src/gui/itemviews/qtreeview.cpp
-+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
-     if (!viewportSize.isValid())
-         viewportSize = QSize(0, 0);
- 
-+    if (viewItems.isEmpty()) {
-+        q->doItemsLayout();
-+    }
-+
-     int itemsInViewport = 0;
-     if (uniformRowHeights) {
-         if (defaultItemHeight <= 0)
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 e0ebad43ffbc..d223bb829cd4 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.4 2011/11/12 12:16:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3-r2.ebuild,v 1.5 2011/11/20 20:23:41 pesa Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -11,10 +11,10 @@ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~
 IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3support xinerama"
 
 RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
+	media-libs/freetype:2
 	media-libs/libpng:0
 	sys-libs/zlib
+	virtual/jpeg
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
 	!aqua? (
@@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig
 	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	!aqua? (
 		x11-proto/xextproto
 		x11-proto/inputproto
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 66ed9ddda174..6cf8a3f0bde0 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-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.12 2011/11/12 12:16:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.3.ebuild,v 1.13 2011/11/20 20:23:41 pesa Exp $
 
 EAPI="2"
 inherit confutils eutils qt4-build
@@ -11,10 +11,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-fre
 IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff trace qt3support xinerama"
 
 RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2
-	virtual/jpeg
+	media-libs/freetype:2
 	media-libs/libpng:0
 	sys-libs/zlib
+	virtual/jpeg
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
 	!aqua? (
@@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig
 	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	!aqua? (
 		x11-proto/xextproto
 		x11-proto/inputproto
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 1d7e0aff4b22..2638138564f3 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.10 2011/11/12 12:16:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.2.ebuild,v 1.11 2011/11/20 20:23:41 pesa Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -12,9 +12,9 @@ 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:0
 	sys-libs/zlib
+	virtual/jpeg
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
 	!aqua? (
@@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig
 	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	!aqua? (
 		x11-proto/xextproto
 		x11-proto/inputproto
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 7fecb6e774db..e67e6fbf44bb 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.2 2011/11/12 12:16:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.3 2011/11/20 20:23:41 pesa Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -12,9 +12,9 @@ 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:0
 	sys-libs/zlib
+	virtual/jpeg
 	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,debug=]
 	!aqua? (
@@ -34,7 +34,6 @@ RDEPEND="media-libs/fontconfig
 	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	!aqua? (
 		x11-proto/xextproto
 		x11-proto/inputproto