Remove old ebuilds.
authorGregorio Guidi <greg_g@gentoo.org>
Fri, 7 Oct 2005 14:42:33 +0000 (14:42 +0000)
committerGregorio Guidi <greg_g@gentoo.org>
Fri, 7 Oct 2005 14:42:33 +0000 (14:42 +0000)
Package-Manager: portage-2.0.51.22-r3

18 files changed:
x11-libs/qt/Manifest
x11-libs/qt/files/45qt3 [deleted file]
x11-libs/qt/files/50qtdir3 [deleted file]
x11-libs/qt/files/digest-qt-3.3.4-r2 [deleted file]
x11-libs/qt/files/digest-qt-3.3.4-r3 [deleted file]
x11-libs/qt/files/digest-qt-3.3.4-r6 [deleted file]
x11-libs/qt/files/digest-qt-3.3.4-r7 [deleted file]
x11-libs/qt/files/digest-qt-4.0.0 [deleted file]
x11-libs/qt/files/qt-3.3.4-flickerfree_qiconview_buffered.patch [deleted file]
x11-libs/qt/files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch [deleted file]
x11-libs/qt/files/qt-no-rpath-uic.patch [deleted file]
x11-libs/qt/files/qt-no-rpath.patch [deleted file]
x11-libs/qt/files/qt4-rpath.patch [deleted file]
x11-libs/qt/qt-3.3.4-r2.ebuild [deleted file]
x11-libs/qt/qt-3.3.4-r3.ebuild [deleted file]
x11-libs/qt/qt-3.3.4-r6.ebuild [deleted file]
x11-libs/qt/qt-3.3.4-r7.ebuild [deleted file]
x11-libs/qt/qt-4.0.0.ebuild [deleted file]

index db75fe45dcd2fc2b6f5c4f5fdd5d42ecc582fe6d..ba4743edc0c57248e04353e4d3066e89e2f908af 100644 (file)
@@ -1,38 +1,21 @@
-MD5 a242233fb1072c5cfbe5ebbab1443e8d qt-3.3.4-r3.ebuild 9049
-MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 4570713eea7686db43dc9027f880b092 qt-3.3.4-r8.ebuild 9990
 MD5 5bd78bbb337119043f00c2dac5fab86b ChangeLog 1859
 MD5 20c9b273d559aebcc6aa71b28f47fcbd qt-3.3.5.ebuild 9940
-MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
-MD5 29eb571b78b63bccc11984b19cd7153b qt-3.3.4-r7.ebuild 9966
-MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721
 MD5 c30c3dcb479450775e6b471e1960a9e6 qt-4.0.1.ebuild 5613
