Remove old versions

(Portage version: 2.1.3.14)

12 files changed, 14 insertions, 798 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index b74ee4d62c53..393bcc0c7242 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.491 2007/10/03 18:00:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.492 2007/10/23 12:41:15 caleb Exp $
+
+  23 Oct 2007; Caleb Tennis <caleb@gentoo.org> -files/qt-4.1.4-sparc.patch,
+  -files/qt4-parisc-linux.diff, -files/utf8-bug-qt4-2.diff,
+  -files/qt-4.3.0-alpha-threading.patch, -files/qt4-sqlite-configure.patch,
+  -files/qt4-nomkdir.patch, -qt-4.3.0-r2.ebuild, -qt-4.3.1.ebuild,
+  qt-4.3.2.ebuild:
+  remove old versions
 
   03 Oct 2007; Caleb Tennis <caleb@gentoo.org> qt-4.3.2.ebuild:
   Fix some quoting issues
diff --git a/x11-libs/qt/files/digest-qt-4.3.0-r2 b/x11-libs/qt/files/digest-qt-4.3.0-r2
deleted file mode 100644
index 1f47068a30ba..000000000000
--- a/x11-libs/qt/files/digest-qt-4.3.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8012acea71b35c18247bd92c4721589d qt-x11-opensource-src-4.3.0.tar.gz 41955515
-RMD160 2106dd8dda7a5b16305ba701e33c17e9349fddc3 qt-x11-opensource-src-4.3.0.tar.gz 41955515
-SHA256 abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 qt-x11-opensource-src-4.3.0.tar.gz 41955515
diff --git a/x11-libs/qt/files/digest-qt-4.3.1 b/x11-libs/qt/files/digest-qt-4.3.1
deleted file mode 100644
index f2797e0b24ac..000000000000
--- a/x11-libs/qt/files/digest-qt-4.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ec255dcc2b30f5efe0ded85ae8a75e13 qt-x11-opensource-src-4.3.1.tar.gz 43118858
-RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 qt-x11-opensource-src-4.3.1.tar.gz 43118858
-SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 qt-x11-opensource-src-4.3.1.tar.gz 43118858
diff --git a/x11-libs/qt/files/qt-4.1.4-sparc.patch b/x11-libs/qt/files/qt-4.1.4-sparc.patch
deleted file mode 100644
index 0f9c8059bcbf..000000000000
--- a/x11-libs/qt/files/qt-4.1.4-sparc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- qt-x11-opensource-src-4.1.4/configure.orig	2006-09-22 15:47:43.000000000 -0600
-+++ qt-x11-opensource-src-4.1.4/configure	2006-09-22 21:17:12.000000000 -0600
-@@ -1821,6 +1821,12 @@
-     	fi
-     	ARCH=s390
-     	;;
-+    Linux:*:sparc*)
-+        if [ "$OPT_VERBOSE" = "yes" ]; then
-+            echo "    Linux on SPARC"
-+        fi
-+        ARCH=sparc
-+        ;;
-     *:*:*)
-         if [ "$OPT_VERBOSE" = "yes" ]; then
-             echo "    Trying '$UNAME_MACHINE'..."
diff --git a/x11-libs/qt/files/qt-4.3.0-alpha-threading.patch b/x11-libs/qt/files/qt-4.3.0-alpha-threading.patch
deleted file mode 100644
index 7d9d25801f33..000000000000
--- a/x11-libs/qt/files/qt-4.3.0-alpha-threading.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/corelib/arch/qatomic_alpha.h Mon Jul 16 08:55:06 2007
-+++ src/corelib/arch/qatomic_alpha.h Mon Jul 16 08:55:06 2007
-@@ -180,7 +180,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
-
- inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
-@@ -198,7 +198,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
-
- inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
-@@ -216,7 +216,7 @@
-                  : "=&r" (old), "=&r" (tmp), "+m"(*ptr)
-                  : "r" (value)
-                  : "memory");
--    return old != -1;
-+    return old;
- }
-
- #else // !Q_CC_GNU
\ No newline at end of file
diff --git a/x11-libs/qt/files/qt4-nomkdir.patch b/x11-libs/qt/files/qt4-nomkdir.patch
deleted file mode 100644
index 97ba71085e5a..000000000000
--- a/x11-libs/qt/files/qt4-nomkdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2005-06-03 13:38:58.316152040 -0500
-+++ configure	2005-06-03 13:39:36.673320864 -0500
-@@ -1071,16 +1071,6 @@
- [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations #default
- QT_INSTALL_TRANSLATIONS=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_TRANSLATIONS"`
- 
--#settings
--if [ "$PLATFORM_MAC" = "yes" ]; then
--   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/Library/Preferences/Qt #default
--else
--   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/etc/xdg #default
--fi
--if mkdir -p "$QT_INSTALL_SETTINGS" >/dev/null 2>&1; then
--  QT_INSTALL_SETTINGS=`(cd "$QT_INSTALL_SETTINGS"; /bin/pwd)` #absolute
--fi
--
- #examples
- [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES=$QT_INSTALL_PREFIX/examples #default
- QT_INSTALL_EXAMPLES=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_EXAMPLES"`
diff --git a/x11-libs/qt/files/qt4-parisc-linux.diff b/x11-libs/qt/files/qt4-parisc-linux.diff
deleted file mode 100644
index a3fd326114c9..000000000000
--- a/x11-libs/qt/files/qt4-parisc-linux.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr src/corelib/arch/parisc/arch.pri src/corelib/arch/parisc/arch.pri
---- src/corelib/arch/parisc/arch.pri	2006-06-02 15:35:32.000000000 +0200
-+++ src/corelib/arch/parisc/arch.pri	2006-06-02 15:39:49.000000000 +0200
-@@ -8,6 +8,14 @@
- DEPENDPATH += $$ARCH_CPP;$$ARCH_H
- 
- HEADERS += $$ARCH_H/qatomic.h
--SOURCES += $$ARCH_CPP/q_ldcw.s \
--	   $$ARCH_CPP/qatomic.cpp
-+SOURCES += $$ARCH_CPP/qatomic.cpp
-+
-+UNAME = $$system(uname -s)
-+
-+contains( UNAME, [lL]inux ) {
-+	SOURCES += $$ARCH_CPP/q_ldcw-Linux.s
-+} else {
-+	SOURCES += $$ARCH_CPP/q_ldcw.s
-+}
-+
- 
-diff -uNr src/corelib/arch/parisc/q_ldcw-Linux.s src/corelib/arch/parisc/q_ldcw-Linux.s
---- src/corelib/arch/parisc/q_ldcw-Linux.s	1970-01-01 01:00:00.000000000 +0100
-+++ src/corelib/arch/parisc/q_ldcw-Linux.s	2006-06-02 15:36:02.000000000 +0200
-@@ -0,0 +1,11 @@
-+
-+	.align 4
-+	.text
-+	.EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
-+q_ldcw:
-+	.PROC
-+	.CALLINFO FRAME=0,CALLS,SAVE_RP
-+	ldcw 0(%r26),%r1
-+	bv %r0(%r2)
-+	copy %r1,%r28
-+	.PROCEND
diff --git a/x11-libs/qt/files/qt4-sqlite-configure.patch b/x11-libs/qt/files/qt4-sqlite-configure.patch
deleted file mode 100644
index 75b69b624486..000000000000
--- a/x11-libs/qt/files/qt4-sqlite-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2006-11-26 10:20:41.000000000 +0100
-+++ configure	2006-11-26 10:22:49.000000000 +0100
-@@ -3595,8 +3595,8 @@
-                     if "$unixtests/compile.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS; then
-                         if [ "$CFG_SQL_sqlite" = "auto" ]; then
-                             CFG_SQL_sqlite=plugin
--                            QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
-                         fi
-+                        QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
-                     else
-                         SQLITE_AUTODETECT_FAILED="yes"
-                         CFG_SQL_sqlite=no
diff --git a/x11-libs/qt/files/utf8-bug-qt4-2.diff b/x11-libs/qt/files/utf8-bug-qt4-2.diff
deleted file mode 100644
index 4b7ee9c81401..000000000000
--- a/x11-libs/qt/files/utf8-bug-qt4-2.diff
+++ /dev/null
@@ -1,132 +0,0 @@
---- src/corelib/tools/qstring.cpp
-+++ src/corelib/tools/qstring.cpp
-@@ -3342,6 +3342,7 @@ QString QString::fromUtf8(const char *st
-     result.resize(size); // worst case
-     ushort *qch = result.d->data;
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -3359,6 +3360,12 @@ QString QString::fromUtf8(const char *st
-                         ushort low = uc%0x400 + 0xdc00;
-                         *qch++ = high;
-                         *qch++ = low;
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = 0xdbff;
-+                        *qch++ = 0xde00 + ((uchar)str[i]);
-                     } else {
-                         *qch++ = uc;
-                     }
-@@ -3381,14 +3388,17 @@ QString QString::fromUtf8(const char *st
-                 uc = ch & 0x1f;
-                 need = 1;
-                 error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-                 error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-                 error = i;
-+                min_uc = 0x10000;
-             } else {
-                 // Error
-                 qch = addOne(qch, result);
---- src/corelib/codecs/qutfcodec.cpp
-+++ src/corelib/codecs/qutfcodec.cpp
-@@ -117,15 +117,19 @@ QString QUtf8Codec::convertToUnicode(con
-     bool headerdone = false;
-     QChar replacement = QChar::ReplacementCharacter;
-     int need = 0;
-+    int error = -1;
-     uint uc = 0;
-+    uint min_uc = 0;
-     if (state) {
-         if (state->flags & IgnoreHeader)
-             headerdone = true;
-         if (state->flags & ConvertInvalidToNull)
-             replacement = QChar::Null;
-         need = state->remainingChars;
--        if (need)
-+        if (need) {
-             uc = state->state_data[0];
-+            min_uc = state->state_data[1];
-+        }
-     }
-     if (!headerdone && len > 3
-         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -142,7 +146,7 @@ QString QUtf8Codec::convertToUnicode(con
-     int invalid = 0;
- 
-     for (int i=0; i<len; i++) {
--        ch = *chars++;
-+        ch = chars[i];
-         if (need) {
-             if ((ch&0xc0) == 0x80) {
-                 uc = (uc << 6) | (ch & 0x3f);
-@@ -153,14 +157,27 @@ QString QUtf8Codec::convertToUnicode(con
-                         uc -= 0x10000;
-                         unsigned short high = uc/0x400 + 0xd800;
-                         unsigned short low = uc%0x400 + 0xdc00;
-+
-+                        // resize if necessary
-+                        long where = qch - result.unicode();
-+                        if (where + 2 >= result.size()) {
-+                            result.resize(where + 2);
-+                            qch = result.data() + where;
-+                        }
-+
-                         *qch++ = QChar(high);
-                         *qch++ = QChar(low);
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                        // error
-+                        *qch++ = QChar::ReplacementCharacter;
-+                        ++invalid;
-                     } else {
-                         *qch++ = uc;
-                     }
-                 }
-             } else {
-                 // error
-+                i = error;
-                 *qch++ = QChar::ReplacementCharacter;
-                 ++invalid;
-                 need = 0;
-@@ -171,12 +188,22 @@ QString QUtf8Codec::convertToUnicode(con
-             } else if ((ch & 0xe0) == 0xc0) {
-                 uc = ch & 0x1f;
-                 need = 1;
-+                error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-+                error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-+                error = i;
-+                min_uc = 0x10000;
-+            } else {
-+                // error
-+                *qch++ = QChar::ReplacementCharacter;
-+                ++invalid;
-             }
-         }
-     }
-@@ -187,6 +214,7 @@ QString QUtf8Codec::convertToUnicode(con
-         if (headerdone)
-             state->flags |= IgnoreHeader;
-         state->state_data[0] = need ? uc : 0;
-+        state->state_data[1] = need ? min_uc : 0;
-     }
-     return result;
- }
diff --git a/x11-libs/qt/qt-4.3.0-r2.ebuild b/x11-libs/qt/qt-4.3.0-r2.ebuild
deleted file mode 100644
index 16bf6a37a725..000000000000
--- a/x11-libs/qt/qt-4.3.0-r2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0-r2.ebuild,v 1.6 2007/08/15 14:23:46 jer Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-DEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXfont
-	x11-libs/libSM
-	x11-proto/xextproto
-	x11-proto/inputproto
-	dev-util/pkgconfig
-	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-	virtual/xft
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	tiff? ( media-libs/tiff )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( virtual/mysql )
-	firebird? ( dev-db/firebird )
-	sqlite3? ( =dev-db/sqlite-3* )
-	sqlite? ( =dev-db/sqlite-2* )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	glib? ( dev-libs/glib )
-	dbus? ( >=sys-apps/dbus-1.0.2 )
-	ssl? ( dev-libs/openssl )
-	input_devices_wacom? ( x11-drivers/linuxwacom )"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PF}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
-
-}
-
-qt_use() {
-	local flag="$1"
-	local feature="$1"
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
-
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
-}
-
-qt_mkspecs_dir() {
-	 # Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
-	epatch ${FILESDIR}/qt-4.2.3-hppa-ldcw-fix.patch
-	epatch ${FILESDIR}/qt-4.3.0-alpha-threading.patch
-
-	epatch ${FILESDIR}/0185-fix-format-strings.diff
-
-	cd ${S}/mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-e "/CONFIG/s:$: nostrip:" \
-		qmake.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" qmake.conf
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd ${S}/mkspecs/common
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd ${S}/qmake
-
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
-	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
-
-	cd ${S}
-
-}
-
-src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
-	# cases.  From bug #178535
-	myconf="${myconf} -reduce-relocations"
-
-	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"
-
-	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
-	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
-
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	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 -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	myconf="-stl -verbose -largefile -confirm-license \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	emake all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	make INSTALL_ROOT=${D} install_subtargets || die
-	make INSTALL_ROOT=${D} install_qmake || die
-	make INSTALL_ROOT=${D} install_mkspecs || die
-
-	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
-	fi
-
-	# Install the translations.	 This may get use flagged later somehow
-	make INSTALL_ROOT=${D} install_translations || die
-
-	keepdir "${QTSYSCONFDIR}"
-
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv ${D}/${QTLIBDIR}/pkgconfig/*.pc ${D}/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins ${FILESDIR}/qt4/*.desktop
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}
diff --git a/x11-libs/qt/qt-4.3.1.ebuild b/x11-libs/qt/qt-4.3.1.ebuild
deleted file mode 100644
index cf6a57c43b35..000000000000
--- a/x11-libs/qt/qt-4.3.1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.1.ebuild,v 1.10 2007/09/13 20:41:39 corsair Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	xinerama? ( x11-libs/libXinerama )
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	tiff? ( media-libs/tiff )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( virtual/mysql )
-	firebird? ( dev-db/firebird )
-	sqlite3? ( =dev-db/sqlite-3* )
-	sqlite? ( =dev-db/sqlite-2* )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	glib? ( dev-libs/glib )
-	dbus? ( >=sys-apps/dbus-1.0.2 )
-	ssl? ( dev-libs/openssl )
-	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
-
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	input_devices_wacom? ( x11-proto/inputproto )
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PF}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
-
-}
-
-qt_use() {
-	local flag="$1"
-	local feature="$1"
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
-
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
-}
-
-qt_mkspecs_dir() {
-	 # Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qt-4.2.3-hppa-ldcw-fix.patch
-	epatch ${FILESDIR}/qt-4.3.1-powerpc64.patch
-
-	cd ${S}/mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-e "/CONFIG/s:$: nostrip:" \
-		qmake.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" qmake.conf
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd ${S}/mkspecs/common
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd ${S}/qmake
-
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
-	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
-
-	cd ${S}
-
-}
-
-src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
-	# cases.  From bug #178535
-	myconf="${myconf} -reduce-relocations"
-
-	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"
-
-	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
-	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
-
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	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 -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	myconf="-stl -verbose -largefile -confirm-license \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	emake all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	make INSTALL_ROOT=${D} install_subtargets || die
-	make INSTALL_ROOT=${D} install_qmake || die
-	make INSTALL_ROOT=${D} install_mkspecs || die
-
-	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
-	fi
-
-	# Install the translations.	 This may get use flagged later somehow
-	make INSTALL_ROOT=${D} install_translations || die
-
-	keepdir "${QTSYSCONFDIR}"
-
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv ${D}/${QTLIBDIR}/pkgconfig/*.pc ${D}/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins ${FILESDIR}/qt4/*.desktop
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}
diff --git a/x11-libs/qt/qt-4.3.2.ebuild b/x11-libs/qt/qt-4.3.2.ebuild
index a393ea50b0b7..482b84d632b9 100644
--- a/x11-libs/qt/qt-4.3.2.ebuild
+++ b/x11-libs/qt/qt-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.2 2007/10/03 18:00:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.3 2007/10/23 12:41:15 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -228,16 +228,16 @@ src_install() {
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
-	make INSTALL_ROOT="${D}" install_subtargets || die
-	make INSTALL_ROOT="${D}" install_qmake || die
-	make INSTALL_ROOT="${D}" install_mkspecs || die
+	emake INSTALL_ROOT="${D}" install_subtargets || die
+	emake INSTALL_ROOT="${D}" install_qmake || die
+	emake INSTALL_ROOT="${D}" install_mkspecs || die
 
 	if use doc; then
-		make INSTALL_ROOT="${D}" install_htmldocs || die
+		emake INSTALL_ROOT="${D}" install_htmldocs || die
 	fi
 
 	# Install the translations.	 This may get use flagged later somehow
-	make INSTALL_ROOT="${D}" install_translations || die
+	emake INSTALL_ROOT="${D}" install_translations || die
 
 	keepdir "${QTSYSCONFDIR}"