www-client/epiphany-extensions: bump to 2.23.91

	* Build updates to xr 1.9

	Bug fixes:
	* Bug 521880 – smart bookmarks extension doesn't work
	* Bug 545089 – FTBFS, needs -UGTK_DISABLE_DEPRECATED
	* Bug 544928 – RFE: Update build scripts for Ephy 2.23.x

4 files changed, 101 insertions, 17 deletions

diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 1caee347..9cbc74b3 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,4 +1,4 @@
 AUX epiphany-extensions-2.21.92-sessionsaver-v4.patch.gz 10019 RMD160 c0d06082be2b999d59a0b8faf7e70984a3ebd58b SHA1 1ddb28c1a724fd8e5a5d91bc6f53b47e12944bc4 SHA256 74f585a6530d3212f69f140f5f7eee52d786745c1c8cf76f65f13a01da1ac0a2
-AUX epiphany-extensions-2.22.2-2.23-api.patch 703 RMD160 33dcc31fe87aa73a83b55347a2984b732445a5ec SHA1 bbc8c2ae5b498319693b722b050677e9648a7994 SHA256 0df549fba6b41ce83e2555623f9e5bf6aa8b32c79f143efe31b0ce9e79632a8d
-DIST epiphany-extensions-2.22.2.tar.bz2 947322 RMD160 586f26851a0fbc4c2664116a3e32596d3bd91188 SHA1 0dff50f48a14e01dc358fa484b218f6d6a7f5519 SHA256 de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4
-EBUILD epiphany-extensions-2.22.2-r100.ebuild 2562 RMD160 f0505b691793d6563a3ed000f00cd72c28ca05c8 SHA1 070951bac70aa3186087f5f20de9f2dae6a13833 SHA256 795b25b47539c934df43c569f118c62a9538f207aace82f35cc2772fb4b17ac2
+DIST epiphany-extensions-2.23.91.tar.bz2 926419 RMD160 e28b8b195b632828466051da63d87dedc0ff7493 SHA1 10ed59815ca4fd526f4cc679154945c1428992dc SHA256 7aa139ee7533f9f4ad9284daefdfa6004c983e63dfb4b86c33e0f75a49b2d677
+EBUILD epiphany-extensions-2.23.91-r10.ebuild 2482 RMD160 3c8f36b059fe4a5e375ae1eb650d0a30720dd0f8 SHA1 830a3dabf510c9dc2ca10388c9a7f4b777fac5b5 SHA256 1568637b85487e3e7b30d04ff64890d9a62b1ed865a0456eb333bcc651e62531
+EBUILD epiphany-extensions-2.23.91.ebuild 2837 RMD160 5c4548d0112689c3b64cfca9e5d5ef612062f82b SHA1 b28af3393bd116813562626bff7ca8023b9ac98d SHA256 981dd60999b38de5e36cd9afd0add56a98ae304b3ecfae278689a28a770e74f9
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r100.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.23.91-r10.ebuild
index 65e52a22..66c52d30 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r100.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.23.91-r10.ebuild
@@ -66,8 +66,7 @@ src_unpack() {
 	# Don't remove sessionsaver, please.  -dang
 	epatch "${FILESDIR}"/${PN}-2.21.92-sessionsaver-v4.patch.gz
 	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
-	# Make it build against epiphany-2.23
-	epatch "${FILESDIR}"/${P}-2.23-api.patch
+
 	eautoreconf
 }
 
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.23.91.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.23.91.ebuild
new file mode 100644
index 00000000..ee5a63b0
--- /dev/null
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.23.91.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.22.2-r10.ebuild,v 1.1 2008/07/14 01:35:59 eva Exp $
+
+inherit autotools eutils gnome2 python versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Extensions for the Epiphany web browser"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~hppa ~ppc ~sparc ~x86"
+IUSE="dbus examples pcre python xulrunner"
+
+RDEPEND=">=www-client/epiphany-${MY_MAJORV}
+	app-text/opensp
+	>=dev-libs/glib-2.15.5
+	>=gnome-base/gconf-2.0
+	>=dev-libs/libxml2-2.6
+	>=x11-libs/gtk+-2.11.6
+	>=gnome-base/libglade-2
+	xulrunner? ( =net-libs/xulrunner-1.8* )
+	!xulrunner? ( =www-client/mozilla-firefox-2* )
+	dbus? ( >=dev-libs/dbus-glib-0.34 )
+	pcre? ( >=dev-libs/libpcre-3.9-r2 )
+	python? ( >=dev-python/pygtk-2.11 )"
+DEPEND="${RDEPEND}
+	  gnome-base/gnome-common
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.20
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	local extensions=""
+
+	extensions="actions auto-reload auto-scroller certificates \
+				error-viewer extensions-manager-ui gestures java-console \
+				livehttpheaders page-info permissions push-scroller \
+				select-stylesheet sessionsaver sidebar smart-bookmarks \
+				tab-groups tab-states"
+
+	use dbus && extensions="${extensions} rss"
+
+	use pcre && extensions="${extensions} adblock greasemonkey"
+
+	use python && extensions="${extensions} python-console favicon cc-license-viewer epilicious"
+	use python && use examples && extensions="${extensions} sample-python"
+
+	use examples && extensions="${extensions} sample sample-mozilla"
+
+	G2CONF="${G2CONF} --with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+
+		if ! built_with_use =www-client/mozilla-firefox-2* filepicker; then
+			ewarn "If you want the Certificate Management extension, please"
+			ewarn "rebuild www-client/mozilla-firefox with USE='filepicker'"
+		fi
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Don't remove sessionsaver, please.  -dang
+	epatch "${FILESDIR}"/${PN}-2.21.92-sessionsaver-v4.patch.gz
+	echo "extensions/sessionsaver/ephy-sessionsaver-extension.c" >> po/POTFILES.in
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use python; then
+		python_mod_optimize /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if use python; then
+		python_mod_cleanup /usr/$(get_libdir)/epiphany/${MY_MAJORV}/extensions
+	fi
+}
diff --git a/www-client/epiphany-extensions/files/epiphany-extensions-2.22.2-2.23-api.patch b/www-client/epiphany-extensions/files/epiphany-extensions-2.22.2-2.23-api.patch
deleted file mode 100644
index 19557d37..00000000
--- a/www-client/epiphany-extensions/files/epiphany-extensions-2.22.2-2.23-api.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN epiphany-extensions-2.22.2.orig/configure.ac epiphany-extensions-2.22.2/configure.ac
---- epiphany-extensions-2.22.2.orig/configure.ac	2008-05-26 14:08:15.000000000 -0400
-+++ epiphany-extensions-2.22.2/configure.ac	2008-07-22 15:18:05.000000000 -0400
-@@ -24,7 +24,7 @@ m4_define([e_e_branch],["branches/gnome-
- 
- AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany-extensions],[epiphany-extensions])
- 
--EPIPHANY_API_VERSION=e_e_version_major.e_e_version_minor
-+EPIPHANY_API_VERSION=2.23
- 
- EPIPHANY_EXTENSIONS_MAJOR=e_e_version_major.e_e_version_minor
- AC_SUBST(EPIPHANY_EXTENSIONS_MAJOR)