Drop redundant dep on dev-util/pkgconfig; remove unused files.
authorDavide Pesavento <pesa@gentoo.org>
Sun, 20 Nov 2011 19:03:45 +0000 (19:03 +0000)
committerDavide Pesavento <pesa@gentoo.org>
Sun, 20 Nov 2011 19:03:45 +0000 (19:03 +0000)
Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64

x11-libs/qt-core/ChangeLog
x11-libs/qt-core/Manifest
x11-libs/qt-core/files/moc.pro [deleted file]
x11-libs/qt-core/files/rcc.pro [deleted file]
x11-libs/qt-core/files/uic.pro [deleted file]
x11-libs/qt-core/qt-core-4.6.3-r1.ebuild
x11-libs/qt-core/qt-core-4.7.2-r2.ebuild
x11-libs/qt-core/qt-core-4.7.4.ebuild

index 562d738288513499dddd257b42854641de43c22a..44c2dc7a20002a9cff110423e178378ad6abeb28 100644 (file)
@@ -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
index 0cd59a6e84e80b21111aae8a849725206c9a85b0..b18181037b8d4b5ddb7eeab92906ad962c83d55b 100644 (file)
@@ -1,36 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX blacklist-diginotar-certs.diff 6153 RMD160 57b654d558a5fd2cb9626cc59a63e9f802db799a SHA1 3734404231b4406f8578dc7236e2f350fa553d79 SHA256 461a6c1b0618119251ab03ee668aaa93f6a8b8ba1298d8eb928f87df70c76d75
 AUX blacklist_ssl.patch 3839 RMD160 769b5652df6d626ef4436afcdae8fc6f927c4c47 SHA1 1301a6f353ab1eda382ab9dd3fdc7134a30a1884 SHA256 33800ce89fe0d62ba08a8fad515df048f78f481ebc8726b1244f27895a84193b
-AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e
 AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SHA1 ee916596e422e91179458778b013fb103dc97cac SHA256 c6c686c1cfc07caefafe697eb8b02b6806f3845f20d3fd3839301d8a94259b0b
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
 AUX qt-4.6-nox11r6.patch 5191 RMD160 60bac3e843addd91427ada9e4e4d7a94dc8f0430 SHA1 7534d6838426b86101ac8fc5ced829c5d5035a04 SHA256 b6db19c5b1de5e86628d37ca467f293b3ab3cf48272df93dae7ad5755ffa79cd
 AUX qt-4.6.2-alpha.patch 2913 RMD160 52ca59388d88c8e0ea2a40fd8d9d6721d324664e SHA1 bb08627e018184d4023c9fabc03adba79a67bcf0 SHA256 042c29d938339dacfb66278f62ce38c8bc597dbc2017e6d5df9397a79ac27dd3
-AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
-AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.3.tar.gz 213659173 RMD160 ab9c11c85898430fa74e5e07894f8da5e5936645 SHA1 765eb70d9779f93fefddddda5e6ddb33f4c0b71e SHA256 d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 219424772 RMD160 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 SHA1 ac7b4df34adaa6e9d1fb41743d1f15f5aac481db SHA256 321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf
 EBUILD qt-core-4.6.2-r1.ebuild 5126 RMD160 e24950ab4204a2154999fbd9269706916001eb1f SHA1 e44ed5161832f5153a27ceed172121d9f08f5051 SHA256 054494be39baccd218f4e1554cfef98f9164abe1620d6d9aedc83575fc0dc4d7
-EBUILD qt-core-4.6.3-r1.ebuild 5152 RMD160 194ba5fb6c7e4dab5df9178eefa154e793ef9062 SHA1 6ff2ffca0d1a75851e1a43b1c70a740e941bd6d0 SHA256 5c0f165ff65927bb9c3fa5d96d1967b1df593d02b8a8b9549bb7cb7d9f8a19c9
+EBUILD qt-core-4.6.3-r1.ebuild 5128 RMD160 c4415638e41f79147a94c36f6e089654c5040874 SHA1 1169313a308c4b01a0b8a74742550704d6b5bb2e SHA256 e403781b7f9188ffaa8a58c5e82d2fb1c802e50a8d9fd4efea8e26f141ef1f97
 EBUILD qt-core-4.6.3.ebuild 5100 RMD160 3f9e08774345467f07cd41b6a63d7d0f45d9fc21 SHA1 578d1e2cc808c33b354c58a40fef6fbb34a880cf SHA256 a4934b896faf01a41fc37f6756fadabd865e550eb1c58aef3261027ccd7891d7
 EBUILD qt-core-4.7.2-r1.ebuild 5120 RMD160 7ca4d3dfbcf4613ad3e61e5deb7d8acc73b64b79 SHA1 c004f5e7270e5acbaad16c6fe2a1e839605f68ed SHA256 11a5cf49834e0238460e11d096d342bc4647a9ae3430ccf6dbee9a20f7f20dd4
