Clean up old revisions.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 15 insertions, 1293 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index bac094c57f5c..c98ac57adcae 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.70 2010/03/29 22:28:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.71 2010/03/29 22:35:42 eva Exp $
+
+  29 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -webkit-gtk-0_p40220-r1.ebuild,
+  -files/webkit-gtk-0_p40220-gcc44-aliasing.patch,
+  -webkit-gtk-1.1.10.ebuild,
+  -files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch,
+  -webkit-gtk-1.1.15.2.ebuild, -files/webkit-gtk-CVE-2009-0945.patch,
+  metadata.xml:
+  Clean up old revisions.
 
   29 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   webkit-gtk-1.1.15.4.ebuild, +files/webkit-gtk-1.1.15.4-icu44.patch:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ddc9451fe071..236fd06b1002 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
-AUX webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch 363 RMD160 89f5fb0c5ac6925ba01b2b1eeb67c28784cacbe3 SHA1 ddb49156ffc156930494026195cbfd3d428ae958 SHA256 4824005e4178b78a50b3f0d2bd31f06c8ccc35197f631a60839b613bdc36a491
 AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb0750b2baaab5 SHA1 fd1ddaff12705784662002554a76aea67ff70320 SHA256 8b20af7ccad9d91f8d76465843b6a40e80c59c8e9620cf7772ba6f64406b3e68
 AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
 AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e
-AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
-DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
-DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735 SHA1 8f0637c936b4f62fb21c8d0c35298e5c0317fd0a SHA256 4eb4fc4a3f47edbc18c9dc09d54fd2189954ebaa0e521b0ab97e21087d8c9855
-DIST webkit-1.1.15.2.tar.gz 6081293 RMD160 21298d312214ad0655703571286e81d553098fbb SHA1 ebf0fd805dd8397ae11701341806cd78002baa18 SHA256 ae76bf52bd7b57fd4b4ee5894f72d0fdb6ad550051efb6424f6a4466796798ac
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
-EBUILD webkit-gtk-0_p40220-r1.ebuild 2017 RMD160 e0c5faca4ae98256b4b964fde174e932aad08d6e SHA1 6de0cd2a6d02773f13d00232ac66aa2073df17db SHA256 1220f0c9faff1820bcb8ddebaf3a3a0e0b133456fd6497f40311463efbffad69
-EBUILD webkit-gtk-1.1.10.ebuild 2976 RMD160 ecc59930e536131d688ce880f367700c5bcd1e47 SHA1 08ea90e8553cd00f3aa1fc2755b8449f5404525f SHA256 e00bdd4a2374365af63e84773cdb312a2f81ad032070ac9e7229b945b3ff460d
-EBUILD webkit-gtk-1.1.15.2.ebuild 2552 RMD160 837dac1f7b95d3572c8ebad053b21b7f5747067f SHA1 ae8639397b29ed382188206c8d1ef247bb034ae0 SHA256 992e770a8e310d72d0d4ea975d9c9e81a16eb0d67e551e64d9618b277fa0c672
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
-MISC ChangeLog 14342 RMD160 ec1f2b107c7a284e34f773304386f443d1fe2c29 SHA1 51141aaec9ab93a102dee79dc4ac6dc06abb190d SHA256 f266c838cbb5ccb1c1fcd74582e25f888b61f8807bc69e312329f5d784e20a92
-MISC metadata.xml 591 RMD160 18f8c12c97d9acfac4f369a8fdec00849d353052 SHA1 621335f7f66103ecd503aa389dd7368c7e1fc82e SHA256 0aa4a85244811bc10d7863b4b2f55d95100f8fa9df55827fb392c2b4c74f281d
+MISC ChangeLog 14682 RMD160 7a1c52a2dbca71817f923855480deedfd9ef5edd SHA1 8e47220bab6bda1c53bfc5dc3447e2b95e203059 SHA256 d12e113ed420a427aa17b6aa3781b486deccc08d68e5f1ea536674586ad300e0
+MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuxKZMACgkQ1fmVwcYIWAZ8ugCfevL3p8cf1nwDYp/AdMTCn+Ai
-R94AoK880TRb5nAMao5LuivDXMAVSkwA
-=u8Q/
+iEYEARECAAYFAkuxK0QACgkQ1fmVwcYIWAbDvQCZATIwuZnmuY59ygwJ0m7aP8SV
+NLIAnjFEw0LpMV+EsFcClLj6H3kw1MEo
+=Dsd7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-0_p40220-gcc44-aliasing.patch b/net-libs/webkit-gtk/files/webkit-gtk-0_p40220-gcc44-aliasing.patch
deleted file mode 100644
index 212659e31809..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-0_p40220-gcc44-aliasing.patch
+++ /dev/null
@@ -1,954 +0,0 @@
-diff -Naurp WebKit-r40220-orig/JavaScriptCore/wtf/dtoa.cpp WebKit-r40220/JavaScriptCore/wtf/dtoa.cpp
---- WebKit-r40220-orig/JavaScriptCore/wtf/dtoa.cpp	2009-01-22 17:57:26.000000000 -0600
-+++ WebKit-r40220/JavaScriptCore/wtf/dtoa.cpp	2009-04-09 14:55:22.000000000 -0600
-@@ -189,13 +189,13 @@ typedef union { double d; uint32_t L[2];
- #endif
- #else
- #ifdef IEEE_8087
--#define word0(x) ((U*)&x)->L[1]
--#define word1(x) ((U*)&x)->L[0]
-+#define word0(x) (x)->L[1]
-+#define word1(x) (x)->L[0]
- #else
--#define word0(x) ((U*)&x)->L[0]
--#define word1(x) ((U*)&x)->L[1]
-+#define word0(x) (x)->L[0]
-+#define word1(x) (x)->L[1]
- #endif
--#define dval(x) ((U*)&x)->d
-+#define dval(x) (x)->d
- #endif
- 
- /* The following definition of Storeinc is appropriate for MIPS processors.
-@@ -772,10 +772,10 @@ static Bigint* diff(Bigint* a, Bigint* b
-     return c;
- }
- 
--static double ulp(double x)
-+static double ulp(U *x)
- {
-     register int32_t L;
--    double a;
-+    U u;
- 
-     L = (word0(x) & Exp_mask) - (P - 1) * Exp_msk1;
- #ifndef Avoid_Underflow
-@@ -783,24 +783,24 @@ static double ulp(double x)
-     if (L > 0) {
- #endif
- #endif
--        word0(a) = L;
--        word1(a) = 0;
-+        word0(&u) = L;
-+        word1(&u) = 0;
- #ifndef Avoid_Underflow
- #ifndef Sudden_Underflow
-     } else {
-         L = -L >> Exp_shift;
-         if (L < Exp_shift) {
--            word0(a) = 0x80000 >> L;
--            word1(a) = 0;
-+            word0(&u) = 0x80000 >> L;
-+            word1(&u) = 0;
-         } else {
--            word0(a) = 0;
-+            word0(&u) = 0;
-             L -= Exp_shift;
--            word1(a) = L >= 31 ? 1 : 1 << 31 - L;
-+            word1(&u) = L >= 31 ? 1 : 1 << 31 - L;
-         }
-     }
- #endif
- #endif
--    return dval(a);
-+    return dval(&u);
- }
- 
- static double b2d(Bigint* a, int* e)
-@@ -811,10 +811,10 @@ static double b2d(Bigint* a, int* e)
-     uint32_t y;
-     uint32_t z;
-     int k;
--    double d;
-+    U d;
- 
--#define d0 word0(d)
--#define d1 word1(d)
-+#define d0 word0(&d)
-+#define d1 word1(&d)
- 
-     xa0 = a->x;
-     xa = xa0 + a->wds;
-@@ -824,16 +824,16 @@ static double b2d(Bigint* a, int* e)
-     *e = 32 - k;
- #ifdef Pack_32
-     if (k < Ebits) {
--        d0 = Exp_1 | y >> Ebits - k;
-+        d0 = Exp_1 | (y >> (Ebits - k));
-         w = xa > xa0 ? *--xa : 0;
--        d1 = y << (32 - Ebits) + k | w >> Ebits - k;
-+        d1 = (y << (32 - Ebits + k)) | (w >> (Ebits - k));
-         goto ret_d;
-     }
-     z = xa > xa0 ? *--xa : 0;
-     if (k -= Ebits) {
--        d0 = Exp_1 | y << k | z >> 32 - k;
-+        d0 = Exp_1 | (y << k) | (z >> (32 - k));
-         y = xa > xa0 ? *--xa : 0;
--        d1 = z << k | y >> 32 - k;
-+        d1 = (z << k) | (y >> (32 - k));
-     } else {
-         d0 = Exp_1 | y;
-         d1 = z;
-@@ -857,10 +857,10 @@ static double b2d(Bigint* a, int* e)
- ret_d:
- #undef d0
- #undef d1
--    return dval(d);
-+    return dval(&d);
- }
- 
--static Bigint* d2b(double d, int* e, int* bits)
-+static Bigint* d2b(U* d, int* e, int* bits)
- {
-     Bigint* b;
-     int de, k;
-@@ -889,7 +889,7 @@ static Bigint* d2b(double d, int* e, int
- #ifdef Pack_32
-     if ((y = d1)) {
-         if ((k = lo0bits(&y))) {
--            x[0] = y | z << 32 - k;
-+            x[0] = y | (z << (32 - k));
-             z >>= k;
-         } else
-             x[0] = y;
-@@ -965,23 +965,23 @@ static Bigint* d2b(double d, int* e, int
- 
- static double ratio(Bigint* a, Bigint* b)
- {
--    double da, db;
-+    U da, db;
-     int k, ka, kb;
- 
--    dval(da) = b2d(a, &ka);
--    dval(db) = b2d(b, &kb);
-+    dval(&da) = b2d(a, &ka);
-+    dval(&db) = b2d(b, &kb);
- #ifdef Pack_32
-     k = ka - kb + 32 * (a->wds - b->wds);
- #else
-     k = ka - kb + 16 * (a->wds - b->wds);
- #endif
-     if (k > 0)
--        word0(da) += k * Exp_msk1;
-+        word0(&da) += k * Exp_msk1;
-     else {
-         k = -k;
--        word0(db) += k * Exp_msk1;
-+        word0(&db) += k * Exp_msk1;
-     }
--    return dval(da) / dval(db);
-+    return dval(&da) / dval(&db);
- }
- 
- static const double tens[] = {
-@@ -1031,7 +1031,7 @@ static int match(const char** sp, const 
- }
- 
- #ifndef No_Hex_NaN
--static void hexnan(double* rvp, const char** sp)
-+static void hexnan(U* rvp, const char** sp)
- {
-     uint32_t c, x[2];
-     const char* s;
-@@ -1070,8 +1070,8 @@ static void hexnan(double* rvp, const ch
-         x[1] = (x[1] << 4) | c;
-     }
-     if ((x[0] &= 0xfffff) || x[1]) {
--        word0(*rvp) = Exp_mask | x[0];
--        word1(*rvp) = x[1];
-+        word0(rvp) = Exp_mask | x[0];
-+        word1(rvp) = x[1];
-     }
- }
- #endif /*No_Hex_NaN*/
-@@ -1085,7 +1085,8 @@ double strtod(const char* s00, char** se
-     int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-          e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-     const char *s, *s0, *s1;
--    double aadj, aadj1, adj, rv, rv0;
-+    double aadj, aadj1;
-+    U aadj2, adj, rv, rv0;
-     int32_t L;
-     uint32_t y, z;
-     Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
-@@ -1094,7 +1095,7 @@ double strtod(const char* s00, char** se
- #endif
- 
-     sign = nz0 = nz = 0;
--    dval(rv) = 0.;
-+    dval(&rv) = 0;
-     for (s = s00; ; s++)
-         switch (*s) {
-             case '-':
-@@ -1209,16 +1210,16 @@ dig_done:
-                         --s;
-                         if (!match(&s,"inity"))
-                             ++s;
--                        word0(rv) = 0x7ff00000;
--                        word1(rv) = 0;
-+                        word0(&rv) = 0x7ff00000;
-+                        word1(&rv) = 0;
-                         goto ret;
-                     }
-                     break;
-                 case 'n':
-                 case 'N':
-                     if (match(&s, "an")) {
--                        word0(rv) = NAN_WORD0;
--                        word1(rv) = NAN_WORD1;
-+                        word0(&rv) = NAN_WORD0;
-+                        word1(&rv) = NAN_WORD1;
- #ifndef No_Hex_NaN
-                         if (*s == '(') /*)*/
-                             hexnan(&rv, &s);
-@@ -1243,13 +1244,13 @@ ret0:
-     if (!nd0)
-         nd0 = nd;
-     k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
--    dval(rv) = y;
-+    dval(&rv) = y;
-     if (k > 9) {
- #ifdef SET_INEXACT
-         if (k > DBL_DIG)
-             oldinexact = get_inexact();
- #endif
--        dval(rv) = tens[k - 9] * dval(rv) + z;
-+        dval(&rv) = tens[k - 9] * dval(&rv) + z;
-     }
-     bd0 = 0;
-     if (nd <= DBL_DIG && Flt_Rounds == 1) {
-@@ -1257,7 +1258,7 @@ ret0:
-             goto ret;
-         if (e > 0) {
-             if (e <= Ten_pmax) {
--                /* rv = */ rounded_product(dval(rv), tens[e]);
-+                /* rv = */ rounded_product(dval(&rv), tens[e]);
-                 goto ret;
-             }
-             i = DBL_DIG - nd;
-@@ -1266,14 +1267,14 @@ ret0:
-                  * this for larger i values.
-                  */
-                 e -= i;
--                dval(rv) *= tens[i];
--                /* rv = */ rounded_product(dval(rv), tens[e]);
-+                dval(&rv) *= tens[i];
-+                /* rv = */ rounded_product(dval(&rv), tens[e]);
-                 goto ret;
-             }
-         }
- #ifndef Inaccurate_Divide
-         else if (e >= -Ten_pmax) {
--            /* rv = */ rounded_quotient(dval(rv), tens[-e]);
-+            /* rv = */ rounded_quotient(dval(&rv), tens[-e]);
-             goto ret;
-         }
- #endif
-@@ -1293,7 +1294,7 @@ ret0:
- 
-     if (e1 > 0) {
-         if ((i = e1 & 15))
--            dval(rv) *= tens[i];
-+            dval(&rv) *= tens[i];
-         if (e1 &= ~15) {
-             if (e1 > DBL_MAX_10_EXP) {
- ovfl:
-@@ -1301,12 +1302,12 @@ ovfl:
-                 errno = ERANGE;
- #endif
-                 /* Can't trust HUGE_VAL */
--                word0(rv) = Exp_mask;
--                word1(rv) = 0;
-+                word0(&rv) = Exp_mask;
-+                word1(&rv) = 0;
- #ifdef SET_INEXACT
-                 /* set overflow bit */
--                dval(rv0) = 1e300;
--                dval(rv0) *= dval(rv0);
-+                dval(&rv0) = 1e300;
-+                dval(&rv0) *= dval(&rv0);
- #endif
-                 if (bd0)
-                     goto retfree;
-@@ -1315,24 +1316,24 @@ ovfl:
-             e1 >>= 4;
-             for (j = 0; e1 > 1; j++, e1 >>= 1)
-                 if (e1 & 1)
--                    dval(rv) *= bigtens[j];
-+                    dval(&rv) *= bigtens[j];
-         /* The last multiplication could overflow. */
--            word0(rv) -= P * Exp_msk1;
--            dval(rv) *= bigtens[j];
--            if ((z = word0(rv) & Exp_mask) > Exp_msk1 * (DBL_MAX_EXP + Bias - P))
-+            word0(&rv) -= P * Exp_msk1;
-+            dval(&rv) *= bigtens[j];
-+            if ((z = word0(&rv) & Exp_mask) > Exp_msk1 * (DBL_MAX_EXP + Bias - P))
-                 goto ovfl;
-             if (z > Exp_msk1 * (DBL_MAX_EXP + Bias - 1 - P)) {
-                 /* set to largest number */
-                 /* (Can't trust DBL_MAX) */
--                word0(rv) = Big0;
--                word1(rv) = Big1;
-+                word0(&rv) = Big0;
-+                word1(&rv) = Big1;
-             } else
--                word0(rv) += P * Exp_msk1;
-+                word0(&rv) += P * Exp_msk1;
-         }
-     } else if (e1 < 0) {
-         e1 = -e1;
-         if ((i = e1 & 15))
--            dval(rv) /= tens[i];
-+            dval(&rv) /= tens[i];
-         if (e1 >>= 4) {
-             if (e1 >= 1 << n_bigtens)
-                 goto undfl;
-@@ -1341,32 +1342,32 @@ ovfl:
-                 scale = 2 * P;
-             for (j = 0; e1 > 0; j++, e1 >>= 1)
-                 if (e1 & 1)
--                    dval(rv) *= tinytens[j];
--            if (scale && (j = (2 * P) + 1 - ((word0(rv) & Exp_mask) >> Exp_shift)) > 0) {
-+                    dval(&rv) *= tinytens[j];
-+            if (scale && (j = (2 * P) + 1 - ((word0(&rv) & Exp_mask) >> Exp_shift)) > 0) {
-                 /* scaled rv is denormal; zap j low bits */
-                 if (j >= 32) {
--                    word1(rv) = 0;
-+                    word1(&rv) = 0;
-                     if (j >= 53)
--                       word0(rv) = (P + 2) * Exp_msk1;
-+                       word0(&rv) = (P + 2) * Exp_msk1;
-                     else
--                       word0(rv) &= 0xffffffff << j - 32;
-+                       word0(&rv) &= 0xffffffff << (j - 32);
-                 } else
--                    word1(rv) &= 0xffffffff << j;
-+                    word1(&rv) &= 0xffffffff << j;
-             }
- #else
-             for (j = 0; e1 > 1; j++, e1 >>= 1)
-                 if (e1 & 1)
--                    dval(rv) *= tinytens[j];
-+                    dval(&rv) *= tinytens[j];
-             /* The last multiplication could underflow. */
--            dval(rv0) = dval(rv);
--            dval(rv) *= tinytens[j];
--            if (!dval(rv)) {
--                dval(rv) = 2. * dval(rv0);
--                dval(rv) *= tinytens[j];
-+            dval(&rv0) = dval(&rv);
-+            dval(&rv) *= tinytens[j];
-+            if (!dval(&rv)) {
-+                dval(&rv) = 2. * dval(&rv0);
-+                dval(&rv) *= tinytens[j];
- #endif
--                if (!dval(rv)) {
-+                if (!dval(&rv)) {
- undfl:
--                    dval(rv) = 0.;
-+                    dval(&rv) = 0.;
- #ifndef NO_ERRNO
-                     errno = ERANGE;
- #endif
-@@ -1375,8 +1376,8 @@ undfl:
-                     goto ret;
-                 }
- #ifndef Avoid_Underflow
--                word0(rv) = Tiny0;
--                word1(rv) = Tiny1;
-+                word0(&rv) = Tiny0;
-+                word1(&rv) = Tiny1;
-                 /* The refinement below will clean
-                  * this approximation up.
-                  */
-@@ -1394,7 +1395,7 @@ undfl:
-     for (;;) {
-         bd = Balloc(bd0->k);
-         Bcopy(bd, bd0);
--        bb = d2b(dval(rv), &bbe, &bbbits);    /* rv = bb * 2^bbe */
-+        bb = d2b(&rv, &bbe, &bbbits);    /* rv = bb * 2^bbe */
-         bs = i2b(1);
- 
-         if (e >= 0) {
-@@ -1464,11 +1465,11 @@ undfl:
-             /* Error is less than half an ulp -- check for
-              * special case of mantissa a power of two.
-              */
--            if (dsign || word1(rv) || word0(rv) & Bndry_mask
-+            if (dsign || word1(&rv) || word0(&rv) & Bndry_mask
- #ifdef Avoid_Underflow
--             || (word0(rv) & Exp_mask) <= (2 * P + 1) * Exp_msk1
-+             || (word0(&rv) & Exp_mask) <= (2 * P + 1) * Exp_msk1
- #else
--             || (word0(rv) & Exp_mask) <= Exp_msk1
-+             || (word0(&rv) & Exp_mask) <= Exp_msk1
- #endif
-                 ) {
- #ifdef SET_INEXACT
-@@ -1492,26 +1493,26 @@ undfl:
-         if (i == 0) {
-             /* exactly half-way between */
-             if (dsign) {
--                if ((word0(rv) & Bndry_mask1) == Bndry_mask1
--                 &&  word1(rv) == (
-+                if ((word0(&rv) & Bndry_mask1) == Bndry_mask1
-+                 &&  word1(&rv) == (
- #ifdef Avoid_Underflow
--            (scale && (y = word0(rv) & Exp_mask) <= 2 * P * Exp_msk1)
-+            (scale && (y = word0(&rv) & Exp_mask) <= 2 * P * Exp_msk1)
-         ? (0xffffffff & (0xffffffff << (2 * P + 1 - (y >> Exp_shift)))) :
- #endif
-                            0xffffffff)) {
-                     /*boundary case -- increment exponent*/
--                    word0(rv) = (word0(rv) & Exp_mask) + Exp_msk1;
--                    word1(rv) = 0;
-+                    word0(&rv) = (word0(&rv) & Exp_mask) + Exp_msk1;
-+                    word1(&rv) = 0;
- #ifdef Avoid_Underflow
-                     dsign = 0;
- #endif
-                     break;
-                 }
--            } else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
-+            } else if (!(word0(&rv) & Bndry_mask) && !word1(&rv)) {
- drop_down:
-                 /* boundary case -- decrement exponent */
- #ifdef Sudden_Underflow /*{{*/
--                L = word0(rv) & Exp_mask;
-+                L = word0(&rv) & Exp_mask;
- #ifdef Avoid_Underflow
-                 if (L <= (scale ? (2 * P + 1) * Exp_msk1 : Exp_msk1))
- #else
-@@ -1522,7 +1523,7 @@ drop_down:
- #else /*Sudden_Underflow}{*/
- #ifdef Avoid_Underflow
-                 if (scale) {
--                    L = word0(rv) & Exp_mask;
-+                    L = word0(&rv) & Exp_mask;
-                     if (L <= (2 * P + 1) * Exp_msk1) {
-                         if (L > (P + 2) * Exp_msk1)
-                             /* round even ==> */
-@@ -1533,20 +1534,20 @@ drop_down:
-                     }
-                 }
- #endif /*Avoid_Underflow*/
--                L = (word0(rv) & Exp_mask) - Exp_msk1;
-+                L = (word0(&rv) & Exp_mask) - Exp_msk1;
- #endif /*Sudden_Underflow}}*/
--                word0(rv) = L | Bndry_mask1;
--                word1(rv) = 0xffffffff;
-+                word0(&rv) = L | Bndry_mask1;
-+                word1(&rv) = 0xffffffff;
-                 break;
-             }
--            if (!(word1(rv) & LSB))
-+            if (!(word1(&rv) & LSB))
-                 break;
-             if (dsign)
--                dval(rv) += ulp(dval(rv));
-+                dval(&rv) += ulp(&rv);
-             else {
--                dval(rv) -= ulp(dval(rv));
-+                dval(&rv) -= ulp(&rv);
- #ifndef Sudden_Underflow
--                if (!dval(rv))
-+                if (!dval(&rv))
-                     goto undfl;
- #endif
-             }
-@@ -1558,9 +1559,9 @@ drop_down:
-         if ((aadj = ratio(delta, bs)) <= 2.) {
-             if (dsign)
-                 aadj = aadj1 = 1.;
--            else if (word1(rv) || word0(rv) & Bndry_mask) {
-+            else if (word1(&rv) || word0(&rv) & Bndry_mask) {
- #ifndef Sudden_Underflow
--                if (word1(rv) == Tiny1 && !word0(rv))
-+                if (word1(&rv) == Tiny1 && !word0(&rv))
-                     goto undfl;
- #endif
-                 aadj = 1.;
-@@ -1592,23 +1593,23 @@ drop_down:
-                 aadj1 += 0.5;
- #endif /*Check_FLT_ROUNDS*/
-         }
--        y = word0(rv) & Exp_mask;
-+        y = word0(&rv) & Exp_mask;
- 
-         /* Check for overflow */
- 
-         if (y == Exp_msk1 * (DBL_MAX_EXP + Bias - 1)) {
--            dval(rv0) = dval(rv);
--            word0(rv) -= P * Exp_msk1;
--            adj = aadj1 * ulp(dval(rv));
--            dval(rv) += adj;
--            if ((word0(rv) & Exp_mask) >= Exp_msk1 * (DBL_MAX_EXP + Bias - P)) {
--                if (word0(rv0) == Big0 && word1(rv0) == Big1)
-+            dval(&rv0) = dval(&rv);
-+            word0(&rv) -= P * Exp_msk1;
-+            adj.d = aadj1 * ulp(&rv);
-+            dval(&rv) += adj.d;
-+            if ((word0(&rv) & Exp_mask) >= Exp_msk1 * (DBL_MAX_EXP + Bias - P)) {
-+                if (word0(&rv0) == Big0 && word1(&rv0) == Big1)
-                     goto ovfl;
--                word0(rv) = Big0;
--                word1(rv) = Big1;
-+                word0(&rv) = Big0;
-+                word1(&rv) = Big1;
-                 goto cont;
-             } else
--                word0(rv) += P * Exp_msk1;
-+                word0(&rv) += P * Exp_msk1;
-         } else {
- #ifdef Avoid_Underflow
-             if (scale && y <= 2 * P * Exp_msk1) {
-@@ -1618,30 +1619,32 @@ drop_down:
-                     aadj = z;
-                     aadj1 = dsign ? aadj : -aadj;
-                 }
--                word0(aadj1) += (2 * P + 1) * Exp_msk1 - y;
-+                dval(&aadj2) = aadj1;
-+                word0(&aadj2) += (2 * P + 1) * Exp_msk1 - y;
-+                aadj1 = dval(&aadj2);
-             }
--            adj = aadj1 * ulp(dval(rv));
--            dval(rv) += adj;
-+            adj.d = aadj1 * ulp(&rv);
-+            dval(&rv) += adj.d;
- #else
- #ifdef Sudden_Underflow
--            if ((word0(rv) & Exp_mask) <= P * Exp_msk1) {
--                dval(rv0) = dval(rv);
--                word0(rv) += P * Exp_msk1;
--                adj = aadj1 * ulp(dval(rv));
--                dval(rv) += adj;
--                if ((word0(rv) & Exp_mask) <= P * Exp_msk1)
-+            if ((word0(&rv) & Exp_mask) <= P * Exp_msk1) {
-+                dval(&rv0) = dval(&rv);
-+                word0(&rv) += P * Exp_msk1;
-+                adj.d = aadj1 * ulp(&rv);
-+                dval(&rv) += adj.d;
-+                if ((word0(&rv) & Exp_mask) <= P * Exp_msk1)
-                 {
--                    if (word0(rv0) == Tiny0 && word1(rv0) == Tiny1)
-+                    if (word0(&rv0) == Tiny0 && word1(&rv0) == Tiny1)
-                         goto undfl;
--                    word0(rv) = Tiny0;
--                    word1(rv) = Tiny1;
-+                    word0(&rv) = Tiny0;
-+                    word1(&rv) = Tiny1;
-                     goto cont;
-                 }
-                 else
--                    word0(rv) -= P * Exp_msk1;
-+                    word0(&rv) -= P * Exp_msk1;
-             } else {
--                adj = aadj1 * ulp(dval(rv));
--                dval(rv) += adj;
-+                adj.d = aadj1 * ulp(&rv);
-+                dval(&rv) += adj.d;
-             }
- #else /*Sudden_Underflow*/
-             /* Compute adj so that the IEEE rounding rules will
-@@ -1656,12 +1659,12 @@ drop_down:
-                 if (!dsign)
-                     aadj1 = -aadj1;
-             }
--            adj = aadj1 * ulp(dval(rv));
--            dval(rv) += adj;
-+            adj.d = aadj1 * ulp(&rv);
-+            dval(&rv) += adj.d;
- #endif /*Sudden_Underflow*/
- #endif /*Avoid_Underflow*/
-         }
--        z = word0(rv) & Exp_mask;
-+        z = word0(&rv) & Exp_mask;
- #ifndef SET_INEXACT
- #ifdef Avoid_Underflow
-         if (!scale)
-@@ -1671,7 +1674,7 @@ drop_down:
-             L = (int32_t)aadj;
-             aadj -= L;
-             /* The tolerances below are conservative. */
--            if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
-+            if (dsign || word1(&rv) || word0(&rv) & Bndry_mask) {
-                 if (aadj < .4999999 || aadj > .5000001)
-                     break;
-             } else if (aadj < .4999999 / FLT_RADIX)
-@@ -1687,30 +1690,30 @@ cont:
- #ifdef SET_INEXACT
-     if (inexact) {
-         if (!oldinexact) {
--            word0(rv0) = Exp_1 + (70 << Exp_shift);
--            word1(rv0) = 0;
--            dval(rv0) += 1.;
-+            word0(&rv0) = Exp_1 + (70 << Exp_shift);
-+            word1(&rv0) = 0;
-+            dval(&rv0) += 1.;
-         }
-     } else if (!oldinexact)
-         clear_inexact();
- #endif
- #ifdef Avoid_Underflow
-     if (scale) {
--        word0(rv0) = Exp_1 - 2 * P * Exp_msk1;
--        word1(rv0) = 0;
--        dval(rv) *= dval(rv0);
-+        word0(&rv0) = Exp_1 - 2 * P * Exp_msk1;
-+        word1(&rv0) = 0;
-+        dval(&rv) *= dval(&rv0);
- #ifndef NO_ERRNO
-         /* try to avoid the bug of testing an 8087 register value */
--        if (word0(rv) == 0 && word1(rv) == 0)
-+        if (word0(&rv) == 0 && word1(&rv) == 0)
-             errno = ERANGE;
- #endif
-     }
- #endif /* Avoid_Underflow */
- #ifdef SET_INEXACT
--    if (inexact && !(word0(rv) & Exp_mask)) {
-+    if (inexact && !(word0(&rv) & Exp_mask)) {
-         /* set underflow bit */
--        dval(rv0) = 1e-300;
--        dval(rv0) *= dval(rv0);
-+        dval(&rv0) = 1e-300;
-+        dval(&rv0) *= dval(&rv0);
-     }
- #endif
- retfree:
-@@ -1722,7 +1725,7 @@ retfree:
- ret:
-     if (se)
-         *se = const_cast<char*>(s);
--    return sign ? -dval(rv) : dval(rv);
-+    return sign ? -dval(&rv) : dval(&rv);
- }
- 
- static int quorem(Bigint* b, Bigint* S)
-@@ -1914,7 +1917,7 @@ void freedtoa(char* s)
-  *       calculation.
-  */
- 
--char* dtoa(double d, int ndigits, int* decpt, int* sign, char** rve)
-+char* dtoa(double dd, int ndigits, int* decpt, int* sign, char** rve)
- {
-     /*
-         Arguments ndigits, decpt, sign are similar to those
-@@ -1934,7 +1937,8 @@ char* dtoa(double d, int ndigits, int* d
-     uint32_t x;
- #endif
-     Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
--    double d2, ds, eps;
-+    U d2, eps, u;
-+    double ds;
-     char *s, *s0;
- #ifdef SET_INEXACT
-     int inexact, oldinexact;
-@@ -1947,22 +1951,23 @@ char* dtoa(double d, int ndigits, int* d
-     }
- #endif
- 
--    if (word0(d) & Sign_bit) {
-+    u.d = dd;
-+    if (word0(&u) & Sign_bit) {
-         /* set sign for everything, including 0's and NaNs */
-         *sign = 1;
--        word0(d) &= ~Sign_bit;    /* clear sign bit */
-+        word0(&u) &= ~Sign_bit;    /* clear sign bit */
-     } else
-         *sign = 0;
- 
--    if ((word0(d) & Exp_mask) == Exp_mask)
-+    if ((word0(&u) & Exp_mask) == Exp_mask)
-     {
-         /* Infinity or NaN */
-         *decpt = 9999;
--        if (!word1(d) && !(word0(d) & 0xfffff))
-+        if (!word1(&u) && !(word0(&u) & 0xfffff))
-             return nrv_alloc("Infinity", rve, 8);
-         return nrv_alloc("NaN", rve, 3);
-     }
--    if (!dval(d)) {
-+    if (!dval(&u)) {
-         *decpt = 1;
-         return nrv_alloc("0", rve, 1);
-     }
-@@ -1972,15 +1977,15 @@ char* dtoa(double d, int ndigits, int* d
-     inexact = 1;
- #endif
- 
--    b = d2b(dval(d), &be, &bbits);
-+    b = d2b(&u, &be, &bbits);
- #ifdef Sudden_Underflow
--    i = (int)(word0(d) >> Exp_shift1 & (Exp_mask >> Exp_shift1));
-+    i = (int)(word0(&u) >> Exp_shift1 & (Exp_mask >> Exp_shift1));
- #else
--    if ((i = (int)(word0(d) >> Exp_shift1 & (Exp_mask >> Exp_shift1)))) {
-+    if ((i = (int)(word0(&u) >> Exp_shift1 & (Exp_mask >> Exp_shift1)))) {
- #endif
--        dval(d2) = dval(d);
--        word0(d2) &= Frac_mask1;
--        word0(d2) |= Exp_11;
-+        dval(&d2) = dval(&u);
-+        word0(&d2) &= Frac_mask1;
-+        word0(&d2) |= Exp_11;
- 
-         /* log(x)    ~=~ log(1.5) + (x-1.5)/1.5
-          * log10(x)     =  log(x) / log(10)
-@@ -2011,21 +2016,21 @@ char* dtoa(double d, int ndigits, int* d
-         /* d is denormalized */
- 
-         i = bbits + be + (Bias + (P - 1) - 1);
--        x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
--                : word1(d) << 32 - i;
--        dval(d2) = x;
--        word0(d2) -= 31 * Exp_msk1; /* adjust exponent */
-+        x = (i > 32) ? (word0(&u) << (64 - i)) | (word1(&u) >> (i - 32))
-+                : word1(&u) << (32 - i);
-+        dval(&d2) = x;
-+        word0(&d2) -= 31 * Exp_msk1; /* adjust exponent */
-         i -= (Bias + (P - 1) - 1) + 1;
-         denorm = 1;
-     }
- #endif
--    ds = (dval(d2) - 1.5) * 0.289529654602168 + 0.1760912590558 + (i * 0.301029995663981);
-+    ds = (dval(&d2) - 1.5) * 0.289529654602168 + 0.1760912590558 + (i * 0.301029995663981);
-     k = (int)ds;
-     if (ds < 0. && ds != k)
-         k--;    /* want k = floor(ds) */
-     k_check = 1;
-     if (k >= 0 && k <= Ten_pmax) {
--        if (dval(d) < tens[k])
-+        if (dval(&u) < tens[k])
-             k--;
-         k_check = 0;
-     }
-@@ -2066,7 +2071,7 @@ char* dtoa(double d, int ndigits, int* d
-         /* Try to get by with floating-point arithmetic. */
- 
-         i = 0;
--        dval(d2) = dval(d);
-+        dval(&d2) = dval(&u);
-         k0 = k;
-         ilim0 = ilim;
-         ieps = 2; /* conservative */
-@@ -2076,7 +2081,7 @@ char* dtoa(double d, int ndigits, int* d
-             if (j & Bletch) {
-                 /* prevent overflows */
-                 j &= Bletch - 1;
--                dval(d) /= bigtens[n_bigtens - 1];
-+                dval(&u) /= bigtens[n_bigtens - 1];
-                 ieps++;
-             }
-             for (; j; j >>= 1, i++) {
-@@ -2085,32 +2090,32 @@ char* dtoa(double d, int ndigits, int* d
-                     ds *= bigtens[i];
-                 }
-             }
--            dval(d) /= ds;
-+            dval(&u) /= ds;
-         } else if ((j1 = -k)) {
--            dval(d) *= tens[j1 & 0xf];
-+            dval(&u) *= tens[j1 & 0xf];
-             for (j = j1 >> 4; j; j >>= 1, i++) {
-                 if (j & 1) {
-                     ieps++;
--                    dval(d) *= bigtens[i];
-+                    dval(&u) *= bigtens[i];
-                 }
-             }
-         }
--        if (k_check && dval(d) < 1. && ilim > 0) {
-+        if (k_check && dval(&u) < 1. && ilim > 0) {
-             if (ilim1 <= 0)
-                 goto fast_failed;
-             ilim = ilim1;
-             k--;
--            dval(d) *= 10.;
-+            dval(&u) *= 10.;
-             ieps++;
-         }
--        dval(eps) = (ieps * dval(d)) + 7.;
--        word0(eps) -= (P - 1) * Exp_msk1;
-+        dval(&eps) = (ieps * dval(&u)) + 7.;
-+        word0(&eps) -= (P - 1) * Exp_msk1;
-         if (ilim == 0) {
-             S = mhi = 0;
--            dval(d) -= 5.;
--            if (dval(d) > dval(eps))
-+            dval(&u) -= 5.;
-+            if (dval(&u) > dval(&eps))
-                 goto one_digit;
--            if (dval(d) < -dval(eps))
-+            if (dval(&u) < -dval(&eps))
-                 goto no_digits;
-             goto fast_failed;
-         }
-@@ -2119,33 +2124,33 @@ char* dtoa(double d, int ndigits, int* d
-             /* Use Steele & White method of only
-              * generating digits needed.
-              */
--            dval(eps) = (0.5 / tens[ilim - 1]) - dval(eps);
-+            dval(&eps) = (0.5 / tens[ilim - 1]) - dval(&eps);
-             for (i = 0;;) {
--                L = (long int)dval(d);
--                dval(d) -= L;
-+                L = (long int)dval(&u);
-+                dval(&u) -= L;
-                 *s++ = '0' + (int)L;
--                if (dval(d) < dval(eps))
-+                if (dval(&u) < dval(&eps))
-                     goto ret1;
--                if (1. - dval(d) < dval(eps))
-+                if (1. - dval(&u) < dval(&eps))
-                     goto bump_up;
-                 if (++i >= ilim)
-                     break;
--                dval(eps) *= 10.;
--                dval(d) *= 10.;
-+                dval(&eps) *= 10.;
-+                dval(&u) *= 10.;
-             }
-         } else {
- #endif
-             /* Generate ilim digits, then fix them up. */
--            dval(eps) *= tens[ilim - 1];
--            for (i = 1;; i++, dval(d) *= 10.) {
--                L = (int32_t)(dval(d));
--                if (!(dval(d) -= L))
-+            dval(&eps) *= tens[ilim - 1];
-+            for (i = 1;; i++, dval(&u) *= 10.) {
-+                L = (int32_t)(dval(&u));
-+                if (!(dval(&u) -= L))
-                     ilim = i;
-                 *s++ = '0' + (int)L;
-                 if (i == ilim) {
--                    if (dval(d) > 0.5 + dval(eps))
-+                    if (dval(&u) > 0.5 + dval(&eps))
-                         goto bump_up;
--                    else if (dval(d) < 0.5 - dval(eps)) {
-+                    else if (dval(&u) < 0.5 - dval(&eps)) {
-                         while (*--s == '0') { }
-                         s++;
-                         goto ret1;
-@@ -2158,7 +2163,7 @@ char* dtoa(double d, int ndigits, int* d
- #endif
- fast_failed:
-         s = s0;
--        dval(d) = dval(d2);
-+        dval(&u) = dval(&d2);
-         k = k0;
-         ilim = ilim0;
-     }
-@@ -2170,30 +2175,30 @@ fast_failed:
-         ds = tens[k];
-         if (ndigits < 0 && ilim <= 0) {
-             S = mhi = 0;
--            if (ilim < 0 || dval(d) <= 5 * ds)
-+            if (ilim < 0 || dval(&u) <= 5 * ds)
-                 goto no_digits;
-             goto one_digit;
-         }
--        for (i = 1;; i++, dval(d) *= 10.) {
--            L = (int32_t)(dval(d) / ds);
--            dval(d) -= L * ds;
-+        for (i = 1;; i++, dval(&u) *= 10.) {
-+            L = (int32_t)(dval(&u) / ds);
-+            dval(&u) -= L * ds;
- #ifdef Check_FLT_ROUNDS
-             /* If FLT_ROUNDS == 2, L will usually be high by 1 */
--            if (dval(d) < 0) {
-+            if (dval(&u) < 0) {
-                 L--;
--                dval(d) += ds;
-+                dval(&u) += ds;
-             }
- #endif
-             *s++ = '0' + (int)L;
--            if (!dval(d)) {
-+            if (!dval(&u)) {
- #ifdef SET_INEXACT
-                 inexact = 0;
- #endif
-                 break;
-             }
-             if (i == ilim) {
--                dval(d) += dval(d);
--                if (dval(d) > ds || dval(d) == ds && L & 1) {
-+                dval(&u) += dval(&u);
-+                if (dval(&u) > ds || (dval(&u) == ds && (L & 1))) {
- bump_up:
-                     while (*--s == '9')
-                         if (s == s0) {
-@@ -2248,9 +2253,9 @@ bump_up:
-     /* Check for special case that d is a normalized power of 2. */
- 
-     spec_case = 0;
--    if (!word1(d) && !(word0(d) & Bndry_mask)
-+    if (!word1(&u) && !(word0(&u) & Bndry_mask)
- #ifndef Sudden_Underflow
--     && word0(d) & (Exp_mask & ~Exp_msk1)
-+     && word0(&u) & (Exp_mask & ~Exp_msk1)
- #endif
-             ) {
-         /* The special case */
-@@ -2322,7 +2327,7 @@ bump_up:
-             delta = diff(S, mhi);
-             j1 = delta->sign ? 1 : cmp(b, delta);
-             Bfree(delta);
--            if (j1 == 0 && !(word1(d) & 1)) {
-+            if (j1 == 0 && !(word1(&u) & 1)) {
-                 if (dig == '9')
-                     goto round_9_up;
-                 if (j > 0)
-@@ -2334,7 +2339,7 @@ bump_up:
-                 *s++ = dig;
-                 goto ret;
-             }
--            if (j < 0 || j == 0 && !(word1(d) & 1)) {
-+            if (j < 0 || (j == 0 && !(word1(&u) & 1))) {
-                 if (!b->x[0] && b->wds <= 1) {
- #ifdef SET_INEXACT
-                     inexact = 0;
-@@ -2344,7 +2349,7 @@ bump_up:
-                 if (j1 > 0) {
-                     b = lshift(b, 1);
-                     j1 = cmp(b, S);
--                    if ((j1 > 0 || j1 == 0 && dig & 1) && dig++ == '9')
-+                    if ((j1 > 0 || (j1 == 0 && (dig & 1))) && dig++ == '9')
-                         goto round_9_up;
-                 }
- accept_dig:
-@@ -2389,7 +2394,7 @@ round_9_up:
- 
-     b = lshift(b, 1);
-     j = cmp(b, S);
--    if (j > 0 || j == 0 && dig & 1) {
-+    if (j > 0 || (j == 0 && (dig & 1))) {
- roundoff:
-         while (*--s == '9')
-             if (s == s0) {
-@@ -2421,9 +2426,9 @@ ret1:
- #ifdef SET_INEXACT
-     if (inexact) {
-         if (!oldinexact) {
--            word0(d) = Exp_1 + (70 << Exp_shift);
--            word1(d) = 0;
--            dval(d) += 1.;
-+            word0(&u) = Exp_1 + (70 << Exp_shift);
-+            word1(&u) = 0;
-+            dval(&u) += 1.;
-         }
-     } else if (!oldinexact)
-         clear_inexact();
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch
deleted file mode 100644
index 3ed29d089415..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2009-09-28 02:04:56.316490553 +0300
-+++ configure.ac	2009-09-28 02:04:58.379795394 +0300
-@@ -190,7 +190,7 @@
- LIBXSLT_REQUIRED_VERSION=1.1.7
- SQLITE_REQUIRED_VERSION=3.0
- GSTREAMER_REQUIRED_VERSION=0.10
--GNOME_KEYRING_REQUIRED_VERSION=2.26.0
-+GNOME_KEYRING_REQUIRED_VERSION=2.22.3
- ENCHANT_REQUIRED_VERSION=0.22
- GAIL_REQUIRED_VERSION=1.8
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-CVE-2009-0945.patch b/net-libs/webkit-gtk/files/webkit-gtk-CVE-2009-0945.patch
deleted file mode 100644
index d053e42866e8..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-CVE-2009-0945.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch against Webkit-0 for CVE-2009-0945, bug 271861.
-
-diff -ru a/WebKit-r40220/WebCore/svg/SVGList.h b/WebKit-r40220/WebCore/svg/SVGList.h
---- a/WebKit-r40220/WebCore/svg/SVGList.h	2009-01-21 06:14:24.000000000 +0100
-+++ b/WebKit-r40220/WebCore/svg/SVGList.h	2009-06-27 01:47:15.000000000 +0200
-@@ -96,7 +96,11 @@
- 
-         Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
-         {
--            m_vector.insert(index, newItem);
-+            if (index < m_vector.size()) {
-+                m_vector.insert(index, newItem);
-+            } else {
-+                m_vector.append(newItem);
-+            }
-             return newItem;
-         }
- 
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 18da9aaa51dc..6315a1f7754f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -4,10 +4,6 @@
   <herd>gnome</herd>
   <use>
     <flag name="coverage">enable code coverage support</flag>
-    <flag name="pango">Use pango as font backend instead of freetype</flag>
-    <flag name="ruby">Enable HTML5 support for furigana/ruby annotation</flag>
-    <flag name="soup">Use SOUP as backend instead of curl</flag>
 	<flag name="websockets">enable full duplex single socket communication</flag>
-    <flag name="xslt">enable support for XSLT</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p40220-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p40220-r1.ebuild
deleted file mode 100644
index 8bca82ab8b04..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-0_p40220-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p40220-r1.ebuild,v 1.5 2009/09/12 22:42:02 eva Exp $
-
-inherit autotools flag-o-matic eutils
-
-MY_P="WebKit-r${PV/0\_p}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkit.org/"
-SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 -ia64 ppc -sparc x86 ~x86-fbsd"
-IUSE="coverage debug gstreamer pango soup sqlite svg xslt"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-	>=dev-libs/icu-3.8.1-r1
-	>=net-misc/curl-7.15
-	media-libs/jpeg
-	media-libs/libpng
-	dev-libs/libxml2
-	sqlite? ( >=dev-db/sqlite-3 )
-	gstreamer? (
-		>=media-libs/gst-plugins-base-0.10
-		)
-	soup? ( >=net-libs/libsoup-2.23.1 )
-	xslt? ( dev-libs/libxslt )
-	pango? ( x11-libs/pango )"
-
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	dev-util/pkgconfig
-	virtual/perl-Text-Balanced"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc44-aliasing.patch"
-	epatch "${FILESDIR}/${PN}-CVE-2009-0945.patch"
-	eautoreconf
-}
-
-src_compile() {
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	local myconf
-		use pango && myconf="${myconf} --with-font-backend=pango"
-		use soup && myconf="${myconf} --with-http-backend=soup"
-
-	econf \
-		$(use_enable sqlite database) \
-		$(use_enable sqlite icon-database) \
-		$(use_enable sqlite dom-storage) \
-		$(use_enable sqlite offline-web-applications) \
-		$(use_enable gstreamer video) \
-		$(use_enable svg) \
-		$(use_enable debug) \
-		$(use_enable xslt) \
-		$(use_enable coverage) \
-		${myconf}
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-	    ewarn
-	    ewarn "If ${PN} doesn't play some video format, please check your"
-	    ewarn "USE flags on media-plugins/gst-plugins-meta"
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
deleted file mode 100644
index 2d76e7a8d1b9..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild,v 1.10 2009/11/09 19:12:53 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils virtualx
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc -sparc x86 ~x86-fbsd"
-# geoclue
-IUSE="coverage debug doc gnome-keyring +gstreamer pango"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/jpeg
-	media-libs/libpng
-	x11-libs/cairo
-
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gail-1.8
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.25.90
-	>=dev-db/sqlite-3
-	>=app-text/enchant-0.22
-
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.3-r2 )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.11:0.10 )
-	pango? ( x11-libs/pango )
-	!pango? (
-		media-libs/freetype:2
-		media-libs/fontconfig )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/gettext
-	dev-util/gperf
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Make it libtool-1 compatible
-	rm -v autotools/lt* autotools/libtool.m4 || die "removing libtool macros failed"
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
-
-	# Reduce the gnome-keyring requirement from 2.26 to 2.22.3:
-	# Upstream requires so new version only because earlier versions didn't install headers
-	# that can be included from C++ code. We now have fixes to the headers in our
-	# gnome-keyring-2.22.3-r2, so we can work with just that if we reduce req in configure.
-	epatch "${FILESDIR}/${P}-reduce-gnome-keyring-req.patch"
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=autotools eautoreconf
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	local myconf
-
-	myconf="
-		$(use_enable gnome-keyring gnomekeyring)
-		$(use_enable gstreamer video)
-		$(use_enable debug)
-		$(use_enable coverage)
-		--enable-filters
-		"
-
-	# USE-flag controlled font backend because upstream default is freetype
-	# Remove USE-flag once font-backend becomes pango upstream
-	if use pango; then
-		ewarn "You have enabled the incomplete pango backend"
-		ewarn "Please file any and all bugs *upstream*"
-		myconf="${myconf} --with-font-backend=pango"
-	else
-		myconf="${myconf} --with-font-backend=freetype"
-	fi
-
-	econf ${myconf}
-}
-
-src_test() {
-	Xemake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-	    ewarn
-	    ewarn "If ${PN} doesn't play some video format, please check your"
-	    ewarn "USE flags on media-plugins/gst-plugins-meta"
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild
deleted file mode 100644
index ec0e968b9375..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.2.ebuild,v 1.8 2010/01/19 17:25:04 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools flag-o-matic eutils
-
-MY_P="webkit-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc sparc ~x86 ~x86-fbsd"
-# geoclue
-IUSE="coverage debug doc +gstreamer pango ruby +websockets"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/jpeg
-	media-libs/libpng
-	x11-libs/cairo
-
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gail-1.8
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.27.91
-	>=dev-db/sqlite-3
-	>=app-text/enchant-0.22
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10 )
-	pango? ( >=x11-libs/pango-1.12 )
-	!pango? (
-		media-libs/freetype:2
-		media-libs/fontconfig )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	use sparc && epatch "${FILESDIR}"/${P}-unaligned.patch
-
-	# Make it libtool-1 compatible
-	rm -v autotools/lt* autotools/libtool.m4 \
-		|| die "removing libtool macros failed"
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=autotools eautoreconf
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu
-	use sparc && filter-flags "-mcpu=*" "-mtune=*"
-
-	local myconf
-
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable gstreamer video)
-		$(use_enable ruby)
-		$(use_enable websockets web_sockets)
-		--enable-filters"
-
-	# USE-flag controlled font backend because upstream default is freetype
-	# Remove USE-flag once font-backend becomes pango upstream
-	if use pango; then
-		ewarn "You have enabled the incomplete pango backend"
-		ewarn "Please file any and all bugs *upstream*"
-		myconf="${myconf} --with-font-backend=pango"
-	else
-		myconf="${myconf} --with-font-backend=freetype"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
-}