bump to 2.22.1. Bug/build fixes and translation updates.

Package-Manager: portage-2.1.5_rc2

3 files changed, 97 insertions, 6 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 1b54547a60eb..b0957605912d 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.154 2008/03/22 23:50:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.155 2008/04/10 22:09:42 eva Exp $
+
+*epiphany-2.22.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +epiphany-2.22.1.ebuild:
+  bump to 2.22.1. Bug/build fixes and translation updates.
 
 *epiphany-2.22.0 (22 Mar 2008)
 
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 4800c00e2a49..021b375edeb1 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX epiphany-2.20.3-fix-de-docs-tests.patch 1331 RMD160 7b7ba7a33a0975fe994bfe0d0022e26d77bd8bff SHA1 d1f318e720348dae6c6898fbf02c4e5e14c07903 SHA256 8d04f7011fe6cbab3e97f8c9cb800079227bfb0cde5ee38105607b585dfd387c
 DIST epiphany-2.20.3.tar.bz2 4945544 RMD160 1af464d3b694bb30e9491ea49162d79b655fa140 SHA1 ee3d21dde38970d9bfc715e2560f68303ac07e83 SHA256 a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca
 DIST epiphany-2.22.0.tar.bz2 5163182 RMD160 7f0b9c7b2dd1fd1c67b726bb14c5122f78575b9e SHA1 66f0dd358b3bfc8f790f36e9f14ce419028f5112 SHA256 692c642f99ea52ac86acf1c00c31f2567cba1e155e5d93462625bd208dca7122
+DIST epiphany-2.22.1.tar.bz2 5186075 RMD160 4e3c8c81c45828435ebda335c057206995daf351 SHA1 b1a1d716951edaa54f6854df79717312a7467d21 SHA256 6faf0aaf8a44ad119baa921a634eb8dd2d02c4f501af176f294164f7d49dca5e
 EBUILD epiphany-2.20.3.ebuild 2497 RMD160 9f61977a0944ce96994db6d5612acb30de9f5a32 SHA1 18fe2cd89ad4d3aab80160fea3434cb708f0a73a SHA256 f99bf563d9060a85c1d51a6f209a575b0896da98fa027edf61c4df8d212d7dac
 EBUILD epiphany-2.22.0.ebuild 2577 RMD160 1bdb66b23875aa77cd7ea33ea07e4220a2dbadca SHA1 0bb04a8a427b862b230c57a95cb9a0e751ff542b SHA256 d3a2ad86e3e37170c2b8a665e9a8ae12e2ae7480a72944cb90bebdffd6ec7028
-MISC ChangeLog 33785 RMD160 94403785ad80c0b6b7105338c2d6770978201b4f SHA1 06b281923fb8bc4e523e1d21181d7ba5c1214a85 SHA256 c0ecebee0e580d04e3d6232a3a27a0aa098fc4eae2c27a02ffbc5748cef2ec7a
+EBUILD epiphany-2.22.1.ebuild 2577 RMD160 c70e48867f9baf080445aab3b946a006e09a4dde SHA1 6a32eaff91db35f6c4817e1db4576713840ec4aa SHA256 26f35a656300b6c8823603bd4ec09530b6cadfb5ae1437177df6f0af3a6cb6ec
+MISC ChangeLog 33958 RMD160 8ab4fd509c251ecff8eaa7f0e359c4e85ff1f84a SHA1 01c88b498a50f282f3aa6f5c5ca6b77790d7ad3d SHA256 1d005d1ce7d05c328c60f1dca575407bd78ae890db2f175cf98b464bb1301e00
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5Zyw1fmVwcYIWAYRAkTPAJ40htu8rJ2TfnIHMOTTfYbGhYkHkgCfTvi1
-M5zPhB/d4eb29r+m4cA/QjA=
-=7OHo
+iEYEARECAAYFAkf+kC4ACgkQ1fmVwcYIWAZUwQCg39jbcMRfoYRYmCam6rmQYIj0
+7sQAniQAsIlKph36pG7OKH/F3qpxPkJt
+=NuNe
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.22.1.ebuild b/www-client/epiphany/epiphany-2.22.1.ebuild
new file mode 100644
index 000000000000..ee34e23708b6
--- /dev/null
+++ b/www-client/epiphany/epiphany-2.22.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.1.ebuild,v 1.1 2008/04/10 22:09:42 eva Exp $
+
+inherit gnome2 eutils multilib
+
+DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi doc networkmanager python spell xulrunner"
+
+# FIXME: add webkit/gecko switch possibility
+# dang: *after* webkit actually works.
+# this release should work with xulrunner 1.9 so not slotting right now
+
+RDEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.12.0
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/libglade-2.3.1
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/gnome-desktop-2.9.91
+	>=x11-libs/startup-notification-0.5
+	>=x11-libs/libnotify-0.4
+	>=dev-libs/dbus-glib-0.71
+	>=gnome-base/gconf-2
+	>=app-text/iso-codes-0.35
+	avahi? ( >=net-dns/avahi-0.6.22 )
+	networkmanager? ( net-misc/networkmanager )
+	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
+	xulrunner? ( net-libs/xulrunner )
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7.1
+		>=dev-python/gnome-python-2.6
+	)
+	spell? ( app-text/enchant )
+	x11-themes/gnome-icon-theme"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--with-engine=mozilla
+		--enable-certificate-manager
+		--with-distributor-name=Gentoo
+		$(use_enable avahi zeroconf)
+		$(use_enable networkmanager network-manager)
+		$(use_enable spell spell-checker)
+		$(use_enable python)"
+
+	if use xulrunner; then
+		G2CONF="${G2CONF} --with-gecko=xulrunner"
+	else
+		G2CONF="${G2CONF} --with-gecko=firefox"
+	fi
+}
+
+src_compile() {
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
+
+	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat
+	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
+
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
+	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+
+	gnome2_src_compile
+}