re-add x86 because this is the preferred hardened version for x86

Package-Manager: portage-2.1.2.2

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 45ab09e9538ae46581b7207b92a7511be2b9a839..e27c828917ed825e9abb5ea7cd61b0378e324ed0 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # 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.435 2007/04/18 18:10:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.436 2007/04/20 16:41:43 caleb Exp $
+
+  20 Apr 2007; Caleb Tennis <caleb@gentoo.org> qt-3.3.4-r8.ebuild:
+  re-add x86 because this is the preferred hardened version for x86
 
   18 Apr 2007; Caleb Tennis <caleb@gentoo.org>
   -files/qt-3.3.5-immodule.patch, -files/qt-3.3.6-CVE-2006-4811-bis.patch,

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 44cb3125f72e3dc174b99ae23e17b646070879c7..bc651b4f7ac45570fe0c8c6cf1df5345649bd25d 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -115,10 +115,10 @@ DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 DIST qt-x11-opensource-src-4.2.3.tar.gz 37635710 RMD160 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 SHA1 b988aab4fa1dcce8532c36bb63947a556076e8c8 SHA256 c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-EBUILD qt-3.3.4-r8.ebuild 10447 RMD160 537e65af09d1034192c7d46f32d0b21e1a806443 SHA1 b913e71c83105f4e81def17dee2f2637d22857fe SHA256 709be4da8cfc9e333a74d762137ebd4e75e9c7bfd85957d3724bb83068693a1d
-MD5 59a454ed21ad1579424b9209883fbd48 qt-3.3.4-r8.ebuild 10447
-RMD160 537e65af09d1034192c7d46f32d0b21e1a806443 qt-3.3.4-r8.ebuild 10447
-SHA256 709be4da8cfc9e333a74d762137ebd4e75e9c7bfd85957d3724bb83068693a1d qt-3.3.4-r8.ebuild 10447
+EBUILD qt-3.3.4-r8.ebuild 10451 RMD160 cc863ffa9800e6c6124c06e6c94060990761e8d2 SHA1 f4b9d0da4bb845a8cb2bc6a9368e24f1c3d99e79 SHA256 6e949f4c7db39319bd6c5d06567bddbd254defbe3720a48a4cd6bdb802f56e62
+MD5 4e6e5774157c1f7bba1337b44b6d643d qt-3.3.4-r8.ebuild 10451
+RMD160 cc863ffa9800e6c6124c06e6c94060990761e8d2 qt-3.3.4-r8.ebuild 10451
+SHA256 6e949f4c7db39319bd6c5d06567bddbd254defbe3720a48a4cd6bdb802f56e62 qt-3.3.4-r8.ebuild 10451
 EBUILD qt-3.3.8-r2.ebuild 11319 RMD160 5af4500fb6f2a6698bb3abb11fbad49d8a34e873 SHA1 5d7fa5d8aa36dd7f6202771e37602034d6d937a6 SHA256 a8d5baa630300a0e592cdd5fe94399ee814edfdadb88bd735669e1ccc18e1f01
 MD5 e5b7f11d9514ac2665e0eb75ebf82d3d qt-3.3.8-r2.ebuild 11319
 RMD160 5af4500fb6f2a6698bb3abb11fbad49d8a34e873 qt-3.3.8-r2.ebuild 11319
@@ -127,10 +127,10 @@ EBUILD qt-4.2.3-r1.ebuild 7856 RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 S
 MD5 73dbcb21eb75b0cac5609776ccc2b7cc qt-4.2.3-r1.ebuild 7856
 RMD160 10973306cc2da7479e7a67f265bfad8b7934c3d6 qt-4.2.3-r1.ebuild 7856
 SHA256 ee0cd48cbff455f8207226e566b3353e655397c963d2690a56dee5285b4b92e9 qt-4.2.3-r1.ebuild 7856
-MISC ChangeLog 28092 RMD160 16eb5e789789f0469581e568407b28c4c135b6b4 SHA1 6c42691373bea3d6d7c3260877b5720e710d9248 SHA256 fe66236b62ed8273aef789f4d4608afc2b899bc29cfb6ccb5b8035631cbfdf37
-MD5 0543caa6e383a5f735984dd06abb874a ChangeLog 28092
-RMD160 16eb5e789789f0469581e568407b28c4c135b6b4 ChangeLog 28092
-SHA256 fe66236b62ed8273aef789f4d4608afc2b899bc29cfb6ccb5b8035631cbfdf37 ChangeLog 28092
+MISC ChangeLog 28228 RMD160 ffe3f5ac787b0bbbdc6f5eacf4dc83da545b773c SHA1 bfed1eaf1727bacbb88eb31d1a3dd1ffc3877353 SHA256 5ed238a2ce50d86a5f684dc196647349d6c49825e6ec8f6266a4ce4f4fb58727
+MD5 5aa36c3872e21fd2e5bb4443398f655e ChangeLog 28228
+RMD160 ffe3f5ac787b0bbbdc6f5eacf4dc83da545b773c ChangeLog 28228
+SHA256 5ed238a2ce50d86a5f684dc196647349d6c49825e6ec8f6266a4ce4f4fb58727 ChangeLog 28228
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156

diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
index f17b156005a13b1849fbc29102bf4de7b9f475e4..416f47751dc6b81df86441a2e31d58b8350dc3c4 100644 (file)
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r8.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-3.3.4-r8.ebuild,v 1.23 2007/04/18 18:10:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.24 2007/04/20 16:41:43 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 
 SLOT="3"
-KEYWORDS="mips"
+KEYWORDS="mips x86"
 IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
 DEPEND="|| ( ( x11-libs/libXcursor