Reduce the gnome-keyring requirement to be able to stabilize the security fixes in this version earlier. Tweak some other dependencies to be more correct, also fixing bug 277463

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

4 files changed, 34 insertions, 7 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 7a56b1d211a5..1b115197db6c 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.47 2009/09/27 18:31:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.48 2009/09/28 00:17:59 leio Exp $
+
+  28 Sep 2009; Mart Raudsepp <leio@gentoo.org>
+  +files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch,
+  webkit-gtk-1.1.10.ebuild:
+  Reduce the gnome-keyring requirement to be able to stabilize the security
+  fixes in this version earlier. Tweak some other dependencies to be more
+  correct, also fixing bug 277463
 
   27 Sep 2009; Mart Raudsepp <leio@gentoo.org>
   -files/webkit-gtk-0_p46126-cxxmissing.patch,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8f514ca26f95..3ffc0e1aa07c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,12 +1,13 @@
 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-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.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
 DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
 EBUILD webkit-gtk-0_p40220-r1.ebuild 2017 RMD160 e0c5faca4ae98256b4b964fde174e932aad08d6e SHA1 6de0cd2a6d02773f13d00232ac66aa2073df17db SHA256 1220f0c9faff1820bcb8ddebaf3a3a0e0b133456fd6497f40311463efbffad69
-EBUILD webkit-gtk-1.1.10.ebuild 2511 RMD160 e029198e79fce4177becec6333d5a4e795688f9e SHA1 8c998ecb5b4372b58c2b9c9dba0d821d8f9a03c6 SHA256 f04688997e19b3ccfeddbfee0cf47211de559f3e8a55ed2238e12761176f44ff
+EBUILD webkit-gtk-1.1.10.ebuild 2933 RMD160 32941ffe7a44127973829af9c239cec8289925db SHA1 7cdbabb5fe7b82ba6e9e74c2d8fc6ac99d06627f SHA256 2716bc7fa81a54e34b40b20de17469a95fbb3d20a0c18a421c58bf20e38a9337
 EBUILD webkit-gtk-1.1.7.ebuild 2149 RMD160 ca61c85d21c4a605452531b5873b2e5646553bb4 SHA1 dbdbc1a21bb9f7310386c077045c1e1fc0c0d779 SHA256 c5689e71175b2e04d69254ed73719bee650266caa98d2111c1a0ec0be4e85468
 EBUILD webkit-gtk-1.1.8.ebuild 2492 RMD160 43d965e5396eca18bc4530c3ac152d95716a3433 SHA1 928d6d1508b0b874121c558f72757935dae90100 SHA256 441d4d8f3d95ae1471f58f710f154b5afd7d8c9f396af96780b498fd7ccd00f3
-MISC ChangeLog 10917 RMD160 88b1eaecbb2d1757eadcbfae0a4321a888f62fb9 SHA1 a330311bb1f637183478737efd7ed9a02943f8e0 SHA256 c55e745f62cc3e06b903b3ad7db7bb1bef71d16b1b397b82474b3d0bda6625d3
+MISC ChangeLog 11236 RMD160 fdbd16a6dce3583fd82e98dbd460e21393e9ed01 SHA1 0cc607e5e4aaa5bbe9dfb88531a2b1572a496d95 SHA256 2fd4b314f53785559c1168730ba24ccdfd1293e8c576057c2fdba93b2199afe3
 MISC metadata.xml 432 RMD160 672c7e534ff86cfef074939053d64efc29e53b1e SHA1 40167924c241c19efa021b71fb15096739687952 SHA256 c4d89a5f0ca8b3da0d4432530d41e75a184a07cd560599219d268d3f1ff2418b
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
new file mode 100644
index 000000000000..3ed29d089415
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch
@@ -0,0 +1,11 @@
+--- 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/webkit-gtk-1.1.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
index 73569694fcef..f62378b7d8d0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
@@ -1,10 +1,10 @@
 # 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.3 2009/09/12 22:42:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild,v 1.4 2009/09/28 00:17:59 leio Exp $
 
 EAPI="2"
 
-inherit autotools
+inherit autotools eutils
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -26,15 +26,16 @@ RDEPEND="
 	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.26.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.3-r2 )
 	gstreamer? (
 		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10 )
+		>=media-libs/gst-plugins-base-0.10.11:0.10 )
 	pango? ( x11-libs/pango )
 	!pango? (
 		media-libs/freetype:2
@@ -55,6 +56,13 @@ src_prepare() {
 	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
 }