Add missing files,add extra target,closing (see bug #258667)

(Portage version: 2.1.6.7/cvs/Linux i686)

5 files changed, 310 insertions, 2 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 4ef3007dbd8a..72cedaedcee7 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.25 2009/02/11 23:15:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.26 2009/02/12 01:45:05 hwoarang Exp $
+
+  12 Feb 2009; Markos Chandras <hwoarang@gentoo.org> +files/moc.pro,
+  +files/rcc.pro, +files/uic.pro, qt-core-4.5.0_rc1.ebuild:
+  Add missing files, add bootstrap build target ( see bug #258667 )
 
   11 Feb 2009; Ben de Groot <yngwin@gentoo.org> ChangeLog:
   Version bump
diff --git a/x11-libs/qt-core/files/moc.pro b/x11-libs/qt-core/files/moc.pro
new file mode 100644
index 000000000000..daa576b6e4ff
--- /dev/null
+++ b/x11-libs/qt-core/files/moc.pro
@@ -0,0 +1,87 @@
+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
new file mode 100644
index 000000000000..d5fd7a8f4f52
--- /dev/null
+++ b/x11-libs/qt-core/files/rcc.pro
@@ -0,0 +1,102 @@
+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
new file mode 100644
index 000000000000..73fb55bbf9cf
--- /dev/null
+++ b/x11-libs/qt-core/files/uic.pro
@@ -0,0 +1,114 @@
+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.5.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
index 980086227f4c..92318735ae32 100644
--- a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5.0_rc1.ebuild,v 1.1 2009/02/11 23:15:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.2 2009/02/12 01:45:05 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )"
 
 QT4_TARGET_DIRECTORIES="
+src/tools/bootstrap
 src/tools/moc/
 src/tools/rcc/
 src/tools/uic/