Remove old ebuilds.

Package-Manager: portage-2.0.51.22-r2

14 files changed, 0 insertions, 1298 deletions

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index c523e5ee59b9..c4eee70291af 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,43 +1,30 @@
-MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 29e408b179271fd0fdec5a0dbc752627 qt-3.3.4-r4.ebuild 9408
-MD5 94ed6ea2c0cd61ef0ccf21a1fa10796a qt-3.3.4-r5.ebuild 9197
 MD5 746b128d7d4d48f317104bfd9667e907 qt-3.3.4-r6.ebuild 9086
 MD5 0b2185dc5083c6626071d26ef79383f5 qt-3.3.4-r3.ebuild 9050
 MD5 abebdce3f3c5103c70dfdadfee57588b ChangeLog 39823
 MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
 MD5 4221b60c5dd96c29fb2dff5a31be66ed qt-3.3.4-r7.ebuild 9950
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r6 166
 MD5 9f5e557d5ece29f236e21104925a66a3 files/qt-3.3.4-macos.patch 18793
 MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r5 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r7 166
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
 MD5 7eae3f0a0cb9f3188a994c9f546c869e files/digest-qt-4.0.0 86
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
diff --git a/x11-libs/qt/files/digest-qt-3.3.3-r1 b/x11-libs/qt/files/digest-qt-3.3.3-r1
deleted file mode 100644
index caaa95d83463..000000000000
--- a/x11-libs/qt/files/digest-qt-3.3.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812
-MD5 1053683f0d27854babc2a03db7360e23 qt-x11-immodule-unified-qt3.3.3-20040910.diff.gz 135277
-MD5 5ba58ddd3bf3d9c6f717b2366d1a5743 qt-3.3.3-darwin-fink.patch.gz 22581
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r4 b/x11-libs/qt/files/digest-qt-3.3.4-r4
deleted file mode 100644
index d12b1ee1a446..000000000000
--- a/x11-libs/qt/files/digest-qt-3.3.4-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
-MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r5 b/x11-libs/qt/files/digest-qt-3.3.4-r5
deleted file mode 100644
index d12b1ee1a446..000000000000
--- a/x11-libs/qt/files/digest-qt-3.3.4-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
-MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/files/qfontdatabase_x11.diff b/x11-libs/qt/files/qfontdatabase_x11.diff
deleted file mode 100644
index 6a19825d2a5a..000000000000
--- a/x11-libs/qt/files/qfontdatabase_x11.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/kernel/qfontdatabsae_x11.cpp.orig	2004-03-04 17:53:01.000000000 +0100
-+++ src/kernel/qfontdatabase_x11.cpp	2004-03-04 17:47:59.000000000 +0100
-@@ -1508,6 +1516,24 @@
- 	XftResult res;
- 	XftPattern *result =
- 	    XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res );
-+#ifdef QT_XFT2
-+	if (script == QFont::Latin) {
-+	    // since we added the Euro char on top, check we actually got the family
-+	    // we requested. If we didn't get it correctly, remove the Euro from the pattern
-+	    // and try again.
-+	    FcChar8 *f;
-+	    res = FcPatternGetString(result, FC_FAMILY, 0, &f);
-+	    if (res == FcResultMatch && QString::fromUtf8((char *)f) != family->rawName) {
-+		qDebug("trying without Euro");
-+		FcPatternDel(pattern, FC_CHARSET);
-+		FcCharSet *cs = FcCharSetCreate();
-+		QChar sample = sampleCharacter(script);
-+		FcCharSetAddChar(cs, sample.unicode());
-+		FcPatternAddCharSet(pattern, FC_CHARSET, cs);
-+		result = XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res );
-+	    }
-+	}
-+#endif
- 	XftPatternDestroy(pattern);
- 
- 	// We pass a duplicate to XftFontOpenPattern because either xft font
diff --git a/x11-libs/qt/files/qt-3.3.3-amd64-fullscreen.patch b/x11-libs/qt/files/qt-3.3.3-amd64-fullscreen.patch
deleted file mode 100644
index 428211744a0b..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-amd64-fullscreen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/kernel/qapplication_x11.cpp.sav	2004-08-12 14:40:36.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp	2004-10-07 15:38:05.576444791 +0200
-@@ -1345,7 +1345,7 @@ void qt_get_net_supported()
- 			       False, XA_ATOM, &type, &format, &nitems, &after, &data);
- 
- 	    if (type == XA_ATOM && format == 32) {
--		ts.writeBlock((const char *) data, nitems * 4);
-+		ts.writeBlock((const char *) data, nitems * sizeof(long));
- 		offset += nitems;
- 	    } else
- 		after = 0;
-@@ -4574,7 +4574,8 @@ bool QETWidget::translatePropertyEvent(c
- 	if (max && !isMaximized()) {
- 	    setWState(WState_Maximized);
- 	    send_event = TRUE;
--	} else if (!max && isMaximized()) {
-+	} else if (!max && isMaximized()
-+            && (qt_net_supports(qt_net_wm_state_max_v) || qt_net_supports(qt_net_wm_state_max_h))) {
- 	    clearWState(WState_Maximized);
- 	    send_event = TRUE;
- 	}
-@@ -4582,7 +4583,7 @@ bool QETWidget::translatePropertyEvent(c
- 	if (full && !isFullScreen()) {
- 	    setWState(WState_FullScreen);
- 	    send_event = TRUE;
--	} else if (!full && isFullScreen()) {
-+	} else if (!full && isFullScreen() && qt_net_supports(qt_net_wm_state_fullscreen)) {
- 	    clearWState(WState_FullScreen);
- 	    send_event = TRUE;
- 	}
diff --git a/x11-libs/qt/files/qt-3.3.3-flickerfree_qiconview_buffered.patch b/x11-libs/qt/files/qt-3.3.3-flickerfree_qiconview_buffered.patch
deleted file mode 100644
index 593fb2518e30..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-flickerfree_qiconview_buffered.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Buffered QIconView.
-
-For every QIconView this patch creates a backbuffer where the image will
-grow up (aka will be painted) before blitting the results to the screen.
-This solves the konqueror flickering problems at its roots. There are
-some more bugs that make conqueror repaint without reason.. patches
-will follow.
- Enrico Ros <eros.kde@email.it>
-
---- src.orig/iconview/qiconview.cpp	2004-03-24 15:58:05.000000000 +0000
-+++ src/iconview/qiconview.cpp	2004-03-30 16:23:32.521253280 +0000
-@@ -211,6 +211,7 @@
-     QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem,
- 	*startDragItem, *pressedItem, *selectAnchor, *renamingItem;
-     QRect *rubber;
-+    QPixmap *backBuffer;
-     QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer,
- 	*fullRedrawTimer;
-     int rastX, rastY, spacing;
-@@ -2731,6 +2732,7 @@
-     d->currentItem = 0;
-     d->highlightedItem = 0;
-     d->rubber = 0;
-+    d->backBuffer = 0;
-     d->scrollTimer = 0;
-     d->startDragItem = 0;
-     d->tmpCurrentItem = 0;
-@@ -2883,6 +2885,8 @@
- 	delete item;
- 	item = tmp;
-     }
-+    delete d->backBuffer;
-+    d->backBuffer = 0;
-     delete d->fm;
-     d->fm = 0;
- #ifndef QT_NO_TOOLTIP
-@@ -4845,6 +4849,47 @@
- #endif
- 
- /*!
-+    This function grabs all paintevents that otherwise would have been
-+    processed by the QScrollView::viewportPaintEvent(). Here we use a
-+    doublebuffer to reduce 'on-paint' flickering on QIconView
-+    (and of course its childs).
-+    
-+    \sa QScrollView::viewportPaintEvent(), QIconView::drawContents()
-+*/
-+
-+void QIconView::bufferedPaintEvent( QPaintEvent* pe )
-+{
-+    QWidget* vp = viewport();
-+    QRect r = pe->rect() & vp->rect();
-+    int ex = r.x() + contentsX();
-+    int ey = r.y() + contentsY();
-+    int ew = r.width();
-+    int eh = r.height();
-+
-+    if ( !d->backBuffer )
-+	d->backBuffer = new QPixmap(vp->size());
-+    if ( d->backBuffer->size() != vp->size() ) {
-+	//Resize function (with hysteesis). Uses a good compromise between memory
-+	//consumption and speed (number) of resizes.
-+	float newWidth = (float)vp->width();
-+	float newHeight = (float)vp->height();
-+	if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() )
-+	{
-+	    newWidth *= 1.1892;
-+	    newHeight *= 1.1892;
-+	    d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+	} else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() )
-+	    d->backBuffer->resize( (int)newWidth, (int)newHeight );
-+    }
-+
-+    QPainter p;
-+    p.begin(d->backBuffer, vp);
-+    drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh);
-+    p.end();
-+    bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh);
-+}
-+
-+/*!
-     \reimp
- */
- 
-@@ -5627,7 +5676,7 @@
- 		    if ( !d->rubber )
- 			drawDragShapes( d->oldDragPos );
- 		}
--		viewportPaintEvent( (QPaintEvent*)e );
-+		bufferedPaintEvent( (QPaintEvent*)e );
- 		if ( d->dragging ) {
- 		    if ( !d->rubber )
- 			drawDragShapes( d->oldDragPos );
---- src.orig/iconview/qiconview.h	2004-03-30 16:00:47.605751976 +0000
-+++ src/iconview/qiconview.h	2003-05-16 13:02:38.000000000 +0000
-@@ -445,6 +445,7 @@
-     void contentsDropEvent( QDropEvent *e );
- #endif
- 
-+    void bufferedPaintEvent( QPaintEvent* );
-     void resizeEvent( QResizeEvent* e );
-     void keyPressEvent( QKeyEvent *e );
-     void focusInEvent( QFocusEvent *e );
diff --git a/x11-libs/qt/files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch b/x11-libs/qt/files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch
deleted file mode 100644
index 5721db8c7690..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-QScrollView unwanted repaint fix.
-
-This fixes the 'flashing' konqueror window on activation / deactivation by
-saving 1 unwanted repaint (when konqueror window has background).
-I tracked down to the problem to the internal QViewportWidget of the
-QScrollView class.
-
-When a window is activated the activation event is recursively propagated
-to all childs triggering the windowActivationChange() functions in the
-widget it passes by.
-What happens when the event gets to the Viewport?
-At this point the event has already been handled by windowActivationChange()
-of the parent widget (a QIconView for example) and has then been propagated
-to the Viewport that will handle it with the default
-QWidget::windowActivationChange implementation, maybe raising an unwanted
-update(); so here we stop the event.
-As an addition: if the parent reimplements the windowActivationChange()
-function, mainly to block the update, it won't be happy if the child will
-trigger the update. If the parent do not reimplement the function il will
-inherits the default implementation and there is no need for the viewport's
-one.
-
-Enrico Ros <eros.kde@email.it>
-
---- src.orig/widgets/qscrollview.cpp	2004-03-29 10:17:04.000000000 +0000
-+++ src/widgets/qscrollview.cpp	2004-03-30 16:40:07.599978320 +0000
-@@ -1551,6 +1551,9 @@
-         case QEvent::LayoutHint:
-             d->autoResizeHint(this);
-             break;
-+        case QEvent::WindowActivate:
-+        case QEvent::WindowDeactivate:
-+            return TRUE;
-         default:
-             break;
-         }
diff --git a/x11-libs/qt/files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff b/x11-libs/qt/files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff
deleted file mode 100644
index 36ae67a6b737..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: src/kernel/qapplication.h
-===================================================================
---- src/kernel/qapplication.h	(revision 106)
-+++ src/kernel/qapplication.h	(working copy)
-@@ -411,6 +414,7 @@
- 
-     static bool      sendSpontaneousEvent( QObject *receiver, QEvent *event );
-     static void      removePostedEvent( QEvent * );
-+    static void      removePostedEvents( QObject *receiver, int event_type );
- 
-     friend class QWidget;
-     friend class QETWidget;
-Index: src/kernel/qapplication_x11.cpp
-===================================================================
---- src/kernel/qapplication_x11.cpp	(revision 108)
-+++ src/kernel/qapplication_x11.cpp	(working copy)
-@@ -601,7 +601,21 @@
- */
- void QApplication::postIMEvent( QObject *receiver, QIMEvent *event )
- {
--    postEvent( receiver, event );
-+    if ( event->type() == QEvent::IMCompose ) {
-+	// enable event compression to reduce preedit flicker on fast
-+	// typing
-+	postEvent( receiver, event );
-+    } else {
-+	// cancel queued preedit update
-+	if ( event->type() == QEvent::IMEnd )
-+	    removePostedEvents( receiver, QEvent::IMCompose );
-+
-+	// to avoid event receiving order inversion between QKeyEvent
-+	// and QIMEvent, we must send IMStart and IMEnd via
-+	// sendEvent().
-+	sendEvent( receiver, event );
-+	delete event;
-+    }
- }
- 
- 
-Index: src/kernel/qapplication.cpp
-===================================================================
---- src/kernel/qapplication.cpp	(revision 106)
-+++ src/kernel/qapplication.cpp	(working copy)
-@@ -3112,8 +3112,7 @@
- 	 event->type() == QEvent::LayoutHint ||
- 	 event->type() == QEvent::Resize ||
- 	 event->type() == QEvent::Move ||
--	 event->type() == QEvent::LanguageChange ||
--	 event->type() == QEvent::IMCompose ) {
-+	 event->type() == QEvent::LanguageChange ) {
- 	l->first();
- 	QPostEvent * cur = 0;
- 	for ( ;; ) {
-@@ -3147,6 +3146,29 @@
- 		} else if ( cur->event->type() == QEvent::LanguageChange ) {
- 		    delete event;
- 		    return;
-+		}
-+	    }
-+	    break;
-+	};
-+    }
-+
-+#if !defined(QT_NO_IM)
-+    // if this is one of the compressible IM events, do compression
-+    else if ( event->type() == QEvent::IMCompose ) {
-+	l->last();
-+	QPostEvent * cur = 0;
-+	for ( ;; ) {
-+	    while ( (cur=l->current()) != 0 &&
-+		    ( cur->receiver != receiver ||
-+		      cur->event == 0 ||
-+		      cur->event->type() != event->type() || 
-+		      cur->event->type() != QEvent::IMStart ) )
-+		l->prev();
-+	    if ( l->current() != 0 ) {
-+		// IMCompose must not be compressed with another one
-+		// beyond its IMStart boundary
-+		if ( cur->event->type() == QEvent::IMStart ) {
-+		    break;
- 		} else if ( cur->event->type() == QEvent::IMCompose ) {
- 		    QIMComposeEvent * e = (QIMComposeEvent *)(cur->event);
- 		    *e = *(QIMComposeEvent *)event;
-@@ -3157,6 +3179,7 @@
- 	    break;
- 	};
-     }
-+#endif
- 
-     // if no compression could be done, just append something
-     event->posted = TRUE;
-@@ -3304,6 +3327,23 @@
- 
- void QApplication::removePostedEvents( QObject *receiver )
- {
-+    removePostedEvents( receiver, 0 );
-+}
-+
-+/*!
-+  Removes all events that have the event type \a event_type posted
-+  using postEvent() for \a receiver.
-+
-+  The events are \e not dispatched, instead they are removed from the
-+  queue.
-+
-+  If \a event_type is 0, all the events are removed from the queue.
-+
-+  \threadsafe
-+*/
-+
-+void QApplication::removePostedEvents( QObject *receiver, int event_type )
-+{
-     if ( !receiver )
- 	return;
- 
-@@ -3322,18 +3362,22 @@
-     // leave the QPostEvent objects; they'll be deleted by
-     // sendPostedEvents().
-     QPostEventList * l = receiver->postedEvents;
--    receiver->postedEvents = 0;
-+    if ( !event_type )
-+	receiver->postedEvents = 0;
-     l->first();
-     QPostEvent * pe;
-     while( (pe=l->current()) != 0 ) {
--	if ( pe->event ) {
--	    pe->event->posted = FALSE;
--	    delete pe->event;
--	    pe->event = 0;
-+	if ( !event_type || pe->event->type() == event_type ) {
-+	    if ( pe->event ) {
-+		pe->event->posted = FALSE;
-+		delete pe->event;
-+		pe->event = 0;
-+	    }
-+	    l->remove();
- 	}
--	l->remove();
-     }
--    delete l;
-+    if ( !event_type )
-+	delete l;
- }
- 
- 
diff --git a/x11-libs/qt/files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff b/x11-libs/qt/files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff
deleted file mode 100644
index d2fb3605abce..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/kernel/qapplication.cpp
-===================================================================
---- src/kernel/qapplication.cpp	(revision 123)
-+++ src/kernel/qapplication.cpp	(working copy)
-@@ -3374,6 +3374,8 @@
- 		pe->event = 0;
- 	    }
- 	    l->remove();
-+	} else {
-+	    l->next();
- 	}
-     }
-     if ( !event_type )
diff --git a/x11-libs/qt/files/qt-3.3.3-qclipboard-hack.patch b/x11-libs/qt/files/qt-3.3.3-qclipboard-hack.patch
deleted file mode 100644
index 74c60fb25588..000000000000
--- a/x11-libs/qt/files/qt-3.3.3-qclipboard-hack.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-qt-bugs@ issue : none, probably even won't be
-bugs.kde.org number : 80072
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-A crude hack for KDE #80072. No good idea how to fix it properly yet :(.
-
---- src/kernel/qclipboard_x11.cpp.sav	2004-04-30 12:00:06.000000000 +0200
-+++ src/kernel/qclipboard_x11.cpp	2004-05-09 21:18:10.269264304 +0200
-@@ -109,6 +109,7 @@ static int pending_timer_id = 0;
- static bool pending_clipboard_changed = FALSE;
- static bool pending_selection_changed = FALSE;
- 
-+Q_EXPORT bool qt_qclipboard_bailout_hack = false;
- 
- // event capture mechanism for qt_xclb_wait_for_event
- static bool waiting_for_data = FALSE;
-@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent *
-     return 0;
- }
- 
-+static bool selection_request_pending = false;
-+
-+static Bool check_selection_request_pending( Display*, XEvent* e, XPointer )
-+    {
-+    if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId())
-+        selection_request_pending = true;
-+    return False;
-+    }
-+
- bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
- 			     int timeout )
- {
-@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp
-     do {
-         if ( XCheckTypedWindowEvent(dpy,win,type,event) )
- 	    return TRUE;
-+        if( qt_qclipboard_bailout_hack ) {
-+            XEvent dummy;
-+            selection_request_pending = false;
-+            if ( owner != NULL )
-+                XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL);
-+            if( selection_request_pending )
-+	        return TRUE;
-+        }
- 
- 	now = QTime::currentTime();
- 	if ( started > now )			// crossed midnight
diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild
deleted file mode 100644
index 72fde29347ae..000000000000
--- a/x11-libs/qt/qt-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.10 2005/06/03 18:31:48 caleb Exp $
-
-inherit eutils flag-o-matic
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
-	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
-	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="3"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64 ~ppc-macos"
-IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
-
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng media-libs/jpeg media-libs/libmng
-	>=media-libs/freetype-2
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( dev-db/mysql )
-	sqlite? ( =dev-db/sqlite-2* )
-	firebird? ( dev-db/firebird )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/postgresql )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	icc? ( dev-lang/icc )"
-
-# old immodules may cause segfaults on some qt applications,
-# especially qtconfig
-PDEPEND="!<=app-i18n/scim-qtimm-0.7
-	!<=app-i18n/uim-qt-0.1.7"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-
-pkg_setup() {
-	if 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
-
-	if useq ppc-macos ; then
-		export PLATFORM=darwin-g++
-		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-		export INSTALL_ROOT=""
-	else
-		export PLATFORM=linux-g++
-		#use icc && export PLATFORM=linux-icc
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	export QTDIR=${S}
-	cd ${S}
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	epatch ${FILESDIR}/qt-no-rpath-uic.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
-		gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch
-		epatch ${T}/${P}-darwin-fink.patch
-	fi
-
-	cd mkspecs/${PLATFORM}
-	# set c/xxflags and ldflags
-	strip-flags
-	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 || die
-	cd ${S}
-}
-
-src_compile() {
-	export QTDIR=${S}
-	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"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-gif"
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/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 odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-	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"
-	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-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-odbc -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'
-
-	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl || die
-
-	export QTDIR=${S}
-
-	emake src-qmake src-moc sub-src || die
-	DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \
-	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
-}
-
-src_install() {
-	# Setup the symlinks if libdir isn't "lib"
-	if [ "$(get_libdir)" != "lib" ]; then
-		dodir ${QTBASE}/$(get_libdir)
-		dosym $(get_libdir) ${QTBASE}/lib
-	fi
-
-	export QTDIR=${S}
-
-	# binaries
-	into $QTBASE
-	dobin bin/*
-
-	# 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 lib/lib{editor,qassistantclient,designercore}.a
-		dolib lib/libqt-mt.la
-		dolib lib/libqt-mt.so.3.3.3 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.3->3.3->3->.so
-		ln -s libqt-mt.so.3.3.3 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.3.3.3 libqt.so.3.3.3
-		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
-
-	# includes
-	cd ${S}
-	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
-
-	# misc
-	insinto /etc/env.d
-	doins ${FILESDIR}/{45qt3,50qtdir3}
-
-	dodir ${QTBASE}/tools/designer/templates
-	cd ${S}
-	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
-
-	dodir ${QTBASE}/translations
-	cd ${S}
-	cp translations/* ${D}/${QTBASE}/translations
-
-	dodir ${QTBASE}/etc
-	keepdir ${QTBASE}/etc/settings
-
-	dodir ${QTBASE}/doc
-
-	if use doc; then
-		cp -r ${S}/doc ${D}/${QTBASE}
-
-		cd ${S}/examples
-		find . -name Makefile | while read MAKEFILE
-		do
-			cp ${MAKEFILE} ${MAKEFILE}.old
-			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
-			rm -f ${MAKEFILE}.old
-		done
-
-		cp -r ${S}/examples ${D}/${QTBASE}
-
-		cd ${S}/tutorial
-		find . -name Makefile | while read MAKEFILE
-		do
-			cp ${MAKEFILE} ${MAKEFILE}.old
-			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
-			rm -f ${MAKEFILE}.old
-		done
-
-		cp -r ${S}/tutorial ${D}/${QTBASE}
-	fi
-
-	if use immqt || use immqt-bc ; then
-		dodoc ${S}/README.immodule
-	fi
-
-	# misc build reqs
-	dodir ${QTBASE}/mkspecs
-	cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/
-
-	sed -e "s:${S}:${QTBASE}:g" \
-		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
-	if use ppc-macos ; then
-		dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \
-			"s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \
-			"s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die
-	fi
-
-	# plugins
-	cd ${S}
-	plugins=`find plugins -name "lib*.so" -print`
-	for x in $plugins; do
-		insinto ${QTBASE}/`dirname $x`
-		doins $x
-	done
-}
diff --git a/x11-libs/qt/qt-3.3.4-r4.ebuild b/x11-libs/qt/qt-3.3.4-r4.ebuild
deleted file mode 100644
index 50d4643a033b..000000000000
--- a/x11-libs/qt/qt-3.3.4-r4.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r4.ebuild,v 1.9 2005/07/07 13:51:31 gustavoz Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
-	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
-#	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc ~ia64 ~ppc ~alpha"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
-
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
-	>=media-libs/freetype-2
-	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/postgresql )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )"
-
-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/icc/} != ${CXX} ]]; then
-		PLATCXX="icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	if use kernel_linux; then
-		PLATNAME="linux"
-	elif use kernel_FreeBSD && use elibc_FreeBSD; then
-		PLATNAME="freebsd"
-	elif use ppc-macos; then
-		PLATNAME=macx
-#		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-#		export INSTALL_ROOT=""
-	elif use kernel_Darwin && use elibc_Darwin; then
-		PLATNAME="darwin"
-	else
-		die "Unknown platform."
-	fi
-
-	# 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 =:'
-
-	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
-	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
-
-	# performance patches (see http://robotics.dei.unipd.it/~koral/KDE/kflicker.html)
-	epatch ${FILESDIR}/${P}-flickerfree_qiconview_buffered.patch
-	epatch ${FILESDIR}/${P}-flickerfree_qscrollview_fixwindowactivate.patch
-
-	# KDE related patches
-	epatch ${FILESDIR}/0001-dnd_optimization.patch
-	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
-	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
-	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
-	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
-	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
-
-	if use immqt || use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
-		epatch ${FILESDIR}/${P}-immodule-focus.patch
-		sh make-symlinks.sh || die "make symlinks failed"
-	fi
-
-	if use ppc-macos ; then
-		gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch
-		epatch ${T}/${P}-darwin-fink.patch
-	fi
-
-	# known working flags wrt #77623
-	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
-	# set c/xxflags and ldflags
-	strip-flags
-	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}:" \
-		${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)"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	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 odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-	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"
-	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-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-odbc -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'
-
-	./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 ${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
-
-}
-
-src_install() {
-	# binaries
-	into ${QTBASE}
-	dobin bin/*
-	dobin tools/msg2qm/msg2qm
-
-	# 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 lib/lib{editor,qassistantclient,designercore}.a
-		dolib lib/libqt-mt.la
-		dolib lib/libqt-mt.so.3.3.4 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.4->3.3->3->.so
-		ln -s libqt-mt.so.3.3.4 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.3.3.4 libqt.so.3.3.4
-		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/
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${QTBASE}/${libdir}"
-	done
-
-	# environment variables
-	cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-	cat <<EOF > ${T}/50qtdir3
-QTDIR=${QTBASE}
-EOF
-	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
-}
diff --git a/x11-libs/qt/qt-3.3.4-r5.ebuild b/x11-libs/qt/qt-3.3.4-r5.ebuild
deleted file mode 100644
index d7b697d30b54..000000000000
--- a/x11-libs/qt/qt-3.3.4-r5.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r5.ebuild,v 1.3 2005/07/07 13:51:31 gustavoz Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
-	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
-#	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc ~ia64 ~ppc ~alpha"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
-
-DEPEND="virtual/x11 virtual/xft
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
-	>=media-libs/freetype-2
-	nas? ( >=media-libs/nas-1.5 )
-	mysql? ( dev-db/mysql )
-	firebird? ( dev-db/firebird )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/postgresql )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )"
-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/icc/} != ${CXX} ]]; then
-		PLATCXX="icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	if use kernel_linux; then
-		PLATNAME="linux"
-	elif use kernel_FreeBSD && use elibc_FreeBSD; then
-		PLATNAME="freebsd"
-	elif use ppc-macos; then
-		PLATNAME=macx
-#		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-#		export INSTALL_ROOT=""
-	elif use kernel_Darwin && use elibc_Darwin; then
-		PLATNAME="darwin"
-	else
-		die "Unknown platform."
-	fi
-
-	# 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 =:'
-
-	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
-	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
-
-	# KDE related patches
-	epatch ${FILESDIR}/0001-dnd_optimization.patch
-	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
-	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
-	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
-	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
-	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
-
-	if use immqt || use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
-		epatch ${FILESDIR}/${P}-immodule-focus.patch
-		sh make-symlinks.sh || die "make symlinks failed"
-	fi
-
-	if use ppc-macos ; then
-		gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch
-		epatch ${T}/${P}-darwin-fink.patch
-	fi
-
-	# known working flags wrt #77623
-	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
-	# set c/xxflags and ldflags
-	strip-flags
-	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}:" \
-		${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 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"
-	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-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'
-
-	./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
-
-}
-
-src_install() {
-	# binaries
-	into ${QTBASE}
-	dobin bin/*
-	dobin tools/msg2qm/msg2qm
-
-	# 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 lib/lib{editor,qassistantclient,designercore}.a
-		dolib lib/libqt-mt.la
-		dolib lib/libqt-mt.so.3.3.4 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.4->3.3->3->.so
-		ln -s libqt-mt.so.3.3.4 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.3.3.4 libqt.so.3.3.4
-		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/
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${QTBASE}/${libdir}"
-	done
-
-	# environment variables
-	cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-	cat <<EOF > ${T}/50qtdir3
-QTDIR=${QTBASE}
-EOF
-	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
-}