Add a patch that fixes a a XSS error in the UTF8 decoder (from kde-packager)
authorCaleb Tennis <caleb@gentoo.org>
Fri, 30 Mar 2007 12:43:35 +0000 (12:43 +0000)
committerCaleb Tennis <caleb@gentoo.org>
Fri, 30 Mar 2007 12:43:35 +0000 (12:43 +0000)
Package-Manager: portage-2.1.2.2

x11-libs/qt/ChangeLog
x11-libs/qt/Manifest
x11-libs/qt/files/digest-qt-3.3.8-r2 [new file with mode: 0644]
x11-libs/qt/files/digest-qt-4.2.3-r1 [new file with mode: 0644]
x11-libs/qt/files/utf8-bug-qt3.diff [new file with mode: 0644]
x11-libs/qt/files/utf8-bug-qt4-2.diff [new file with mode: 0644]
x11-libs/qt/qt-3.3.8-r2.ebuild [new file with mode: 0644]
x11-libs/qt/qt-4.2.3-r1.ebuild [new file with mode: 0644]

index b8bbb38c2643327d24e18cb9c55c320e4c61d542..17b0c02f69dc04de7e7c491b3858e84def659229 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.420 2007/03/27 13:53:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.421 2007/03/30 12:43:35 caleb Exp $
+
+*qt-4.2.3-r1 (30 Mar 2007)
+*qt-3.3.8-r2 (30 Mar 2007)
+
+  30 Mar 2007; Caleb Tennis <caleb@gentoo.org> +files/utf8-bug-qt3.diff,
+  +files/utf8-bug-qt4-2.diff, +qt-3.3.8-r2.ebuild, +qt-4.2.3-r1.ebuild:
+  Add a patch that fixes a a XSS error in the UTF8 decoder (from kde-packager)
 
   27 Mar 2007; Raúl Porcel <armin76@gentoo.org> qt-4.2.2.ebuild:
   ia64 stable wrt bug 164699
index 9a2a6e299fee2d090c1d6403d6b70f1bf59c3011..c7e386dd7b22a15815db053c46cea553451c6247 100644 (file)
@@ -118,6 +118,14 @@ AUX qt4-sqlite-configure.patch 738 RMD160 0797534db076cf47da01f17fe51296300e7db1
 MD5 341ca0df76ba1dcb9fd0847566055a99 files/qt4-sqlite-configure.patch 738
 RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch 738
 SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738
+AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0
+MD5 f6b3b39040f2b8f19ba1cf1445468c28 files/utf8-bug-qt3.diff 2670
+RMD160 f5db1461cd82ac98417ab641228e15816d160724 files/utf8-bug-qt3.diff 2670
+SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0 files/utf8-bug-qt3.diff 2670
+AUX utf8-bug-qt4-2.diff 4762 RMD160 f2b4847666b5daa2fcb3c333dd6c2c95df4323cc SHA1 1ef434442985aa15feaee0eb837513a8b7575861 SHA256 a567b86d40b815a941d4650049a2133721f9e6e3edc629b500783f1de9854935
+MD5 31a00ddbfd63b701b4690897bb6d4a41 files/utf8-bug-qt4-2.diff 4762
+RMD160 f2b4847666b5daa2fcb3c333dd6c2c95df4323cc files/utf8-bug-qt4-2.diff 4762
+SHA256 a567b86d40b815a941d4650049a2133721f9e6e3edc629b500783f1de9854935 files/utf8-bug-qt4-2.diff 4762
 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
@@ -143,6 +151,10 @@ EBUILD qt-3.3.8-r1.ebuild 11294 RMD160 4200e34919e27ceced9c921fbc2dda171c16ce8e
 MD5 3cf5e0c8f85d253f7c9b45ebe3e18908 qt-3.3.8-r1.ebuild 11294
 RMD160 4200e34919e27ceced9c921fbc2dda171c16ce8e qt-3.3.8-r1.ebuild 11294
 SHA256 b73b02f8cc40584927417e77088fdafcd74fefe3290a5e4877542cc4f9f477bf qt-3.3.8-r1.ebuild 11294
