remove stale versions

Package-Manager: portage-2.0.54

8 files changed, 8 insertions, 884 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 26d938b8253f..90aacf2860c5 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.297 2006/04/01 03:35:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.298 2006/04/07 00:01:31 caleb Exp $
+
+  06 Apr 2006; Caleb Tennis <caleb@gentoo.org>
+  -files/qt-4.1.0-configure-no-mysql.diff,
+  -files/qt-4.1.0-debug-and-release.diff, -qt-4.1.0-r1.ebuild,
+  -qt-4.1.0-r2.ebuild:
+  remove stale versions
 
   01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> qt-3.3.6.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 32676c659319..e60cdce03004 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,127 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8add351560cd77cc766fb27655183814 ChangeLog 7845
-RMD160 6c0f92ae9ad1facbe67d27c753cd8d2ca64e7751 ChangeLog 7845
-SHA256 6f98d45c300ef74a04586f006d0998e4c18db12ad877f21e161c2e6fe01037be ChangeLog 7845
+MD5 dd9efd7462441b3d1e011ea081cb6ff0 ChangeLog 8042
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
-SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d files/0002-dnd_active_window_fix.patch 7289
-SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 files/0002-dnd_active_window_fix.patch 7289
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 files/0037-dnd-timestamp-fix.patch 2138
-SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d files/0037-dnd-timestamp-fix.patch 2138
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 files/0038-dragobject-dont-prefer-unknown.patch 2551
-SHA256 6f91a102c81eca3191df63a6d3b79794587199f0485ffe5d42fc20fa063d53be files/0038-dragobject-dont-prefer-unknown.patch 2551
 MD5 7b2e89178256792970af91c675736674 files/digest-qt-3.3.4-r8 590
-RMD160 be12f3901344be36b1ca42df80a5d4bd29e98a27 files/digest-qt-3.3.4-r8 590
-SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/digest-qt-3.3.4-r8 590
 MD5 7b2e89178256792970af91c675736674 files/digest-qt-3.3.4-r9 590
-RMD160 be12f3901344be36b1ca42df80a5d4bd29e98a27 files/digest-qt-3.3.4-r9 590
-SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/digest-qt-3.3.4-r9 590
 MD5 094349442aca1132e3c97aee2dcde34a files/digest-qt-3.3.5 400
-RMD160 4baa572b1b10addcc646e0522f56176ef57f4898 files/digest-qt-3.3.5 400
-SHA256 b4d24ef5f1e74872de2ad2e5f9cb69747ecfd0ed3c03876605875dd68ef0bebb files/digest-qt-3.3.5 400
 MD5 76a040705fa29dc7da83216569142baf files/digest-qt-3.3.5-r1 590
-RMD160 79d4f921d8013694dd79265328e740b45252b6ee files/digest-qt-3.3.5-r1 590
-SHA256 707e8b079fec72ff5275990e8fac73eb019cd6ace7929a777899e2d71159d38e files/digest-qt-3.3.5-r1 590
 MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6 611
-RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6 611
-SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6 611
-MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r1 81
-RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0-r1 81
-SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0-r1 81
-MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r2 81
-RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0-r2 81
-SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0-r2 81
 MD5 745c1b09115055e17c96e8754daa6c7d files/digest-qt-4.1.1 289
-RMD160 caa7b9e86616001915929641dfafdf353ec28e90 files/digest-qt-4.1.1 289
-SHA256 46bea95a7e5d949279773eca4aa401ee19bd8c29ccf19e0129033448c2bc1b2b files/digest-qt-4.1.1 289
 MD5 15c631ab0d3b41fe4aa3d7e9d8483185 files/digest-qt-4.1.2 289
-RMD160 2f1a18f50d6ccfdd0db4ee89235f911d05fde9da files/digest-qt-4.1.2 289
-SHA256 d1ab261f19c33437fc21eb2c42b0331385e9c6b7a7e713dc35b8aebac7026f44 files/digest-qt-4.1.2 289
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-RMD160 bada5e23043d314b15f3af1eda70c8833112ebce files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-RMD160 c28fc4f367c30073470fbca316d13a7892b1adfe files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-SHA256 ea2f2c3c7d1839696aaafc08ba207f6a061895e57a0913074d1f013b9b455cc0 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
 MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
