bump to 2.22.2. Mostly xulrunner changes.

Package-Manager: portage-2.1.5.4

4 files changed, 117 insertions, 5 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 0ae69558639e..b5540e3883a9 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany-extensions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.84 2008/05/29 18:17:03 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.85 2008/06/08 18:17:34 eva Exp $
+
+*epiphany-extensions-2.22.2 (08 Jun 2008)
+
+  08 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +epiphany-extensions-2.22.2.ebuild:
+  bump to 2.22.2. Mostly xulrunner changes.
 
   29 May 2008; Ali Polatel <hawking@gentoo.org>
   epiphany-extensions-2.20.3.ebuild, epiphany-extensions-2.22.1.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 6709ede8d0bd..83618ab04d5e 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -5,14 +5,16 @@ AUX epiphany-extensions-2.18.0-sessionsaver-v4.patch.gz 9992 RMD160 397765c966f9
 AUX epiphany-extensions-2.21.92-sessionsaver-v4.patch.gz 10019 RMD160 c0d06082be2b999d59a0b8faf7e70984a3ebd58b SHA1 1ddb28c1a724fd8e5a5d91bc6f53b47e12944bc4 SHA256 74f585a6530d3212f69f140f5f7eee52d786745c1c8cf76f65f13a01da1ac0a2
 DIST epiphany-extensions-2.20.3.tar.bz2 909040 RMD160 f3fac0a4cc17b3120f0414f0467ff36c24e77dd2 SHA1 201232b2d94576478dddc94daa49d19bc1487305 SHA256 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2
 DIST epiphany-extensions-2.22.1.tar.bz2 941966 RMD160 85696465a63c8394f0688fa66dab90e397cf1836 SHA1 1cbef595dafeb65ce26763ec2a2b99937a82c3fb SHA256 1d5e86932fc66a0db519682b4b3d45bf58914a4c40fb470e66a199efce157e85
+DIST epiphany-extensions-2.22.2.tar.bz2 947322 RMD160 586f26851a0fbc4c2664116a3e32596d3bd91188 SHA1 0dff50f48a14e01dc358fa484b218f6d6a7f5519 SHA256 de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4
 EBUILD epiphany-extensions-2.20.3.ebuild 2534 RMD160 00ba8a95a998149d275589e23627fc164d65bf53 SHA1 f2666f47c53796a20491af13f656de1cbe9bcaaa SHA256 b1cab284b8e4f46774598d4ac43f4cb44db25ced6261a6a6cf7cffd949744598
 EBUILD epiphany-extensions-2.22.1.ebuild 2634 RMD160 8034e1b8efae6176b0d33454bfb29a7cd3003b65 SHA1 9cb512c0d258190dda7b38592e074b52080ad525 SHA256 aa9d67085bcb6e14ddf44c3d306a8960b4a8a372c2f6599a707a8f84289aad12
-MISC ChangeLog 14401 RMD160 47acf261b42e6a14029f93d2a3e968a73144983f SHA1 522f7dc194359e10d42f77fee4da9451b78b1c58 SHA256 9601ed9a761ab71deaed22e4501b75f61be17b693ccf7502c490f11376040ad9
+EBUILD epiphany-extensions-2.22.2.ebuild 2630 RMD160 9f950712426164bd27a2a2e74569ad9787263c6a SHA1 0651468b7017e405dc16c76fc293509e3109b52f SHA256 1b8c8220fe920faf9beae138387dd64f31f19c9dee9f0551f9282e54aa4972fe
+MISC ChangeLog 14577 RMD160 2720585598511738d4711afb5ee6ee373b8eb180 SHA1 0fdb2753b083f4595ffb2596bba81de108c4b75e SHA256 a4212ec3c26a6eb4d5092673db2f8dd4c2236fde25072fc6694fb48cbfef71c9
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+8yEACgkQQU4yORhF8iDdYgCfSdtegVoMdHlkGQF90A6jhULM
-p9cAnjFmqcNBICKnFf5zLZLUeVHd/D1K
-=aW74
+iEYEARECAAYFAkhMIkgACgkQ1fmVwcYIWAakSACgtQcncq1qv24e3s5BgPGkb0oS
+/RsAoLC/NeIUbZX3VxIReE3UxwYzqxAB
+=MPiA
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild
new file mode 100644
index 000000000000..efd3a07f22c5
--- /dev/null
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild
@@ -0,0 +1,91 @@
+# 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.ebuild,v 1.1 2008/06/08 18:17:34 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 )
+	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
+	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"
+	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
+	AT_M4DIR="m4" 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/midori/Manifest b/www-client/midori/Manifest
new file mode 100644
index 000000000000..70af30495bfc
--- /dev/null
+++ b/www-client/midori/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD midori-9999.ebuild 805 RMD160 5898e8add17dae9c2df9bb6ff5c4cfdfde2ab441 SHA1 9a6c01ea5b77613f2653e1fc0e338a3c1bd9a29b SHA256 7c98af1c3c7f9dcbf8d360d3862e622ef2ce9a4eb6772fd9269b3bb5ee37c139
+MISC ChangeLog 454 RMD160 98eb79c045e5e825937a5d3966e970326cd92343 SHA1 f54c10ac1a7d5bf591d2c12c3da10f67740a1fec SHA256 6bbca01dd53b4b9e880e12d2c13e9ca73c9b8e198d22a97e2a262928f44a5b29
+MISC metadata.xml 251 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d SHA1 f58b9ae8d4a67e568288a4cf7d0037f228ba3fc4 SHA256 2ecb6b4fcce7435885895d82f44bd288b8ab797c7d6476eaac494d44a56f8886
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhMIuIACgkQz974XjDVpbmohwCeNk5fgWqjItpPBjVgWFQJh1cW
+pkUAnR69JkvgcwNoCnHCuPHe29sdedQb
+=3KVM
+-----END PGP SIGNATURE-----