+EBUILD qt-3.3.8-r2.ebuild 11325 RMD160 ad19eaf4225848c59debc23a066b2917415c57a6 SHA1 671200c73b97129eae3496a5b496192fa3642c31 SHA256 1a29ae2c35eb7f1b2eb2b54b53cb432eb8446e093a64e318b4dbf51bc4e3442d
+MD5 5a79dbd156f9ad01f094a948851a5382 qt-3.3.8-r2.ebuild 11325
+RMD160 ad19eaf4225848c59debc23a066b2917415c57a6 qt-3.3.8-r2.ebuild 11325
+SHA256 1a29ae2c35eb7f1b2eb2b54b53cb432eb8446e093a64e318b4dbf51bc4e3442d qt-3.3.8-r2.ebuild 11325
 EBUILD qt-3.3.8.ebuild 11118 RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 SHA1 bf9e754f45c40982e03e745151b48c5b1d49a879 SHA256 b2ee8433a55b84917f50146bb752d7198d94fd0bd242caf224466cf378128ea6
 MD5 eeca010d7b7224053404f56eba9a0ba6 qt-3.3.8.ebuild 11118
 RMD160 1e80a4582ce8411767493eeea30352e3ce8c3a72 qt-3.3.8.ebuild 11118
@@ -155,14 +167,18 @@ EBUILD qt-4.2.2.ebuild 7692 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 SHA1
 MD5 d9d58ed2097ab604884c022c2eb5f108 qt-4.2.2.ebuild 7692
 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 qt-4.2.2.ebuild 7692
 SHA256 1d7322eec33620e1f7fae1c8a2a9fabc98ef74e1b91b0135de84c802291611e3 qt-4.2.2.ebuild 7692
+EBUILD qt-4.2.3-r1.ebuild 7742 RMD160 f057fd512c3c420569bcaf0d4676d5bf13e7b37c SHA1 bffc237a740d6b8f6a3fa6421889e3ca27258d38 SHA256 d4a13fc4e53e4a51b11d43ca002b730be9a34d81f8f1098477ae6ef83f621d2b
+MD5 d5cb4b9bd00a9dc6dbf717baa4438974 qt-4.2.3-r1.ebuild 7742
+RMD160 f057fd512c3c420569bcaf0d4676d5bf13e7b37c qt-4.2.3-r1.ebuild 7742
+SHA256 d4a13fc4e53e4a51b11d43ca002b730be9a34d81f8f1098477ae6ef83f621d2b qt-4.2.3-r1.ebuild 7742
 EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1 44d1008fd8eabb0cc5e03bb301d88dade84a124f SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9
 MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699
 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699
 SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699
-MISC ChangeLog 25442 RMD160 e182aa56e03b6434d6e808f82c0796ec57795929 SHA1 1683f011ba2601337141b17a62c64012b734c19e SHA256 2f77ffc90ebdb0d2ac12a0117c8d34b3def9187b3ed451b96d61a3e858551a02
-MD5 de79d504796b180a753c9039b9287e3e ChangeLog 25442
-RMD160 e182aa56e03b6434d6e808f82c0796ec57795929 ChangeLog 25442
-SHA256 2f77ffc90ebdb0d2ac12a0117c8d34b3def9187b3ed451b96d61a3e858551a02 ChangeLog 25442
+MISC ChangeLog 25720 RMD160 ea717d2402bdc22d441892d249870170c66803b6 SHA1 25373bd2567945070a0d2d3097f753943a1ff169 SHA256 2fcd52ba2146d49916cb3cb4f23dae3eee6160a7b8a0a7deb5f61712892be27a
+MD5 0dca14862744187ae398474fa0f05262 ChangeLog 25720
+RMD160 ea717d2402bdc22d441892d249870170c66803b6 ChangeLog 25720
+SHA256 2fcd52ba2146d49916cb3cb4f23dae3eee6160a7b8a0a7deb5f61712892be27a ChangeLog 25720
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -182,6 +198,9 @@ SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/di
 MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8-r1 608
 RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8-r1 608
 SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8-r1 608
+MD5 e3af140e5246f4590438a272ec5f4fea files/digest-qt-3.3.8-r2 608
+RMD160 5c3ab7ee4a6ee1e30eec67f98def2173fa603ad9 files/digest-qt-3.3.8-r2 608
+SHA256 eae58d862519afc74261a63ab18ed1b5a72f0d6e33895cf10a6ee916b2ddb5d5 files/digest-qt-3.3.8-r2 608
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289
@@ -191,3 +210,6 @@ SHA256 a5ce9efde5affef98446892de54ae4e5d8304554a9873eff9796c685e3c94d3e files/di
 MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3 289
 RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3 289
 SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3 289