-RMD160 ac21760168e86067e7d438cd071eabe1e22f33b0 files/qt-3.3.4-gcc4-volatile.patch 2480
-SHA256 e86af42112302e46985d7c2d4739d771aba2e3568b24f0879ab87132d332a0f8 files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
-RMD160 fa263a5c095069f4f90746f0e6f29e49ad999bea files/qt-3.3.4-gcc4.patch 1002
-SHA256 1fb0c47495566ab556b4d2cae0db277a3f701ff408d4a8615839d70fa5df6fc1 files/qt-3.3.4-gcc4.patch 1002
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-RMD160 64adf25a67c0eedad839925380c8fe77fb887b9d files/qt-3.3.4-immodule-focus.patch 877
-SHA256 4185c82a1fed2a8a69f95ab975582d33db4b542c96cc82e090d30e3a01297bdf files/qt-3.3.4-immodule-focus.patch 877
 MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
-RMD160 824615ada3ea82e9ccde91814f47bac91026446c files/qt-3.3.4-macos.patch 18798
-SHA256 fae7ae9dc04b44ce8e8751947eb77471175769ff6ad439e78e79879743ae35a6 files/qt-3.3.4-macos.patch 18798
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb files/qt-3.3.4-qclipboard-hack.patch 1662
-SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 3e41898f6a3f5ff8518f5df0cb1e23cf files/qt-3.3.5-immodule.patch 773
-RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c files/qt-3.3.5-immodule.patch 773
-SHA256 a1cc1594c7795e034298aebb534bc4cb213af7fd0045036030d46e2c8f6edbd8 files/qt-3.3.5-immodule.patch 773
 MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
-RMD160 3e9ffa9baf832ebc6f3e8a292f781b0a9e35740c files/qt-3.3.5-macos.patch 18154
-SHA256 0515b66ccf539d2449b44c43873bd89f0ab6ea007488644e5170b50c84d2003e files/qt-3.3.5-macos.patch 18154
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
-RMD160 19964cfc6714e2ad38659e268ef248501db606aa files/qt-3.3.5-uic-fix.patch 711
-SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 files/qt-3.3.5-uic-fix.patch 711
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.6-uic-fix.patch 711
-RMD160 19964cfc6714e2ad38659e268ef248501db606aa files/qt-3.3.6-uic-fix.patch 711
-SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 files/qt-3.3.6-uic-fix.patch 711
-MD5 0495f1d3f467a2972feccba453135258 files/qt-4.1.0-configure-no-mysql.diff 11142
-RMD160 7f7424fe34a9fa2721b01bcf113af37ba2c01a43 files/qt-4.1.0-configure-no-mysql.diff 11142
-SHA256 5ca1ed97f9801ce5044dfbe2253651ed50c074be99fb7826acc893664f4f13a8 files/qt-4.1.0-configure-no-mysql.diff 11142
-MD5 b50b8f687bb25b6b372b22abc591e20c files/qt-4.1.0-debug-and-release.diff 1727
-RMD160 4b835ecaad4b4e0ab7ddf5445d185370f2864018 files/qt-4.1.0-debug-and-release.diff 1727
-SHA256 a676614b68e58eeaebc4bf74d66a2231b33fac9b8f2b319c590efa9010e9cb7e files/qt-4.1.0-debug-and-release.diff 1727
 MD5 dcd3368171f2b284381e1cbc0de6a5a5 files/qt-ulibc.patch 355
-RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 files/qt-ulibc.patch 355
-SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d files/qt-ulibc.patch 355
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
-RMD160 fea6ac45ebf4b457fc3e1d3c8f860e6661d52b0c files/qt4-nomkdir.patch 866
-SHA256 14b9bda1bfdf41b37816559e6c7833b15636c89b016c8f2c2224ebf5dbb5274f files/qt4-nomkdir.patch 866
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
-SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 metadata.xml 156
 MD5 ce2019145eb6b9a8a84382045fc34971 qt-3.3.4-r8.ebuild 10559
-RMD160 8eb8d75b41ee06f72d7aef7c6123ea30b16c00e4 qt-3.3.4-r8.ebuild 10559
-SHA256 90dab1336809080b00238e812702d920bf3aa3f1c6f10d9ccbe527414b2ea0fc qt-3.3.4-r8.ebuild 10559
 MD5 ba187d27a4a25b98f3b4406693d20a9a qt-3.3.4-r9.ebuild 10622