-EBUILD qt-core-4.7.2-r2.ebuild 5180 RMD160 9423e1b0d153833e17ccd02efe6292498fc83157 SHA1 5e392e04124cedde55e32d23ea62187bb63ee4f3 SHA256 4891ebb228e4ef51c8b3a68893b488f5e6f9f8151213a458023bd9ef914434a9
+EBUILD qt-core-4.7.2-r2.ebuild 5153 RMD160 931395bd70ce9f80d79754377034856ee56aaff3 SHA1 338a4265d9955067e3b923bcf1ebbbc44d589bb5 SHA256 c8f26fea402bcdfe0e6cd9d2a0267599e5d483024ee8d357d2bfd15826096f66
 EBUILD qt-core-4.7.3-r1.ebuild 5145 RMD160 15fc91e044bce6256c058d718956946e2bac44ed SHA1 eb6ae2c5f61b5270b7023ccc4f187ab47539dce5 SHA256 9f78ef2e73ab2053776cf4c04b7035e1ef15866883d86498d50d543beba95600
 EBUILD qt-core-4.7.3.ebuild 5073 RMD160 967a5ce2abb2e75fed6212c91c3fea7dce92e13d SHA1 d8ddcb0130db836494cc4ebf1cc992f5770536de SHA256 f8585c33daa1b8b2dd7471213321c89987997bb86bf3d8143640d8d4f4f6f194
-EBUILD qt-core-4.7.4.ebuild 5143 RMD160 0f1715da539a628a8678af01f04d0778f769fea5 SHA1 8faa148d586d38b34ca5af882487127c43a8bfe2 SHA256 12868decc2c84ffcfa62a9fdfe524904ea8f6dbc72e26d41efbadd071fab8ac3
-MISC ChangeLog 19168 RMD160 d08bac6e10cc050f7cd97b7d4719ce60d43ede0b SHA1 b27e48a75c93103a2e3d24ea027266286542fa54 SHA256 8966f575439d4617e1bdcc1e7702094d06e55a10598d94ec673719a0ec74513f
+EBUILD qt-core-4.7.4.ebuild 5128 RMD160 686815a3b214bc4d43b800e7917c477d9e723660 SHA1 035b1c2cbc932987ae15436c10605c92354587a7 SHA256 e26313d6d129ab24f98f971854bae93cd9e88fcf713aa960327e7d9de6871574
+MISC ChangeLog 19402 RMD160 879aebcf1616a74e8756fb5698b446335e1dda47 SHA1 98a172b9c1ea795dce11de24ba2845a70abf2e74 SHA256 55a424e4508924a04b117510530639b0f2848f529bbeb61914563aa0e39803a4
 MISC metadata.xml 802 RMD160 0341afae262322299759a5a33bae9a42e5b7801c SHA1 b564551c1b4a7902e09200255c6c0a6ede646a23 SHA256 a84f88402ece782e8ac52ad0b90eea94e5bd563ca0a7956e1d89f1263d7f2925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6CD60ACgkQIiMqcbOVdxTE6AP/YUrHhqHYoDRnHal8UfgvJj+L
-R7Gdz9/5OLquvHdjLb9Xco9pd/0AADVYO+/xu50/T1GHnaFmnV9IiscdaSjm69eg
-Qd8qmnrf3yDtqKxHak4iJOwIDEdrKruX7xIqNGfr3JrS+TrGBrerjD9yKr6BTN7J
-AFNnrX8TU6/hoS39hVI=
-=sKwY
+iQIcBAEBCgAGBQJOyU8WAAoJENXLsxwXqFxyoxkP/2+iYvPaSqQV1Bc4X/f+yul3
+0C2MakQlVomen6KDt4juq9uc60YtsTCeiJ8lX7t9mDz9MSrt5PQu/Kh1whg9wYag
+9i3i+vSTjn1g1yJdokauiJDGniQdkdMwvgX2naw81s0lVZXzIb8x324cv9lRLNIS
+WKF8WtLR3cvjn90AW1Z0cWTyPCt4FNT+5THIHRixngGuDqJyhZttZu0cjVK631hH
+oT1BddsA/SRx3Bejk5v1N4LZGDxIu7dmfh1LGeROt1jtWGkj4Sumg402r7PXLxkP
+n/6e5GoCZLaGyyzSBBa0NSLynJHHY3mEjEQTJY6NBxmhSep5VHhn1tazcwGMm8SW
+X+Ej7h2OvH6IF/rhPuNQ2pi3hsFVuFceVRO+WwgIl71nwvYVkT72mFh7qZ8ss6aE
+HCv5TGLkSEznwsSICG+7M8NEqkJ7W2GJA7lQbnwdmCQLCta6b+DYIV0orVIPJGja
+2QYWkShpJkkzked/KU9INouw4jFU6rpYj9Rb6/1HJJR/cnZTN1sFvwBiLeD61xWL
+kJzPbq+1QQX2HhN87rURxFWjCdXIm78qvxHCUzvrvprRAxREhd5lgysuz1r22aiG
+Fdc9BlNR8aZnnSbH9AMi555A1LBXBDs/vzG9Bo7pWi8CFPstmk/DD+MGSJcO+wyz
+jf02gG1nh8feA0W6PWAM
+=3hNR
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/files/moc.pro b/x11-libs/qt-core/files/moc.pro
deleted file mode 100644 (file)
index daa576b..0000000
+++ /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 (file)
index d5fd7a8..0000000
+++ /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 (file)
index 73fb55b..0000000
+++ /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)
index 1f02af62f7244aeca65a4d51f0e3bd3759011fa6..db8550404cd730cadd965faf1708efe168e066e1 100644 (file)
@@ -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=(
index 3eb21886a8f1c39c69f96063ecfc0aea43ec929c..2396f6139a2409ba23cfc6f0a81aa4d4edd28572 100644 (file)
@@ -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=(
index 8af7911357f44766afbb87b1fac1ed17cd4d8d66..6d7b932987f3ea5a44d21a6e9be818ea025748ef 100644 (file)
@@ -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,\