-MD5 4570713eea7686db43dc9027f880b092 qt-3.3.4-r8.ebuild 9990
-MD5 3d30d5b1a92ec492ff8bfd173fba293c files/digest-qt-3.3.5 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r7 166
-MD5 7eae3f0a0cb9f3188a994c9f546c869e files/digest-qt-4.0.0 86
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
+MD5 3d30d5b1a92ec492ff8bfd173fba293c files/digest-qt-3.3.5 166
+MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
+MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
+MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
-MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r8 166
-MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.5-uic-fix.patch 711
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
-MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 7e6cdd22e2c697769754db9d6b3ae963 files/qt-3.3.4-macos.patch 18798
-MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r6 166
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
diff --git a/x11-libs/qt/files/45qt3 b/x11-libs/qt/files/45qt3
deleted file mode 100644 (file)
index 11f2ce2..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH=/usr/qt/3/bin
-ROOTPATH=/usr/qt/3/bin
-LDPATH=/usr/qt/3/lib
-QMAKESPEC=linux-g++
-MANPATH=/usr/qt/3/doc/man
diff --git a/x11-libs/qt/files/50qtdir3 b/x11-libs/qt/files/50qtdir3
deleted file mode 100644 (file)
index d41d81c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-QTDIR=/usr/qt/3
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r2 b/x11-libs/qt/files/digest-qt-3.3.4-r2
deleted file mode 100644 (file)
index d12b1ee..0000000
+++ /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-r3 b/x11-libs/qt/files/digest-qt-3.3.4-r3
deleted file mode 100644 (file)
index d12b1ee..0000000
+++ /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-r6 b/x11-libs/qt/files/digest-qt-3.3.4-r6
deleted file mode 100644 (file)
index d12b1ee..0000000
+++ /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-r7 b/x11-libs/qt/files/digest-qt-3.3.4-r7
deleted file mode 100644 (file)
index d12b1ee..0000000
+++ /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-4.0.0 b/x11-libs/qt/files/digest-qt-4.0.0
deleted file mode 100644 (file)
index 44c2ba0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6183269fab293282daf2da9ac940577 qt-x11-opensource-desktop-4.0.0.tar.bz2 15636509
diff --git a/x11-libs/qt/files/qt-3.3.4-flickerfree_qiconview_buffered.patch b/x11-libs/qt/files/qt-3.3.4-flickerfree_qiconview_buffered.patch
deleted file mode 100644 (file)
index 593fb25..0000000
+++ /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.4-flickerfree_qscrollview_fixwindowactivate.patch b/x11-libs/qt/files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch
deleted file mode 100644 (file)
index 5721db8..0000000
+++ /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-no-rpath-uic.patch b/x11-libs/qt/files/qt-no-rpath-uic.patch
deleted file mode 100644 (file)
index dd6ab67..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/designer/uic/uic.pro.orig    2004-02-20 11:08:12.000000000 -0500
-+++ tools/designer/uic/uic.pro 2004-02-20 11:08:27.000000000 -0500
-@@ -25,6 +25,7 @@
- INCLUDEPATH   += ../shared
- DEFINES       += UIC
- DESTDIR               = ../../../bin
-+QMAKE_RPATH   =
- 
- target.path=$$bins.path
- INSTALLS        += target
diff --git a/x11-libs/qt/files/qt-no-rpath.patch b/x11-libs/qt/files/qt-no-rpath.patch
deleted file mode 100644 (file)
index a7d7854..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkspecs/linux-g++/qmake.conf.orig  2004-12-21 14:57:27.315410728 -0500
-+++ mkspecs/linux-g++/qmake.conf       2004-12-21 14:57:40.129462696 -0500
-@@ -56,7 +56,7 @@
- QMAKE_LFLAGS_PLUGIN   = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME   = -Wl,-soname,
- QMAKE_LFLAGS_THREAD   =
--QMAKE_RPATH           = -Wl,-rpath,
-+QMAKE_RPATH           =
- 
- QMAKE_LIBS            =
- QMAKE_LIBS_DYNLOAD    = -ldl
diff --git a/x11-libs/qt/files/qt4-rpath.patch b/x11-libs/qt/files/qt4-rpath.patch
deleted file mode 100644 (file)
index 9e0bb33..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkspecs/linux-g++/qmake.conf.orig  2004-12-28 12:33:06.729910672 -0500
-+++ mkspecs/linux-g++/qmake.conf       2004-12-28 12:33:18.794076640 -0500
-@@ -57,7 +57,7 @@
- QMAKE_LFLAGS_PLUGIN   = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME   = -Wl,-soname,
- QMAKE_LFLAGS_THREAD   =
--QMAKE_RPATH           = -Wl,-rpath,
-+QMAKE_RPATH           = 
- 
- QMAKE_LIBS            =
- QMAKE_LIBS_DYNLOAD    = -ldl
diff --git a/x11-libs/qt/qt-3.3.4-r2.ebuild b/x11-libs/qt/qt-3.3.4-r2.ebuild
deleted file mode 100644 (file)
index c300829..0000000
+++ /dev/null
@@ -1,277 +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-r2.ebuild,v 1.16 2005/05/29 01:36:29 usata 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.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 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
-export QTDIR=${S}
-
-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
-
-       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++
-       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
-       epatch ${FILESDIR}/qt-no-rpath.patch
-
-       # 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
-
-       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
-
-       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" || myconf="${myconf} -no-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} -libdir ${QTBASE}/$(get_libdir) \
-               -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() {
-       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.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}
-       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/
-
-       # misc
-       insinto /etc/env.d
-       doins ${FILESDIR}/{45qt3,50qtdir3}
-
-       # List all the multilib libdirs
-       local libdirs
-       for libdir in $(get_all_libdirs); do
-               libdirs="${libdirs}:${QTBASE}/${libdir}"
-       done
-       dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3
-
-       if [ "${SYMLINK_LIB}" = "yes" ]; then
-               dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
-       fi
-
-       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
-}
diff --git a/x11-libs/qt/qt-3.3.4-r3.ebuild b/x11-libs/qt/qt-3.3.4-r3.ebuild
deleted file mode 100644 (file)
index 6d93f0d..0000000
+++ /dev/null
@@ -1,293 +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-r3.ebuild,v 1.16 2005/09/17 01:27:44 agriffis 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.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="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-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}
-
-       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
-               # probably this should be 'linux-g++-64' for 64bit archs
-               # in a fully multilib environment (no compatibility symlinks)
-               export PLATFORM=linux-g++
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-
-       cp configure configure.orig
-       sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-       epatch ${FILESDIR}/qt-no-rpath-uic.patch
-       epatch ${FILESDIR}/qt-no-rpath.patch
-
-       # 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}/${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
-
-       cd mkspecs/${PLATFORM}
-       # 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}:" \
-               qmake.conf || die
-       cd ${S}
-}
-
-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 -lpthread -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
-}
-
-src_install() {
-       # 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.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}
-       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/
-
-       # misc
-       insinto /etc/env.d
-       doins ${FILESDIR}/{45qt3,50qtdir3}
-
-       # List all the multilib libdirs
-       local libdirs
-       for libdir in $(get_all_libdirs); do
-               libdirs="${libdirs}:${QTBASE}/${libdir}"
-       done
-       dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3
-
-       if [ "${SYMLINK_LIB}" = "yes" ]; then
-               dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
-       fi
-
-       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}
-       fi
-
-       if use examples; then
-               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
-}
diff --git a/x11-libs/qt/qt-3.3.4-r6.ebuild b/x11-libs/qt/qt-3.3.4-r6.ebuild
deleted file mode 100644 (file)
index c7cbe3a..0000000
+++ /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-r6.ebuild,v 1.4 2005/08/08 10:55:51 greg_g 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 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-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 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
-               epatch ${FILESDIR}/${P}-macos.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
-       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
-EOF
-       else
-               cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-       fi
-       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-r7.ebuild b/x11-libs/qt/qt-3.3.4-r7.ebuild
deleted file mode 100644 (file)
index 7fb5d38..0000000
+++ /dev/null
@@ -1,334 +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-r7.ebuild,v 1.3 2005/08/22 13:13:47 greg_g 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 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-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 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
-
-       # patches for gcc4
-       epatch "${FILESDIR}/${P}-gcc4.patch"
-       epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
-
-       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
-               epatch ${FILESDIR}/${P}-macos.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/
-
-       # 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
-EOF
-       else
-               cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-       fi
-       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
-}
-
-pkg_postinst() {
-       echo
-       einfo "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
-       einfo "or widgets for the Qt designer) are no longer recognized.  If this situation"
-       einfo "occurs you should recompile the packages providing these plugins,"
-       einfo "and you should also make sure that Qt and its plugins were compiled with the"
-       einfo "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
-       einfo "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
-       einfo "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
-       echo
-}
diff --git a/x11-libs/qt/qt-4.0.0.ebuild b/x11-libs/qt/qt-4.0.0.ebuild
deleted file mode 100644 (file)
index 5d5aad5..0000000
+++ /dev/null
@@ -1,177 +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-4.0.0.ebuild,v 1.8 2005/07/21 15:39:46 caleb Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="opensource-desktop"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="-*"
-IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
-
-DEPEND="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/postgresql )
-       cups? ( net-print/cups )
-       zlib? ( sys-libs/zlib )"
-
-pkg_setup() {
-       QTBASEDIR=/usr/$(get_libdir)/qt4
-       QTPREFIXDIR=/usr/$(get_libdir)/qt4
-       QTBINDIR=/usr/bin
-       QTLIBDIR=/usr/$(get_libdir)/qt4
-       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}
-
-       cp configure configure.orig
-       sed -e 's:read acceptance:acceptance=yes:' configure.orig > 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
-       cd ${S}
-
-       epatch ${FILESDIR}/qt4-rpath.patch
-       epatch ${FILESDIR}/qt4-nomkdir.patch
-
-       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 SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-       export PATH="${S}/bin:${PATH}"
-       export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-       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 SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-       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 -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
-
-       mkdir -p ${D}/${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}/pkgconfig/*.pc
-       sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-       # List all the multilib libdirs
-       local libdirs
-       for libdir in $(get_all_libdirs); do
-               libdirs="${libdirs}:/usr/${libdir}/qt4"
-       done
-
-       mkdir -p ${D}/etc/env.d
-
-       cat > ${D}/etc/env.d/44qt4 << EOF
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-}