-RMD160 bddf5c9eacc0b23278ed077099da4ac849887284 qt-3.3.4-r9.ebuild 10622
-SHA256 17114471c94085e501d2c5d3560b9c2e53be0b86c8950c5d952aef24b7d21de1 qt-3.3.4-r9.ebuild 10622
 MD5 ea08e3c9e6b74b6ba863f8a4585a1337 qt-3.3.5-r1.ebuild 10606
-RMD160 c52706c4bcd0c21eaef94b323027b2b042c0cc25 qt-3.3.5-r1.ebuild 10606
-SHA256 25c877125a2f11024e1ab8d929ab8e9daca43d7e9c974ee9b0d23da6ae4ec7a7 qt-3.3.5-r1.ebuild 10606
 MD5 79f2f90628493509cef5843f920efe80 qt-3.3.5.ebuild 10557
-RMD160 1c8ddde347518aa57d475ede75f1ee428795fa70 qt-3.3.5.ebuild 10557
-SHA256 4f51480d530779f6c0fb3ea9f6c508b9731a2febf436daa19c47e329ef710158 qt-3.3.5.ebuild 10557
 MD5 062f484f0b5ac7022180602a9f72dab4 qt-3.3.6.ebuild 10498
-RMD160 e9ed010ae5a231f145d4b506ffe33ec190fa4be4 qt-3.3.6.ebuild 10498
-SHA256 ba51cf3c6ffa4f1d3dbb06d6ea77697a75fceb57775154d131c3b2691756d266 qt-3.3.6.ebuild 10498
-MD5 d2603f63c8272769089394a4f2ef8e37 qt-4.1.0-r1.ebuild 6259
-RMD160 c285258c72255415d73bdf0c73aefc3c14bf3725 qt-4.1.0-r1.ebuild 6259
-SHA256 3cb16cf9927dd59274859605bb484bc8c9b1746c2e49bb76c443a4204455a30d qt-4.1.0-r1.ebuild 6259
-MD5 a04ae47c7787c6585983cbdac19eaf90 qt-4.1.0-r2.ebuild 6451
-RMD160 161b17ad35f5878e247ae8dd14f25131aa0253e3 qt-4.1.0-r2.ebuild 6451
-SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0-r2.ebuild 6451
 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351
-RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351
-SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd qt-4.1.1.ebuild 6351
 MD5 5e83646afbac503b4c78916d9beb425a qt-4.1.2.ebuild 6348
