amd64 stable wrt #304775

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

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 29c82afe53079b1eccdc5957510d7103367814b0..08ccf4ab3bc5c5f244fcaf16d46ca39bd1d3c23f 100644 (file)
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.65 2010/02/13 19:58:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.66 2010/03/06 13:11:57 ssuominen Exp $
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  webkit-gtk-1.1.15.4.ebuild:
+  amd64 stable wrt #304775
 
   13 Feb 2010; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.1.15.4.ebuild:
   Use virtualx.eclass for passing tests, bug 294691

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b64e23e023cf584ef1876dc423d2345d40dd7712..9a1b51bb6bc31742be5dc4e53652c4813755a82e 100644 (file)
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,3 @@
------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
@@ -13,13 +10,6 @@ DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d16595
 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 2479 RMD160 3f0d86f261e3eb5c494982be1a9cfe850f6a207a SHA1 834207e9159075752ec8682f69b7b821cc824fcc SHA256 adfcea250175f985ccd8deb8cffeb99eea73f147c3993f9bce3fec27a2dfd91e
-MISC ChangeLog 13741 RMD160 ea71f82f64fe758e67be3bbbdb7f46bf7b89be52 SHA1 c3076c39a1c32b33b214606c3e664a2206da6822 SHA256 27e457ee34dbdc69ce46008bf472c54c7bf2f736742251f01301c463a4350edf
+EBUILD webkit-gtk-1.1.15.4.ebuild 2484 RMD160 450b6cb8ef1960f1d7ff073140aa94129ae1ff4a SHA1 7f8feacab4d5de213ce055e5545f061bff003439 SHA256 c3e3739e3aba2a7e23c86e35d78f3fbbad5acf0952cd2c9222e223cf61359ade
+MISC ChangeLog 13857 RMD160 d7915f81e1bca6ea9cfd84f5b7f66c0c66fd621f SHA1 0ad04a111e6e4c27d5018330517b88d7a9076afb SHA256 f20377f91f31db733653b36a85e01395a5ca6310c12e8d12d1dc1cee7b8564f1
 MISC metadata.xml 590 RMD160 10d32e0b262743466f51841611018fc62a85cecd SHA1 2c3116f8d8d4c904c0a55a07caa6f8a0ee2d1892 SHA256 b08781716b9009ce0ed0c492e6bc1d958afd26400ab58b8d42fab67c11cc1046
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt3BGQACgkQCaWpQKGI+9SdGACeL1eYviUaPZ7n3Go/7Ru00XKk
-t68AnA41N5tv21h7n5O39HET0uZkqzgC
-=SUHJ
------END PGP SIGNATURE-----

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
index f1b5e8907d210dd96b2aa1c5c5891b9ded303f37..d61f775bfc5b21c2c5edf2d194ea0f2c67265965 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.8 2010/02/13 19:58:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.9 2010/03/06 13:11:57 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ 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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
 IUSE="aqua coverage debug doc +gstreamer +websockets"
 
@@ -22,7 +22,7 @@ IUSE="aqua coverage debug doc +gstreamer +websockets"
 RDEPEND="
        dev-libs/libxml2
        dev-libs/libxslt
-       media-libs/jpeg
+       media-libs/jpeg:0
        media-libs/libpng
        x11-libs/cairo