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

Package-Manager: portage-2.1.6.7/cvs/Linux i686

6 files changed, 315 insertions, 4 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/Manifest b/x11-libs/qt-core/Manifest
index 0684be55ecc6..22ecabf6f2ae 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,8 +1,11 @@
+AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e
+AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
+AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f55863543fcd4dd3a8105864ec1 SHA1 1dffebc52543ee8dd486ec69fc51d02e216323bd SHA256 94aa6268662a24cec1a20e2fb88fcac418101719c0e1ab2729289fd8b7d475d7
 EBUILD qt-core-4.4.2-r1.ebuild 5160 RMD160 732d16ac205d8003a041028c934d9870b7a892af SHA1 a944163c2c8d3ca75f0b1bc8a05fc4c313033259 SHA256 84d79be7f9f1d59d0e0d6f43516b17ece448d735a43885d2305eb067cae319da
 EBUILD qt-core-4.4.2.ebuild 5150 RMD160 55fa026006131a6e17e8699493b13769a158e07c SHA1 efdb00bf365b5e266a0fcce95c5b8fae70bf3599 SHA256 8edebef63a3b3ce2952f124f7f9b3007d5178e4f3adb1bc4b8d56617d941bb1b
-EBUILD qt-core-4.5.0_rc1.ebuild 5601 RMD160 8ad391bcd997a90d2eba43c7ba0cc3cc8a53c38a SHA1 1cdd6c9fd40719be50621f3fca4ca2c799e65ba3 SHA256 e20b489bf25f95ac08975a226ffabd94e5cb910c717ba4f3021f2def46b7e852
-MISC ChangeLog 3570 RMD160 d19be029911ac22f5a2cc8b8d4e471d274ef184f SHA1 8347eecf3c35c1e3271d9da47615eaa1f6bc56bd SHA256 4b632331b523c9fb6abc160d08b9eb5bbc67c75cb2a12dc590243327b73be903
+EBUILD qt-core-4.5.0_rc1.ebuild 5623 RMD160 4b10f06118711bc530b70b478f8f773104185160 SHA1 aa9a5268ed44501f933e45f9657ffd666f864cb9 SHA256 95aaabf4472b6bba45b4bc3d7d98d02d40c73cf60453d71a53b719f6d26665fc
+MISC ChangeLog 3770 RMD160 5dc5c86ea37907b6b582bda48461e555598c0343 SHA1 8180ed5453ce03d41f2420cf28ed8fa5424d8e3d SHA256 c04d73f0ad249a0ace1731b627a3de39a867d13a159050e4df23b950a6ca8dc9
 MISC metadata.xml 405 RMD160 7ad4cec9a392e8164062dae2935e2c59ba52b503 SHA1 104a2a88f1cf174e9e4827b639a73d79bd0fba2d SHA256 cce5d387ade0a1412bf70c58c7b0ab28fd488cc60e458ac66296ee632d893bf8
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/