Removed 3.2.x patch for mips, and moved to stable.

3 files changed, 19 insertions, 19 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index bdf9c4728044..50193b0a05da 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.169 2004/08/21 20:08:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.170 2004/08/23 15:15:16 psi29a Exp $
+
+  23 Aug 2004; psi29a <psi29a@gentoo.org> qt-3.3.3.ebuild:
+  Removed mips patch, as it is no longer necessary with > 3.2.x and marked
+  stabled for mips
 
   22 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> qt-3.3.2.ebuild,
   +files/qt-3.3.2-immodule-20040819.patch,
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index abbfe443db37..5fe48d0c964d 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,25 +1,25 @@
-MD5 6aa3144503a7bc4b1d9f726f3ae47f0a ChangeLog 28352
+MD5 1be37264496deebc1bbbf7ef32b8f3fb ChangeLog 28507
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 c167f38f82d95bc8e7414bf15cbd693b qt-2.3.2-r1.ebuild 2282
 MD5 3dc117d667771d6bd5a766379d5487b4 qt-3.2.3-r1.ebuild 5119
-MD5 d9b8b0e6b856cf46205585912768c2dd qt-3.3.3.ebuild 6680
-MD5 b83909322f8f81e54f4e183a991f6e61 qt-3.3.2.ebuild 6923
 MD5 c31b58bb9bef0cf4b24823c9c7ce4d56 qt-3.3.1-r2.ebuild 5733
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
-MD5 ab6a47187e18bb5504032e8bae9d6ac0 files/digest-qt-3.3.3 252
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 b83909322f8f81e54f4e183a991f6e61 qt-3.3.2.ebuild 6923
+MD5 1abe88a0a852c4a80c74190bf3aa0281 qt-3.3.3.ebuild 6441
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
-MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
 MD5 5fa847107fbfecae865fe8b9e6f79097 files/digest-qt-3.3.2 252
+MD5 ab6a47187e18bb5504032e8bae9d6ac0 files/digest-qt-3.3.3 252
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
+MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
index 5bd9427b9261..041679954fc0 100644
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ b/x11-libs/qt/qt-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.11 2004/08/21 18:48:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.12 2004/08/23 15:15:16 psi29a Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
-KEYWORDS="x86 alpha ppc amd64 sparc hppa ~mips ppc64"
+KEYWORDS="x86 alpha ppc amd64 sparc hppa mips ppc64"
 IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
 
 DEPEND="virtual/x11 virtual/xft
@@ -79,10 +79,6 @@ src_unpack() {
 		sh make-symlinks.sh || die "make symlinks failed"
 	fi
 
-	# mips requires this patch to pass a CFLAG to gcc/g++ (which passes it to the assembler).
-	# It tells the assembler to relax branches on mips, otherwise we get build errors.
-	use mips && epatch ${FILESDIR}/${P}-mips-relax-branches.patch
-
 #	use icc && export PLATFORM=linux-icc
 }