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

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

3 files changed, 31 insertions, 5 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/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
 }