-RMD160 6a97ba0f72acf441830b6bd02f3ec61cbe7209e4 qt-4.1.2.ebuild 6348
-SHA256 1acf8a1be69dc85a71e8d8215777b3dc347b26dfced1387b16c338c7432a5485 qt-4.1.2.ebuild 6348
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELfUlAiZjviIA2XgRAmfTAJ40wQ8DT6BzX2WK+21fJyc0eIX/sgCeL4L7
-K4o9wn7TB3ZXwVmZlzr8wf4=
-=8B0w
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-4.1.0-r1 b/x11-libs/qt/files/digest-qt-4.1.0-r1
deleted file mode 100644
index 87b17979288a..000000000000
--- a/x11-libs/qt/files/digest-qt-4.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e3982a54f56b6420d3062b20524410a qt-x11-opensource-src-4.1.0.tar.gz 25634393
diff --git a/x11-libs/qt/files/digest-qt-4.1.0-r2 b/x11-libs/qt/files/digest-qt-4.1.0-r2
deleted file mode 100644
index 87b17979288a..000000000000
--- a/x11-libs/qt/files/digest-qt-4.1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e3982a54f56b6420d3062b20524410a qt-x11-opensource-src-4.1.0.tar.gz 25634393
diff --git a/x11-libs/qt/files/qt-4.1.0-configure-no-mysql.diff b/x11-libs/qt/files/qt-4.1.0-configure-no-mysql.diff
deleted file mode 100644
index 867c0c79efe1..000000000000
--- a/x11-libs/qt/files/qt-4.1.0-configure-no-mysql.diff
+++ /dev/null
@@ -1,331 +0,0 @@
---- configure	2005-11-28 14:49:16 -0000
-+++ configure	2005-11-28 14:49:16 -0000
-
-@@ -1,4 +1,4 @@
--#!/bin/sh 
-+#!/bin/sh
- #
- # Configures to build the Qt library
- #
-@@ -196,7 +196,7 @@
-             Edition="Console"
-             QT_EDITION="QT_EDITION_CONSOLE"
-             ;;
--        esac	
-+        esac
-         ;;
-     Z4M|R4M|Q4M)
-         LicenseType="Evaluation"
-@@ -295,7 +295,7 @@
-             cp -f $relpath/.LICENSE-EDUCATIONAL-US $outpath/LICENSE
-             ;;
-         esac
--        ;;        
-+        ;;
-     2)
-         # non-US
-         case "$LicenseType" in
-@@ -742,7 +742,7 @@
-             UNKNOWN_OPT=yes
-         fi
-         ;;
--    sdk) 
-+    sdk)
-         if [ "$PLATFORM_MAC" = "yes" ]; then
-             CFG_SDK="$VAL"
-         else
-@@ -1084,13 +1084,13 @@
-         VAR=`echo $VAR | sed "s,^\([^-]*\).*,\1,"`
-         ERROR=no
-         if [ "$VAR" = "decoration" ]; then
--            ERROR=yes            
-+            ERROR=yes
-             for d in $CFG_DECORATION_AVAILABLE; do
-                 if [ "$VAL" = "$d" ]; then
-                     ERROR=no
-                     break
-                 fi
--            done            
-+            done
-         elif [ "$VAR" = "sql" ]; then
-             ERROR=yes
-             # check if named driver is available
-@@ -1747,7 +1747,7 @@
-                 ;;
-         esac
-         ARCH=macosx
--        ;; 
-+        ;;
-     AIX:*:00????????00)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
-         echo "    64-bit IBM PowerPC (powerpc)"
-@@ -2778,28 +2778,30 @@
- for _SQLDR in $CFG_SQL_AVAILABLE; do
-         case $_SQLDR in
-         mysql)
--	    if $unixtests/compile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath config.tests/unix/mysql_r "MySQL (thread-safe)" $L_FLAGS $I_FLAGS; then
--                QMAKE_VARS="$QMAKE_VARS \"CONFIG += use_libmysqlclient_r\""
--                if [ "$CFG_SQL_mysql" = "auto" ]; then
--                    CFG_SQL_mysql=plugin
--                fi
--            elif $unixtests/compile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath config.tests/unix/mysql "MySQL (thread-unsafe)" $L_FLAGS $I_FLAGS; then
--                if [ "$CFG_SQL_mysql" = "auto" ]; then
--                    CFG_SQL_mysql=plugin
--                fi
--            else
--                if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
--                    echo "MySQL support cannot be enabled due to functionality tests!"
--                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
--                    echo " If you believe this message is in error you may use the continue"
--                    echo " switch (-continue) to $0 to continue."
--                    exit 101
-+            if [ "$CFG_SQL_mysql" != "no" ]; then
-+                if $unixtests/compile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath config.tests/unix/mysql_r "MySQL (thread-safe)" $L_FLAGS $I_FLAGS; then
-+                    QMAKE_VARS="$QMAKE_VARS \"CONFIG += use_libmysqlclient_r\""
-+                    if [ "$CFG_SQL_mysql" = "auto" ]; then
-+                        CFG_SQL_mysql=plugin
-+                    fi
-+                elif $unixtests/compile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath config.tests/unix/mysql "MySQL (thread-unsafe)" $L_FLAGS $I_FLAGS; then
-+                    if [ "$CFG_SQL_mysql" = "auto" ]; then
-+                        CFG_SQL_mysql=plugin
-+                    fi
-                 else
--                    CFG_SQL_mysql=no
-+                    if [ "$CFG_SQL_mysql" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-+                        echo "MySQL support cannot be enabled due to functionality tests!"
-+                        echo " Turn on verbose messaging (-v) to $0 to see the final report."
-+                        echo " If you believe this message is in error you may use the continue"
-+                        echo " switch (-continue) to $0 to continue."
-+                        exit 101
-+                    else
-+                        CFG_SQL_mysql=no
-+                    fi
-                 fi
--            fi            	
-+            fi
-         ;;
--        psql)                        
-+        psql)
-             if [ "$CFG_SQL_psql" != "no" ]; then
-                 if $unixtests/compile.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath config.tests/unix/psql "PostgreSQL" $L_FLAGS $I_FLAGS; then
-                     if [ "$CFG_SQL_psql" = "auto" ]; then
-@@ -2815,8 +2817,8 @@
-                     else
-                         CFG_SQL_psql=no
-                     fi
--                fi 
--            fi                        
-+                fi
-+            fi
-         ;;
-         odbc)
-             if [ "$CFG_SQL_odbc" != "no" ]; then
-@@ -2834,8 +2836,8 @@
-                     else
-                         CFG_SQL_odbc=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         oci)
-             if [ "$CFG_SQL_oci" != "no" ]; then
-@@ -2853,8 +2855,8 @@
-                     else
-                         CFG_SQL_oci=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         tds)
-             if [ "$CFG_SQL_tds" != "no" ]; then
-@@ -2872,8 +2874,8 @@
-                     else
-                         CFG_SQL_tds=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         db2)
-             if [ "$CFG_SQL_db2" != "no" ]; then
-@@ -2891,8 +2893,8 @@
-                     else
-                         CFG_SQL_db2=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         ibase)
-             if [ "$CFG_SQL_ibase" != "no" ]; then
-@@ -2910,8 +2912,8 @@
-                     else
-                         CFG_SQL_ibase=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         sqlite2)
-             if [ "$CFG_SQL_sqlite2" != "no" ]; then
-@@ -2929,14 +2931,14 @@
-                     else
-                         CFG_SQL_sqlite2=no
-                     fi
--                fi 
--            fi            
-+                fi
-+            fi
-             ;;
-         sqlite)
-             if [ -f $relpath/src/3rdparty/sqlite/sqlite3.h ]; then
-                 if [ "$CFG_SQL_sqlite" = "auto" ]; then
-                         CFG_SQL_sqlite=plugin
--                fi    
-+                fi
-             else
-                 if [ "$CFG_SQL_sqlite" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-                     echo "SQLite support cannot be enabled due to functionality tests!"
-@@ -2947,7 +2949,7 @@
-                 else
-                     CFG_SQL_sqlite=no
-                 fi
--            fi                        
-+            fi
-             ;;
-         *)
-             if [ "$OPT_VERBOSE" = "yes" ]; then
-@@ -2999,7 +3001,7 @@
-     # work around broken X11 headers when using GCC 2.95 or later
-     NOTYPE=no
-     $x11tests/notype.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath && NOTYPE=yes
--    if [ $NOTYPE = "yes" ]; then 
-+    if [ $NOTYPE = "yes" ]; then
-         QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fpermissive\""
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
-@@ -3171,7 +3173,7 @@
- 
- if [ "$CFG_ENDIAN" = "auto" ]; then
-     if [ "$PLATFORM_MAC" = "yes" ]; then
--	true #leave as auto 
-+	true #leave as auto
-     else
-         $unixtests/endian.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath
- 	F="$?"
-@@ -3257,7 +3259,7 @@
-             echo " If you believe this message is in error you may use the continue"
-             echo " switch (-continue) to $0 to continue."
-             exit 101
--	else	
-+	else
- 	    CFG_GETADDRINFO=no
- 	fi
-     fi
-@@ -3525,8 +3527,8 @@
- [ '!' -z "$L_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBDIR_FLAGS+=$L_FLAGS\""
- [ '!' -z "$l_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"LIBS+=$l_FLAGS\""
- 
--if [ "$PLATFORM_MAC" = "yes" ]; then  
--    if [ "$CFG_RPATH" = "yes" ]; then  
-+if [ "$PLATFORM_MAC" = "yes" ]; then
-+    if [ "$CFG_RPATH" = "yes" ]; then
-        QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
-     fi
- elif [ -z "`grep QMAKE_RPATH $XQMAKESPEC/qmake.conf | awk '{print $3;}'`" ]; then
-@@ -3541,8 +3543,8 @@
-         CFG_RPATH=no
-     fi
- else
--    if [ "$CFG_RPATH" = "yes" ]; then  
--        # set the default rpath to the library installation directory 
-+    if [ "$CFG_RPATH" = "yes" ]; then
-+        # set the default rpath to the library installation directory
-         RPATH_FLAGS="$QT_INSTALL_LIBS $RPATH_FLAGS"
-     fi
-     if [ -n "$RPATH_FLAGS" ]; then
-@@ -3766,10 +3768,10 @@
- #endif
- EOF
- else
--    echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>$outpath/src/corelib/global/qconfig.h.new 
-+    echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >>$outpath/src/corelib/global/qconfig.h.new
- fi
- 
--echo '/* Compile time features */' >>$outpath/src/corelib/global/qconfig.h.new 
-+echo '/* Compile time features */' >>$outpath/src/corelib/global/qconfig.h.new
- [ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\"" >>$outpath/src/corelib/global/qconfig.h.new
- 
- if [ "$CFG_LARGEFILE" = "yes" ]; then
-@@ -3856,14 +3858,14 @@
-         QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SQL_$ONDRIVER"
-         SQL_DRIVERS="$SQL_DRIVERS $DRIVER"
-     ;;
--    plugin)    
-+    plugin)
-         SQL_PLUGINS="$SQL_PLUGINS $DRIVER"
--    ;; 
--    esac               
-+    ;;
-+    esac
- done
- 
--QMAKE_VARS="$QMAKE_VARS \"sql-drivers = $SQL_DRIVERS\"" 
--QMAKE_VARS="$QMAKE_VARS \"sql-plugins = $SQL_PLUGINS\"" 
-+QMAKE_VARS="$QMAKE_VARS \"sql-drivers = $SQL_DRIVERS\""
-+QMAKE_VARS="$QMAKE_VARS \"sql-plugins = $SQL_PLUGINS\""
- 
- # Add other configuration options to the qconfig.h file
- [ "$CFG_GIF" = "yes" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1"
-@@ -4226,7 +4228,7 @@
-     echo
-     echo "NOTE: Mac OS X frameworks implicitely build debug and release Qt libraries."
-     echo
--fi 
-+fi
- echo
- 
- sepath=`echo $relpath | sed -e 's/\\./\\\\./g'`
-@@ -4424,7 +4426,7 @@
-                 echo " (fast)\c"
-             fi
-             echo
--	
-+
-             cat >${OUTDIR}/Makefile <<EOF
- # ${OUTDIR}/Makefile: generated by configure
- #
-@@ -4432,7 +4434,7 @@
- # All changes made to this file will be lost.
- EOF
-             [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
--        
-+
-             cat >>${OUTDIR}/Makefile <<EOF
- all clean install qmake first Makefile: FORCE
- 	$QMAKE_EXEC
-@@ -4493,7 +4495,7 @@
- fi
- 
- if [ -n "$RPATH_MESSAGE" ]; then
--    echo 
-+    echo
-     echo "$RPATH_MESSAGE"
- fi
- 
-@@ -4501,7 +4503,7 @@
- echo
- echo Qt is now configured for building. Just run \'$MAKE\'.
- if [ "$relpath" = "$QT_INSTALL_PREFIX" ]; then
--    echo Once everything is built, Qt is installed. 
-+    echo Once everything is built, Qt is installed.
-     echo You should not run \'$MAKE install\'.
- else
-     echo Once everything is built, you must run \'$MAKE install\'.
diff --git a/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff b/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff
deleted file mode 100644
index ad43f2e95781..000000000000
--- a/x11-libs/qt/files/qt-4.1.0-debug-and-release.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure	2006-01-03 10:12:46 -0000
-+++ configure	2006-01-03 10:12:46 -0000
-
-@@ -370,7 +370,6 @@
- CFG_QCONFIG=full
- CFG_EMBEDDED=no
- CFG_DEBUG=auto
--CFG_BUILD_ALL=yes
- CFG_DEBUG_RELEASE=no
- CFG_SHARED=yes
- CFG_SM=auto
-@@ -1297,14 +1296,12 @@
- fi
- 
- # detect build style
--if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
--    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
--elif [ "$CFG_DEBUG" = "auto" ]; then
-+if [ "$CFG_DEBUG" = "auto" ]; then
-     CFG_DEBUG_RELEASE=yes
-     CFG_DEBUG=yes
-+fi
-+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
-     QMAKE_CONFIG="$QMAKE_CONFIG build_all"
--else
--    CFG_BUILD_ALL=no
- fi
- 
- # if the source tree is different from the build tree,
-@@ -4174,7 +4171,16 @@
- 
- [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
- echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
--echo "Debug................ $CFG_DEBUG"
-+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
-+   echo "Debug................ yes (combined)"
-+   if [ "$CFG_DEBUG" = "yes" ]; then
-+       echo "Default Link......... debug"
-+   else
-+       echo "Default Link......... release"
-+   fi
-+else
-+   echo "Debug................ $CFG_DEBUG"
-+fi
- echo "Qt3 compatibility.... $CFG_QT3SUPPORT"
- echo "STL support ......... $CFG_STL"
- echo "PCH support ......... $CFG_PRECOMPILE"
-@@ -4452,7 +4458,7 @@
- # WARNING: This makefile will be replaced with a real makefile.
- # All changes made to this file will be lost.
- EOF
--            [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
-+            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
- 
-             cat >>${OUTDIR}/Makefile <<EOF
- all clean install qmake first Makefile: FORCE
diff --git a/x11-libs/qt/qt-4.1.0-r1.ebuild b/x11-libs/qt/qt-4.1.0-r1.ebuild
deleted file mode 100644
index 76fda49c4933..000000000000
--- a/x11-libs/qt/qt-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0-r1.ebuild,v 1.5 2006/01/11 14:03:43 weeve 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="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
-
-DEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXfont
-			x11-proto/xextproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( media-libs/libmng )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( dev-db/mysql )
-	firebird? ( dev-db/firebird )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )"
-
-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/doc/${PF}
-	QTDOCDIR=${QTDATADIR}/doc
-	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.  Currently we only use
-	# linux-g++ or linux-g++-64, but others could be used for various platforms.
-
-	if [[ $(get_libdir) == "lib" ]]; then
-		echo "linux-g++"
-	else
-		echo "linux-g++-64"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	cd 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
-
-	cd ${S}
-	epatch ${FILESDIR}/qt4-nomkdir.patch
-	epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff
-	epatch ${FILESDIR}/qt-4.1.0-debug-and-release.diff
-
-	if [[ "$(gcc-major-version)" == "4" ]]; then
-		einfo "Visibility support: auto"
-	else
-		einfo "Visibility support: disabled"
-		sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-	fi
-}
-
-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)"
-
-	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-and-release" || myconf="${myconf} -release"
-	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 sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
-
-	./configure -stl -verbose -largefile \
-		-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 sub-tools-all-ordered || die
-	if use examples; then
-		emake sub-examples-all-ordered || die
-	fi
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-
-	if use examples; then
-		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
-		make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
-	fi
-
-	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
-
-	# The QtAssistant header files aren't installed..not sure why
-	#cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
-
-	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
-
-	# 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
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}
diff --git a/x11-libs/qt/qt-4.1.0-r2.ebuild b/x11-libs/qt/qt-4.1.0-r2.ebuild
deleted file mode 100644
index 08c7900f4486..000000000000
--- a/x11-libs/qt/qt-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.0-r2.ebuild,v 1.3 2006/01/18 19:28:22 josejx 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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
-
-DEPEND="|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXi
-			x11-libs/libXfont
-			x11-libs/libSM
-			x11-proto/xextproto
-			x11-proto/inputproto
-			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( media-libs/libmng )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( dev-db/mysql )
-	firebird? ( dev-db/firebird )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )"
-
-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/doc/${PF}
-	QTDOCDIR=${QTDATADIR}/doc
-	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.  Currently we only use
-	# linux-g++ or linux-g++-64, but others could be used for various platforms.
-
-	if [[ $(get_libdir) == "lib" ]]; then
-		echo "linux-g++"
-	else
-		echo "linux-g++-64"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	cd 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
-
-	cd ${S}
-	epatch ${FILESDIR}/qt4-nomkdir.patch
-	epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff
-	epatch ${FILESDIR}/qt-4.1.0-debug-and-release.diff
-
-	if [[ "$(gcc-major-version)" == "4" ]]; then
-		einfo "Visibility support: auto"
-	else
-		einfo "Visibility support: disabled"
-		sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-	fi
-}
-
-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)"
-
-	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-and-release" || myconf="${myconf} -release"
-	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 sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
-
-	./configure -stl -verbose -largefile \
-		-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 sub-tools-all-ordered || die
-	if use examples; then
-		emake sub-examples-all-ordered || die
-	fi
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-
-	if use examples; then
-		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
-		make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
-	fi
-
-	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
-
-	# The private header files of QTestLib aren't installed, but are needed by the test library.
-	# This is supposedly fixed in Qt 4.1.1, so this can probably be removed when it is released
-	dodir ${QTHEADERDIR}/QtTest/private
-	cp -pPR ${S}/tools/qtestlib/src/*_p.h ${D}/${QTHEADERDIR}/QtTest/private
-
-	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
-
-	# 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
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}