+MD5 2fe79b4d44373d71c88c550171f5cf12 files/digest-qt-4.2.3-r1 289
+RMD160 f3ed6c568633503b4dae6c029c14e063b4f678ee files/digest-qt-4.2.3-r1 289
+SHA256 963d86fa2780c337a6c499902231e24b14a6f849edb2870e9374cc89dfa8b147 files/digest-qt-4.2.3-r1 289
diff --git a/x11-libs/qt/files/digest-qt-3.3.8-r2 b/x11-libs/qt/files/digest-qt-3.3.8-r2
new file mode 100644 (file)
index 0000000..5cda06f
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124
+RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124
+SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124
+MD5 7f056a1fa246004cb3ec19fc11a88dc1 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
+RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
+SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
diff --git a/x11-libs/qt/files/digest-qt-4.2.3-r1 b/x11-libs/qt/files/digest-qt-4.2.3-r1
new file mode 100644 (file)
index 0000000..c9542fb
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 13f12bf58a32ebf15837fcd605cb3c99 qt-x11-opensource-src-4.2.3.tar.gz 37635710
+RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 qt-x11-opensource-src-4.2.3.tar.gz 37635710
+SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b qt-x11-opensource-src-4.2.3.tar.gz 37635710
diff --git a/x11-libs/qt/files/utf8-bug-qt3.diff b/x11-libs/qt/files/utf8-bug-qt3.diff
new file mode 100644 (file)
index 0000000..43e84a9
--- /dev/null
@@ -0,0 +1,101 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -154,6 +154,7 @@
+ class QUtf8Decoder : public QTextDecoder {
+     uint uc;
++    uint min_uc;
+     int need;
+     bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+       result.setLength( len ); // worst case
+       QChar *qch = (QChar *)result.unicode();
+       uchar ch;
++        int error = -1;
+       for (int i=0; i<len; i++) {
+-          ch = *chars++;
++          ch = chars[i];
+           if (need) {
+               if ( (ch&0xc0) == 0x80 ) {
+                   uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+                           *qch++ = QChar(high);
+                           *qch++ = QChar(low);
+                           headerDone = TRUE;
++                      } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                            *qch++ = QChar::replacement;
+                       } else {
+                           if (headerDone || QChar(uc) != QChar::byteOrderMark)
+                               *qch++ = uc;
+@@ -190,6 +194,7 @@
+                   }
+               } else {
+                   // error
++                    i = error;
+                   *qch++ = QChar::replacement;
+                   need = 0;
+               }
+@@ -200,12 +205,21 @@
+               } else if ((ch & 0xe0) == 0xc0) {
+                   uc = ch & 0x1f;
+                   need = 1;
++                    error = i;
++                  min_uc = 0x80;
+               } else if ((ch & 0xf0) == 0xe0) {
+                   uc = ch & 0x0f;
+                   need = 2;
++                    error = i;
++                  min_uc = 0x800;
+               } else if ((ch&0xf8) == 0xf0) {
+                   uc = ch & 0x07;
+                   need = 3;
++                    error = i;
++                    min_uc = 0x10000;
++                } else {
++                    // error
++                    *qch++ = QChar::replacement;
+               }
+           }
+       }
+--- src/tools/qstring.cpp
++++ src/tools/qstring.cpp
+@@ -5805,6 +5805,7 @@
+     result.setLength( len ); // worst case
+     QChar *qch = (QChar *)result.unicode();
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -5822,6 +5823,12 @@
+                       unsigned short low = uc%0x400 + 0xdc00;
+                       *qch++ = QChar(high);
+                       *qch++ = QChar(low);
++                  } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                      // overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = QChar(0xdbff);
++                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
+                   } else {
+                       *qch++ = uc;
+                   }
+@@ -5844,14 +5851,17 @@
+               uc = ch & 0x1f;
+               need = 1;
+               error = i;
++              min_uc = 0x80;
+           } else if ((ch & 0xf0) == 0xe0) {
+               uc = ch & 0x0f;
+               need = 2;
+               error = i;
++              min_uc = 0x800;
+           } else if ((ch&0xf8) == 0xf0) {
+               uc = ch & 0x07;
+               need = 3;
+               error = i;
++              min_uc = 0x10000;
+           } else {
+               // Error
+                 qch = addOne(qch, result);
diff --git a/x11-libs/qt/files/utf8-bug-qt4-2.diff b/x11-libs/qt/files/utf8-bug-qt4-2.diff
new file mode 100644 (file)
index 0000000..4b7ee9c
--- /dev/null
@@ -0,0 +1,132 @@
+--- src/corelib/tools/qstring.cpp
++++ src/corelib/tools/qstring.cpp
+@@ -3342,6 +3342,7 @@ QString QString::fromUtf8(const char *st
+     result.resize(size); // worst case
+     ushort *qch = result.d->data;
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -3359,6 +3360,12 @@ QString QString::fromUtf8(const char *st
+                         ushort low = uc%0x400 + 0xdc00;
+                         *qch++ = high;
+                         *qch++ = low;
++                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                      // overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = 0xdbff;
++                        *qch++ = 0xde00 + ((uchar)str[i]);
+                     } else {
+                         *qch++ = uc;
+                     }
+@@ -3381,14 +3388,17 @@ QString QString::fromUtf8(const char *st
+                 uc = ch & 0x1f;
+                 need = 1;
+                 error = i;
++                min_uc = 0x80;
+             } else if ((ch & 0xf0) == 0xe0) {
+                 uc = ch & 0x0f;
+                 need = 2;
+                 error = i;
++                min_uc = 0x800;
+             } else if ((ch&0xf8) == 0xf0) {
+                 uc = ch & 0x07;
+                 need = 3;
+                 error = i;
++                min_uc = 0x10000;
+             } else {
+                 // Error
+                 qch = addOne(qch, result);
+--- src/corelib/codecs/qutfcodec.cpp
++++ src/corelib/codecs/qutfcodec.cpp
+@@ -117,15 +117,19 @@ QString QUtf8Codec::convertToUnicode(con
+     bool headerdone = false;
+     QChar replacement = QChar::ReplacementCharacter;
+     int need = 0;
++    int error = -1;
+     uint uc = 0;
++    uint min_uc = 0;
+     if (state) {
+         if (state->flags & IgnoreHeader)
+             headerdone = true;
+         if (state->flags & ConvertInvalidToNull)
+             replacement = QChar::Null;
+         need = state->remainingChars;
+-        if (need)
++        if (need) {
+             uc = state->state_data[0];
++            min_uc = state->state_data[1];
++        }
+     }
+     if (!headerdone && len > 3
+         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
+@@ -142,7 +146,7 @@ QString QUtf8Codec::convertToUnicode(con
+     int invalid = 0;
+     for (int i=0; i<len; i++) {
+-        ch = *chars++;
++        ch = chars[i];
+         if (need) {
+             if ((ch&0xc0) == 0x80) {
+                 uc = (uc << 6) | (ch & 0x3f);
+@@ -153,14 +157,27 @@ QString QUtf8Codec::convertToUnicode(con
+                         uc -= 0x10000;
+                         unsigned short high = uc/0x400 + 0xd800;
+                         unsigned short low = uc%0x400 + 0xdc00;
++
++                        // resize if necessary
++                        long where = qch - result.unicode();
++                        if (where + 2 >= result.size()) {
++                            result.resize(where + 2);
++                            qch = result.data() + where;
++                        }
++
+                         *qch++ = QChar(high);
+                         *qch++ = QChar(low);
++                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                        // error
++                        *qch++ = QChar::ReplacementCharacter;
++                        ++invalid;
+                     } else {
+                         *qch++ = uc;
+                     }
+                 }
+             } else {
+                 // error
++                i = error;
+                 *qch++ = QChar::ReplacementCharacter;
+                 ++invalid;
+                 need = 0;
+@@ -171,12 +188,22 @@ QString QUtf8Codec::convertToUnicode(con
+             } else if ((ch & 0xe0) == 0xc0) {
+                 uc = ch & 0x1f;
+                 need = 1;
++                error = i;
++                min_uc = 0x80;
+             } else if ((ch & 0xf0) == 0xe0) {
+                 uc = ch & 0x0f;
+                 need = 2;
++                error = i;
++                min_uc = 0x800;
+             } else if ((ch&0xf8) == 0xf0) {
+                 uc = ch & 0x07;
+                 need = 3;
++                error = i;
++                min_uc = 0x10000;
++            } else {
++                // error
++                *qch++ = QChar::ReplacementCharacter;
++                ++invalid;
+             }
+         }
+     }
+@@ -187,6 +214,7 @@ QString QUtf8Codec::convertToUnicode(con
+         if (headerdone)
+             state->flags |= IgnoreHeader;
+         state->state_data[0] = need ? uc : 0;
++        state->state_data[1] = need ? min_uc : 0;
+     }
+     return result;
+ }
diff --git a/x11-libs/qt/qt-3.3.8-r2.ebuild b/x11-libs/qt/qt-3.3.8-r2.ebuild
new file mode 100644 (file)
index 0000000..ded9e4b
--- /dev/null
@@ -0,0 +1,388 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r2.ebuild,v 1.1 2007/03/30 12:43:35 caleb Exp $
+
+# *** Please remember to update qt3.eclass when revbumping this ***
+
+inherit eutils flag-o-matic toolchain-funcs
+
+SRCTYPE="free"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.8-20070321-gentoo"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
+       immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
+       immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
+
+DEPEND="|| ( ( x11-libs/libXcursor
+                       x11-libs/libXi
+                       x11-libs/libXrandr
+                       x11-libs/libSM
+                       x11-proto/inputproto
+                       x11-proto/xextproto
+                       xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+
+               )
+               <virtual/x11-7
+       )
+       virtual/xft
+       media-libs/libpng
+       media-libs/jpeg
+       >=media-libs/libmng-1.0.9
+       >=media-libs/freetype-2
+       sys-libs/zlib
+       nas? ( >=media-libs/nas-1.5 )
+       mysql? ( virtual/mysql )
+       firebird? ( dev-db/firebird )
+       opengl? ( virtual/opengl virtual/glu )
+       postgres? ( dev-db/libpq )
+       cups? ( net-print/cups )"
+PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+
+pkg_setup() {
+       if use immqt && use immqt-bc ; then
+               ewarn
+               ewarn "immqt and immqt-bc are exclusive. You cannot set both."
+               ewarn "Please specify either immqt or immqt-bc."
+               ewarn
+               die
+       elif use immqt ; then
+               ewarn
+               ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+               ewarn "you have to recompile everything depending on Qt after you install it."
+               ewarn "Be aware."
+               ewarn
+       fi
+
+       export QTDIR=${S}
+
+       CXX=$(tc-getCXX)
+       if [[ ${CXX/g++/} != ${CXX} ]]; then
+               PLATCXX="g++"
+       elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+               PLATCXX="icc"
+       else
+               die "Unknown compiler ${CXX}."
+       fi
+
+       case ${CHOST} in
+               *-freebsd*|*-dragonfly*)
+                       PLATNAME="freebsd" ;;
+               *-openbsd*)
+                       PLATNAME="openbsd" ;;
+               *-netbsd*)
+                       PLATNAME="netbsd" ;;
+               *-darwin*)
+                       PLATNAME="darwin" ;;
+               *-linux-*|*-linux)
+                       PLATNAME="linux" ;;
+               *)
+                       die "Unknown CHOST, no platform choosed."
+       esac
+
+       # probably this should be '*-64' for 64bit archs
+       # in a fully multilib environment (no compatibility symlinks)
+       export PLATFORM="${PLATNAME}-${PLATCXX}"
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       sed -i -e 's:read acceptance:acceptance=yes:' configure
+
+       # Do not link with -rpath. See bug #75181.
+       find ${S}/mkspecs -name qmake.conf | xargs \
+               sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
+
+       # Patch for uic includehint errors (aseigo patch)
+       epatch ${FILESDIR}/${P}-uic-fix.patch
+
+       # Patch for mysql unload crash (Bug #171883)
+       epatch ${FILESDIR}/${P}-mysql-unload-crash.diff
+
+       # KDE related patches
+       epatch ${FILESDIR}/0001-dnd_optimization.patch
+       epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+       epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
+       epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff
+       epatch ${FILESDIR}/0047-fix-kmenu-widget.diff
+       epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch
+
+       # ulibc patch (bug #100246)
+       epatch ${FILESDIR}/qt-ulibc.patch
+
+       # xinerama patch: http://ktown.kde.org/~seli/xinerama/
+       epatch "${FILESDIR}/${P}-seli-xinerama.patch"
+
+       epatch ${FILESDIR}/utf8-bug-qt3.diff
+
+       # Visibility patch, apply only on GCC 4.1 and later for safety
+       # [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
+               epatch "${FILESDIR}/${P}-visibility.patch"
+
+       if use immqt || use immqt-bc ; then
+               epatch ../${IMMQT_P}.diff
+               sh make-symlinks.sh || die "make symlinks failed"
+       fi
+
+       if use ppc-macos ; then
+               epatch "${FILESDIR}/${PN}-3.3.5-macos.patch"
+       fi
+
+       # known working flags wrt #77623
+       use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
+       # set c/xxflags and ldflags
+       strip-flags
+       append-flags -fno-strict-aliasing
+       sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+              -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+              -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+                  -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
+                  -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
+                  -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
+                  -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
+               ${S}/mkspecs/${PLATFORM}/qmake.conf || die
+
+       if [ $(get_libdir) != "lib" ] ; then
+               sed -i -e "s:/lib$:/$(get_libdir):" \
+                       ${S}/mkspecs/${PLATFORM}/qmake.conf || die
+       fi
+}
+
+src_compile() {
+       export SYSCONF=${D}${QTBASE}/etc/settings
+
+       # Let's just allow writing to these directories during Qt emerge
+       # as it makes Qt much happier.
+       addwrite "${QTBASE}/etc/settings"
+       addwrite "${HOME}/.qt"
+
+       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+       # unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
+       use nas         && myconf="${myconf} -system-nas-sound"
+       use nis         && myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
+       use gif         && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+       use mysql       && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+       use postgres    && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+       use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+       use sqlite      && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+       use cups        && myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
+       use opengl      && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
+       use debug       && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
+       use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
+
+       myconf="${myconf} -system-zlib"
+
+       use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+       use immqt-bc    && myconf="${myconf} -inputmethod"
+       use immqt       && myconf="${myconf} -inputmethod -inputmethod-ext"
+
+       if use ppc-macos ; then
+               myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
+               myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
+               myconf="${myconf} -L${S}/lib -I${S}/include"
+               sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
+       fi
+
+       export YACC='byacc -d'
+       tc-export CC CXX
+       export LINK="$(tc-getCXX)"
+
+       ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
+               -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+               -system-libpng -xft -platform ${PLATFORM} -xplatform \
+               ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
+               -fast -no-sql-odbc ${myconf} -dlopen-opengl || die
+
+       emake src-qmake src-moc sub-src || die
+
+       export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+       emake sub-tools || die
+
+       if use examples; then
+               emake sub-tutorial sub-examples || die
+       fi
+
+       # Make the msg2qm utility (not made by default)
+       cd ${S}/tools/msg2qm
+       ../../bin/qmake
+       emake
+
+       # Make the qembed utility (not made by default)
+       cd ${S}/tools/qembed
+       ../../bin/qmake
+       emake
+
+}
+
+src_install() {
+       # binaries
+       into ${QTBASE}
+       dobin bin/*
+       dobin tools/msg2qm/msg2qm
+       dobin tools/qembed/qembed
+
+       # libraries
+       if use ppc-macos; then
+               # dolib is broken on BSD because of missing readlink(1)
+               dodir ${QTBASE}/$(get_libdir)
+               cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
+
+               cd ${D}/${QTBASE}/$(get_libdir)
+               for lib in libqt-mt* ; do
+                       ln -s ${lib} ${lib/-mt/}
+               done
+       else
+               dolib.so lib/lib{editor,qassistantclient,designercore}.a
+               dolib.so lib/libqt-mt.la
+               dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
+               cd ${D}/${QTBASE}/$(get_libdir)
+
+               for x in libqui.so ; do
+                       ln -s $x.1.0.0 $x.1.0
+                       ln -s $x.1.0 $x.1
+                       ln -s $x.1 $x
+               done
+
+               # version symlinks - 3.3.5->3.3->3->.so
+               ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
+               ln -s libqt-mt.so.3.3 libqt-mt.so.3
+               ln -s libqt-mt.so.3 libqt-mt.so
+
+               # libqt -> libqt-mt symlinks
+               ln -s libqt-mt.so.${PV} libqt.so.${PV}
+               ln -s libqt-mt.so.3.3 libqt.so.3.3
+               ln -s libqt-mt.so.3 libqt.so.3
+               ln -s libqt-mt.so libqt.so
+       fi
+
+       # plugins
+       cd ${S}
+       local plugins=$(find plugins -name "lib*.so" -print)
+       for x in ${plugins}; do
+               exeinto ${QTBASE}/$(dirname ${x})
+               doexe ${x}
+       done
+
+       # Past this point just needs to be done once
+       is_final_abi || return 0
+
+       # includes
+       cd ${S}
+       dodir ${QTBASE}/include/private
+       cp include/* ${D}/${QTBASE}/include/
+       cp include/private/* ${D}/${QTBASE}/include/private/
+
+       # prl files
+       sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
+       insinto ${QTBASE}/$(get_libdir)
+       doins ${S}/lib/*.prl
+
+       # pkg-config file
+       insinto ${QTBASE}/$(get_libdir)/pkgconfig
+       doins ${S}/lib/*.pc
+
+       # List all the multilib libdirs
+       local libdirs
+       for libdir in $(get_all_libdirs); do
+               libdirs="${libdirs}:${QTBASE}/${libdir}"
+       done
+
+       # environment variables
+       if use ppc-macos; then
+               cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+DYLD_LIBRARY_PATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
+EOF
+       else
+               cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
+EOF
+       fi
+       cat <<EOF > ${T}/50qtdir3
+QTDIR=${QTBASE}
+EOF
+
+       cat <<EOF > ${T}/50-qt3-revdep
+SEARCH_DIRS="${QTBASE}"
+EOF
+
+       insinto /etc/revdep-rebuild
+       doins ${T}/50-qt3-revdep
+
+       insinto /etc/env.d
+       doins ${T}/45qt3 ${T}/50qtdir3
+
+       if [ "${SYMLINK_LIB}" = "yes" ]; then
+               dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+       fi
+
+       insinto ${QTBASE}/tools/designer
+       doins -r tools/designer/templates
+
+       insinto ${QTBASE}
+       doins -r translations
+
+       keepdir ${QTBASE}/etc/settings
+
+       if use doc; then
+               insinto ${QTBASE}
+               doins -r ${S}/doc
+       fi
+
+       if use examples; then
+               find ${S}/examples ${S}/tutorial -name Makefile | \
+                       xargs sed -i -e "s:${S}:${QTBASE}:g"
+
+               cp -r ${S}/examples ${D}${QTBASE}/
+               cp -r ${S}/tutorial ${D}${QTBASE}/
+       fi
+
+       # misc build reqs
+       insinto ${QTBASE}/mkspecs
+       doins -r ${S}/mkspecs/${PLATFORM}
+
+       sed -e "s:${S}:${QTBASE}:g" \
+               ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+       dodoc FAQ README README-QT.TXT changes*
+       if use immqt || use immqt-bc ; then
+               dodoc ${S}/README.immodule
+       fi
+}
+
+pkg_postinst() {
+       echo
+       elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
+       elog "or widgets for the Qt designer) are no longer recognized.  If this situation"
+       elog "occurs you should recompile the packages providing these plugins,"
+       elog "and you should also make sure that Qt and its plugins were compiled with the"
+       elog "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
+       elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
+       elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
+       echo
+}
diff --git a/x11-libs/qt/qt-4.2.3-r1.ebuild b/x11-libs/qt/qt-4.2.3-r1.ebuild
new file mode 100644 (file)
index 0000000..cc7b715
--- /dev/null
@@ -0,0 +1,244 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.1 2007/03/30 12:43:35 caleb Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+SRCTYPE="opensource-src"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE_INPUT_DEVICES="input_devices_wacom"
+
+IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 xinerama zlib ${IUSE_INPUT_DEVICES}"
+
+DEPEND="x11-libs/libXrandr
+       x11-libs/libXcursor
+       x11-libs/libXi
+       x11-libs/libXfont
+       x11-libs/libSM
+       x11-proto/xextproto
+       x11-proto/inputproto
+       dev-util/pkgconfig
+       xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+       virtual/xft
+       >=media-libs/freetype-2
+       png? ( media-libs/libpng )
+       jpeg? ( media-libs/jpeg )
+       mng? ( >=media-libs/libmng-1.0.9 )
+       nas? ( >=media-libs/nas-1.5 )
+       odbc? ( dev-db/unixODBC )
+       mysql? ( virtual/mysql )
+       firebird? ( dev-db/firebird )
+       sqlite3? ( =dev-db/sqlite-3* )
+       sqlite? ( =dev-db/sqlite-2* )
+       opengl? ( virtual/opengl virtual/glu )
+       postgres? ( dev-db/libpq )
+       cups? ( net-print/cups )
+       zlib? ( sys-libs/zlib )
+       glib? ( dev-libs/glib )
+       dbus? ( >=sys-apps/dbus-1.0.2 )
+       input_devices_wacom? ( x11-drivers/linuxwacom )"
+
+pkg_setup() {
+       QTBASEDIR=/usr/$(get_libdir)/qt4
+       QTPREFIXDIR=/usr
+       QTBINDIR=/usr/bin
+       QTLIBDIR=/usr/$(get_libdir)/qt4
+       QTPCDIR=/usr/$(get_libdir)/pkgconfig
+       QTDATADIR=/usr/share/qt4
+       QTDOCDIR=/usr/share/doc/${PF}
+       QTHEADERDIR=/usr/include/qt4
+       QTPLUGINDIR=${QTLIBDIR}/plugins
+       QTSYSCONFDIR=/etc/qt4
+       QTTRANSDIR=${QTDATADIR}/translations
+       QTEXAMPLESDIR=${QTDATADIR}/examples
+       QTDEMOSDIR=${QTDATADIR}/demos
+
+       PLATFORM=$(qt_mkspecs_dir)
+
+}
+
+qt_use() {
+       useq ${1} && echo "-${1}" || echo "-no-${1}"
+       return 0
+}
+
+qt_mkspecs_dir() {
+        # Allows us to define which mkspecs dir we want to use.
+       local spec
+
+       case ${CHOST} in
+               *-freebsd*|*-dragonfly*)
+                       spec="freebsd" ;;
+               *-openbsd*)
+                       spec="openbsd" ;;
+               *-netbsd*)
+                       spec="netbsd" ;;
+               *-darwin*)
+                       spec="darwin" ;;
+               *-linux-*|*-linux)
+                       spec="linux" ;;
+               *)
+                       die "Unknown CHOST, no platform choosed."
+       esac
+
+       CXX=$(tc-getCXX)
+       if [[ ${CXX/g++/} != ${CXX} ]]; then
+               spec="${spec}-g++"
+       elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+               spec="${spec}-icc"
+       else
+               die "Unknown compiler ${CXX}."
+       fi
+
+       echo "${spec}"
+}
+
+src_unpack() {
+
+       unpack ${A}
+       cd ${S}
+#      epatch ${FILESDIR}/qt4-parisc-linux.diff
+       epatch ${FILESDIR}/qt-4.1.4-sparc.patch
+       epatch ${FILESDIR}/qt4-sqlite-configure.patch
+       epatch ${FILESDIR}/utf8-bug-qt4-2.diff
+
+       cd ${S}/mkspecs/$(qt_mkspecs_dir)
+       # set c/xxflags and ldflags
+
+       # Don't let the user go too overboard with flags.  If you really want to, uncomment
+       # out the line below and give 'er a whirl.
+       strip-flags
+       replace-flags -O3 -O2
+
+       sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+               -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+               -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+               qmake.conf
+
+       # Do not link with -rpath. See bug #75181.
+       sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
+
+       # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+       sed -i -e "s:X11R6/::" qmake.conf
+
+       # The trolls moved the definitions of the above stuff for g++, so we need to edit those files
+       # separately as well.
+       cd ${S}/mkspecs/common
+
+       sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+               -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+               -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+               g++.conf
+
+       # Do not link with -rpath. See bug #75181.
+       sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
+
+       # Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
+       sed -i -e "s:X11R6/::" linux.conf
+
+       cd ${S}
+
+}
+
+src_compile() {
+       export PATH="${S}/bin:${PATH}"
+       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+       [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+       # Disable visibility explicitly if gcc version isn't 4
+       if [[ "$(gcc-major-version)" != "4" ]]; then
+               myconf="${myconf} -no-reduce-exports"
+       fi
+
+       myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
+       myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
+
+       use nas         && myconf="${myconf} -system-nas-sound"
+       use gif         && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+       use png         && myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
+       use jpeg        && myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
+       use debug       && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
+       use zlib        && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+
+       use mysql       && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+       use postgres    && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
+       use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+       use sqlite3     && myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
+       use sqlite      && myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
+       use odbc        && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+
+       use dbus        && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
+       use glib        && myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
+       use qt3support          && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
+
+       use pch         && myconf="${myconf} -pch"
+
+       use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
+
+       myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
+
+       if ! use examples; then
+               myconf="${myconf} -nomake examples"
+       fi
+
+
+       ./configure -stl -verbose -largefile -confirm-license \
+               -platform ${PLATFORM} -xplatform ${PLATFORM} \
+               -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+               -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+               -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+               -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
+
+       emake all || die
+}
+
+src_install() {
+       export PATH="${S}/bin:${PATH}"
+       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+       make INSTALL_ROOT=${D} install_subtargets || die
+       make INSTALL_ROOT=${D} install_qmake || die
+       make INSTALL_ROOT=${D} install_mkspecs || die
+
+       if use doc; then
+               make INSTALL_ROOT=${D} install_htmldocs || die
+       fi
+
+       # Install the translations.  This may get use flagged later somehow
+       make INSTALL_ROOT=${D} install_translations || die
+
+       keepdir "${QTSYSCONFDIR}"
+
+       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
+       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
+       sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
+
+       # pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
+       sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc
+
+       # Move .pc files into the pkgconfig directory
+       dodir ${QTPCDIR}
+       mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
+
+       # List all the multilib libdirs
+       local libdirs
+       for libdir in $(get_all_libdirs); do
+               libdirs="${libdirs}:/usr/${libdir}/qt4"
+       done
+
+       cat > "${T}/44qt4" << EOF
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+       doenvd "${T}/44qt4"
+}