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

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

7 files changed, 21 insertions, 321 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 562d73828851..44c2dc7a2000 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.143 2011/09/27 18:02:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.144 2011/11/20 19:03:44 pesa Exp $
+
+  20 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt-core-4.6.3-r1.ebuild,
+  qt-core-4.7.2-r2.ebuild, qt-core-4.7.4.ebuild, -files/moc.pro,
+  -files/rcc.pro, -files/uic.pro:
+  Drop redundant dep on dev-util/pkgconfig; remove unused files.
 
   27 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org> qt-core-4.7.2-r2.ebuild:
   ppc/ppc64 stable wrt #382171
diff --git a/x11-libs/qt-core/files/moc.pro b/x11-libs/qt-core/files/moc.pro
deleted file mode 100644
index daa576b6e4ff..000000000000
--- a/x11-libs/qt-core/files/moc.pro
+++ /dev/null
@@ -1,87 +0,0 @@
-TEMPLATE	= app
-TARGET		= moc
-
-CONFIG 	       += console qtinc
-CONFIG         -= qt
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-mac:CONFIG     -= app_bundle incremental
-DEFINES	       += QT_BOOTSTRAPPED QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_LIBRARY \
-		  QT_NO_STL QT_NO_COMPRESS QT_NO_DATASTREAM QT_NO_TEXTSTREAM \
-		  QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_THREAD \
-		  QT_NO_REGEXP QT_NO_QOBJECT QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
-DEFINES   += QT_NO_USING_NAMESPACE
-win32:DEFINES  += QT_NODLL
-DESTDIR         = ../../../bin
-
-
-INCLUDEPATH	 = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
-                   $$QT_BUILD_TREE/include/QtCore
-DEPENDPATH	+= $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io
-LIBS	        =
-OBJECTS_DIR	= .
-
-
-include(moc.pri)
-
-HEADERS += qdatetime_p.h
-SOURCES += main.cpp
-
-# Qt tools needed to link moc
-SOURCES	+= ../../corelib/global/qglobal.cpp \
-           ../../corelib/global/qmalloc.cpp \
-           ../../corelib/global/qnumeric.cpp \
-	   ../../corelib/io/qbuffer.cpp \
-	   ../../corelib/io/qdir.cpp		\
-	   ../../corelib/io/qdiriterator.cpp		\
-	   ../../corelib/io/qfile.cpp		\
-	   ../../corelib/io/qfileinfo.cpp	\
-	   ../../corelib/io/qfsfileengine.cpp	\
-	   ../../corelib/io/qfsfileengine_iterator.cpp	\
-	   ../../corelib/io/qiodevice.cpp	\
-	   ../../corelib/io/qtemporaryfile.cpp \
-	   ../../corelib/io/qtextstream.cpp \
-	   ../../corelib/io/qurl.cpp          \
-           ../../corelib/kernel/qmetatype.cpp    \
-	   ../../corelib/tools/qbytearraymatcher.cpp \
-	   ../../corelib/tools/qdatetime.cpp	\
-	   ../../corelib/tools/qhash.cpp		\
-	   ../../corelib/tools/qlistdata.cpp		\
-	   ../../corelib/tools/qlocale.cpp \
-	   ../../corelib/tools/qmap.cpp		\
-	   ../../corelib/tools/qstring.cpp		\
-	   ../../corelib/tools/qstringlist.cpp	\
-	   ../../corelib/tools/qvector.cpp          \
-	   ../../corelib/kernel/qvariant.cpp          \
-           ../../corelib/io/qabstractfileengine.cpp  \
-           ../../corelib/tools/qbytearray.cpp	\
-           ../../corelib/tools/qvsnprintf.cpp 
-
-unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
-
-win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
-
-macx: {
-   SOURCES += ../../corelib/kernel/qcore_mac.cpp
-   LIBS += -framework CoreServices
-}
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS += target
-
-*-mwerks {
-   TEMPLATE = lib
-   TARGET = McMoc
-   CONFIG -= static
-   CONFIG += shared plugin
-   DEFINES += MOC_MWERKS_PLUGIN
-   MWERKSDIR = $QT_SOURCE_TREE/util/mwerks_plugin
-   INCLUDEPATH += $$MWERKSDIR/Headers
-   LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
-   SOURCES += mwerks_mac.cpp
-}
-
-include(../../qt_targets.pri)
-
diff --git a/x11-libs/qt-core/files/rcc.pro b/x11-libs/qt-core/files/rcc.pro
deleted file mode 100644
index d5fd7a8f4f52..000000000000
--- a/x11-libs/qt-core/files/rcc.pro
+++ /dev/null
@@ -1,102 +0,0 @@
-TARGET = rcc
-CONFIG += console
-mac:CONFIG -= app_bundle
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-DEFINES	       += QT_BOOTSTRAPPED \
-	          QT_RCC QT_LITE_UNICODE QT_NO_DATASTREAM QT_NO_THREAD QT_NO_QOBJECT \
-                  QT_NO_UNICODETABLES QT_NO_LIBRARY QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-
-
-win32:DEFINES += QT_NODLL
-win32:LIBS += -luser32
-
-
-CONFIG -= qt
-INCLUDEPATH	 = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
-                   $$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml ../../xml
-DEPENDPATH	+= $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml
-
-include(rcc.pri)
-HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
-SOURCES += main.cpp
-
-# Qt tools needed to link rcc
-SOURCES	+= ../../corelib/global/qglobal.cpp \
-           ../../corelib/global/qmalloc.cpp \
-           ../../corelib/global/qnumeric.cpp \
-	   ../../corelib/io/qbuffer.cpp \
-	   ../../corelib/io/qdir.cpp		\
-	   ../../corelib/io/qdiriterator.cpp		\
-	   ../../corelib/io/qfile.cpp		\
-	   ../../corelib/io/qfileinfo.cpp	\
-	   ../../corelib/io/qfsfileengine.cpp	\
-	   ../../corelib/io/qfsfileengine_iterator.cpp	\
-	   ../../corelib/io/qiodevice.cpp	\
-	   ../../corelib/io/qtemporaryfile.cpp \
-	   ../../corelib/io/qtextstream.cpp \
-	   ../../corelib/tools/qbytearraymatcher.cpp \
-	   ../../corelib/tools/qdatetime.cpp	\
-	   ../../corelib/tools/qhash.cpp		\
-	   ../../corelib/tools/qlistdata.cpp		\
-	   ../../corelib/tools/qlocale.cpp \
-	   ../../corelib/tools/qmap.cpp		\
-	   ../../corelib/tools/qstring.cpp		\
-	   ../../corelib/tools/qstringlist.cpp	\
-	   ../../corelib/kernel/qvariant.cpp          \
-	   ../../corelib/kernel/qmetatype.cpp          \
-	   ../../corelib/io/qurl.cpp          \
-	   ../../corelib/tools/qvector.cpp          \
-           ../../corelib/io/qabstractfileengine.cpp  \
-           ../../corelib/tools/qbytearray.cpp	\
-           ../../corelib/tools/qbitarray.cpp	\
-           ../../corelib/tools/qvsnprintf.cpp \
-           ../../corelib/tools/qregexp.cpp \
-           ../../corelib/codecs/qtextcodec.cpp \
-           ../../corelib/codecs/qutfcodec.cpp \
-           ../../corelib/codecs/qisciicodec.cpp \
-           ../../corelib/codecs/qtsciicodec.cpp \
-           ../../corelib/codecs/qlatincodec.cpp \
-           ../../corelib/codecs/qsimplecodec.cpp \
-           ../../corelib/xml/qxmlutils.cpp \
-           ../../xml/dom/qdom.cpp \
-	   ../../xml/sax/qxml.cpp 
-
-unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
-
-win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
-
-macx: {
-   SOURCES += ../../corelib/kernel/qcore_mac.cpp
-   LIBS += -framework CoreServices
-}
-
-contains(QT_CONFIG, zlib) {
-   INCLUDEPATH += ../../3rdparty/zlib
-   SOURCES+= \
-	../3rdparty/zlib/adler32.c \
-	../3rdparty/zlib/compress.c \
-	../3rdparty/zlib/crc32.c \
-	../3rdparty/zlib/deflate.c \
-	../3rdparty/zlib/gzio.c \
-	../3rdparty/zlib/inffast.c \
-	../3rdparty/zlib/inflate.c \
-	../3rdparty/zlib/inftrees.c \
-	../3rdparty/zlib/trees.c \
-	../3rdparty/zlib/uncompr.c \
-	../3rdparty/zlib/zutil.c
-} else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
-#  win32:LIBS += libz.lib
-}
-
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS += target
-
-DESTDIR = ../../../bin
-include(../../qt_targets.pri)
diff --git a/x11-libs/qt-core/files/uic.pro b/x11-libs/qt-core/files/uic.pro
deleted file mode 100644
index 73fb55bbf9cf..000000000000
--- a/x11-libs/qt-core/files/uic.pro
+++ /dev/null
@@ -1,114 +0,0 @@
-TEMPLATE = app
-QT = xml core
-CONFIG += warn_on console no_batch
-CONFIG -= app_bundle
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
-unix:!contains(QT_CONFIG, zlib):LIBS        += -lz
-
-TARGET = uic
-DESTDIR = ../../../bin
-
-DEFINES	       += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
-	          QT_NO_THREAD QT_NO_QOBJECT QT_NO_UNICODETABLES QT_NO_LIBRARY \
-	          QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT
-DEFINES += QT_NO_USING_NAMESPACE
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-
-win32:DEFINES += QT_NODLL
-win32:LIBS += -luser32
-
-!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT
-
-CONFIG -= qt
-INCLUDEPATH	 = ../../corelib/arch/generic $$QT_BUILD_TREE/include . \
-                   $$QT_BUILD_TREE/include/QtCore $$QT_BUILD_TREE/include/QtXml ../../xml
-DEPENDPATH	+= $$INCLUDEPATH ../../corelib/base ../../corelib/tools ../../corelib/io ../../corelib/codecs ../../xml
-
-include(uic.pri)
-include(cpp/cpp.pri)
-
-HEADERS += uic.h
-
-SOURCES += main.cpp \
-	   uic.cpp
-
-
-# Qt tools needed to link rcc
-SOURCES	+= ../../corelib/global/qglobal.cpp \
-           ../../corelib/global/qmalloc.cpp \
-           ../../corelib/global/qnumeric.cpp \
-	   ../../corelib/io/qbuffer.cpp \
-	   ../../corelib/io/qdir.cpp		\
-	   ../../corelib/io/qdiriterator.cpp		\
-	   ../../corelib/io/qfile.cpp		\
-	   ../../corelib/io/qfileinfo.cpp	\
-	   ../../corelib/io/qfsfileengine.cpp	\
-	   ../../corelib/io/qfsfileengine_iterator.cpp	\
-	   ../../corelib/io/qiodevice.cpp	\
-	   ../../corelib/io/qtemporaryfile.cpp \
-	   ../../corelib/io/qtextstream.cpp \
-	   ../../corelib/io/qurl.cpp \
-	   ../../corelib/tools/qbytearraymatcher.cpp \
-	   ../../corelib/tools/qdatetime.cpp	\
-	   ../../corelib/tools/qhash.cpp		\
-	   ../../corelib/tools/qlistdata.cpp		\
-	   ../../corelib/tools/qlocale.cpp \
-	   ../../corelib/tools/qmap.cpp		\
-	   ../../corelib/tools/qstring.cpp		\
-	   ../../corelib/tools/qstringlist.cpp	\
-	   ../../corelib/tools/qvector.cpp          \
-           ../../corelib/io/qabstractfileengine.cpp  \
-           ../../corelib/tools/qbytearray.cpp	\
-           ../../corelib/tools/qbitarray.cpp	\
-           ../../corelib/tools/qvsnprintf.cpp \
-           ../../corelib/tools/qregexp.cpp \
-           ../../corelib/kernel/qmetatype.cpp \
-           ../../corelib/kernel/qvariant.cpp \
-           ../../corelib/codecs/qtextcodec.cpp \
-           ../../corelib/codecs/qutfcodec.cpp \
-           ../../corelib/codecs/qisciicodec.cpp \
-           ../../corelib/codecs/qtsciicodec.cpp \
-           ../../corelib/codecs/qlatincodec.cpp \
-           ../../corelib/codecs/qsimplecodec.cpp \
-           ../../corelib/xml/qxmlutils.cpp \
-	   ../../corelib/xml/qxmlstream.cpp \
-           ../../xml/dom/qdom.cpp \
-	   ../../xml/sax/qxml.cpp
-
-unix:SOURCES += ../../corelib/io/qfsfileengine_unix.cpp ../../corelib/io/qfsfileengine_iterator_unix.cpp
-
-win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp ../../corelib/io/qfsfileengine_iterator_win.cpp
-
-macx: {
-   SOURCES += ../../corelib/kernel/qcore_mac.cpp
-   LIBS += -framework CoreServices
-}
-
-contains(QT_CONFIG, zlib) {
-   INCLUDEPATH += ../../3rdparty/zlib
-   SOURCES+= \
-	../3rdparty/zlib/adler32.c \
-	../3rdparty/zlib/compress.c \
-	../3rdparty/zlib/crc32.c \
-	../3rdparty/zlib/deflate.c \
-	../3rdparty/zlib/gzio.c \
-	../3rdparty/zlib/inffast.c \
-	../3rdparty/zlib/inflate.c \
-	../3rdparty/zlib/inftrees.c \
-	../3rdparty/zlib/trees.c \
-	../3rdparty/zlib/uncompr.c \
-	../3rdparty/zlib/zutil.c
-} else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
-#  win32:LIBS += libz.lib
-}
-
-target.path=$$[QT_INSTALL_BINS]
-INSTALLS += target
-
-DESTDIR = ../../../bin
-include(../../qt_targets.pri)
diff --git a/x11-libs/qt-core/qt-core-4.6.3-r1.ebuild b/x11-libs/qt-core/qt-core-4.6.3-r1.ebuild
index 1f02af62f724..db8550404cd7 100644
--- a/x11-libs/qt-core/qt-core-4.6.3-r1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.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-core/qt-core-4.6.3-r1.ebuild,v 1.9 2011/08/17 16:54:36 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.3-r1.ebuild,v 1.10 2011/11/20 19:03:44 pesa Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -10,12 +10,11 @@ SLOT="4"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +glib iconv optimized-qmake qt3support ssl"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	glib? ( dev-libs/glib )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/qt-4.4.0:4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+RDEPEND="${DEPEND}"
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 PATCHES=(
diff --git a/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild b/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild
index 3eb21886a8f1..2396f6139a24 100644
--- a/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild
+++ b/x11-libs/qt-core/qt-core-4.7.2-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-core/qt-core-4.7.2-r2.ebuild,v 1.5 2011/09/27 18:02:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.2-r2.ebuild,v 1.6 2011/11/20 19:03:44 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -10,12 +10,11 @@ SLOT="4"
 KEYWORDS="amd64 arm ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	glib? ( dev-libs/glib )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/qt-4.4.0:4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+RDEPEND="${DEPEND}"
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
 
 PATCHES=(
diff --git a/x11-libs/qt-core/qt-core-4.7.4.ebuild b/x11-libs/qt-core/qt-core-4.7.4.ebuild
index 8af7911357f4..6d7b932987f3 100644
--- a/x11-libs/qt-core/qt-core-4.7.4.ebuild
+++ b/x11-libs/qt-core/qt-core-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-core/qt-core-4.7.4.ebuild,v 1.1 2011/09/08 09:18:55 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.4.ebuild,v 1.2 2011/11/20 19:03:44 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -10,12 +10,11 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl"
 
-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	glib? ( dev-libs/glib )
 	ssl? ( dev-libs/openssl )
 	!<x11-libs/qt-4.4.0:4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+RDEPEND="${DEPEND}"
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
 
 PATCHES=(
@@ -127,7 +126,7 @@ src_install() {
 	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
 	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
 		|| die "generating translations faied"
-	insinto ${QTTRANSDIR#${EPREFIX}}
+	insinto "${QTTRANSDIR#${EPREFIX}}"
 	doins translations/*.qm || die "doins translations failed"
 
 	setqtenv
@@ -136,7 +135,7 @@ src_install() {
 	# List all the multilib libdirs
 	local libdirs=
 	for libdir in $(get_all_libdirs); do
-		libdirs+=:${EPREFIX}/usr/${libdir}/qt4
+		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
 	done
 
 	cat <<-EOF > "${T}/44qt4"
@@ -144,8 +143,8 @@ src_install() {
 	EOF
 	doenvd "${T}/44qt4"
 
-	dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
-	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed"
+	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
 		|| die "Failed to move qconfig.pri"
 
 	# Framework hacking
@@ -169,7 +168,8 @@ src_install() {
 		install_qconfigs
 	fi
 	# remove .la files
-	find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
+	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
+
 	# remove some unnecessary headers
 	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
 qatomic_windows.h,\