Add missing addpredict for mozilla folder, bug #253043.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64
RepoMan-Options: --force

13 files changed, 64 insertions, 156 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index f3e68a7b74c2..385165e30be4 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.178 2009/01/03 11:38:34 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.179 2009/01/03 12:47:03 eva Exp $
+
+  03 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/epiphany-2.20.3-fix-de-docs-tests.patch, -epiphany-2.20.3.ebuild,
+  epiphany-2.22.3.ebuild, epiphany-2.22.3-r1.ebuild,
+  epiphany-2.22.3-r10.ebuild, epiphany-2.22.3-r11.ebuild,
+  epiphany-2.24.0.1.ebuild, epiphany-2.24.1.ebuild,
+  epiphany-2.24.1-r10.ebuild, epiphany-2.24.2.1.ebuild,
+  epiphany-2.24.2.1-r10.ebuild:
+  Add missing addpredict for mozilla folder, bug #253043.
 
 *epiphany-2.22.3-r11 (03 Jan 2009)
 *epiphany-2.22.3-r1 (03 Jan 2009)
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index fa382c1a9c40..f0e22e09e25c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,20 +1,27 @@
-AUX epiphany-2.20.3-fix-de-docs-tests.patch 1331 RMD160 7b7ba7a33a0975fe994bfe0d0022e26d77bd8bff SHA1 d1f318e720348dae6c6898fbf02c4e5e14c07903 SHA256 8d04f7011fe6cbab3e97f8c9cb800079227bfb0cde5ee38105607b585dfd387c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epiphany-2.22.3-firefox2.0-header-fix.patch 555 RMD160 53beacda1bfd919d8afa0bf652d91a3068ef1c07 SHA1 ce0e4a52ba0a2aad1ac9bc785540d0d49f9d689f SHA256 8a72057ad4e0434fb3f7c45c7336c1280d97aca092ff196bfbb56519900aabcc
 AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e9e8de2b019e46d2 SHA1 cc2f719ab3b7ad28464e3e22dbed40c9e25fd845 SHA256 09aab29054c53cbd07fc5d2a8bec29c8e02c830e3fec8f4af7a079216cc13d8b
-DIST epiphany-2.20.3.tar.bz2 4945544 RMD160 1af464d3b694bb30e9491ea49162d79b655fa140 SHA1 ee3d21dde38970d9bfc715e2560f68303ac07e83 SHA256 a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca
 DIST epiphany-2.22.3.tar.bz2 5718239 RMD160 6607cb7b7e2afb7c5f3b914ba18f0347fd8d392d SHA1 eb99b5d073b5b3d9294ddcfb888340c5e6b45738 SHA256 d61c4fe6cc351bab526d0973491f704db592a9e65d9fbf86c7a9607decb94215
 DIST epiphany-2.24.0.1.tar.bz2 5692261 RMD160 4b266d04e7530cf6c4bcac22ad59251bb542cb0a SHA1 5cea9f40c25fb6be2d281625862f8443c094e8dc SHA256 d27e0ce480ad643b5e0b4f44bcd83b3c96086d1d1f67c10531cb7fb3fd065938
 DIST epiphany-2.24.1.tar.bz2 5694692 RMD160 f340f59211d3175bf4a940a40b593c163689f3f9 SHA1 1329e66c7b86cdbe906cd7bec35ea466d10f1c56 SHA256 518485c957c28089d5981218445b176b29a4c979e116cb390da7d04d393576bc
 DIST epiphany-2.24.2.1.tar.bz2 5724989 RMD160 0aa21eb6c798a8881080126d9197adb7a91ba56a SHA1 068b39001f44dd565b8d72a2fc59afeedcda0b43 SHA256 f2fd6df89671262043362b96cc30a90b678679dbfad9ed9724d528289e2a505a
-EBUILD epiphany-2.20.3.ebuild 2497 RMD160 9f61977a0944ce96994db6d5612acb30de9f5a32 SHA1 18fe2cd89ad4d3aab80160fea3434cb708f0a73a SHA256 f99bf563d9060a85c1d51a6f209a575b0896da98fa027edf61c4df8d212d7dac
-EBUILD epiphany-2.22.3-r1.ebuild 2875 RMD160 34dab50a7d703e2d1da8e26ad43ccb058458a48d SHA1 123afbe6df25cd32df04a9d91ee56dc59eddd151 SHA256 091d60887b6de8a0e4fd66815d9557333aa73bb1bd4dccf4272cb7aedce34bd4
-EBUILD epiphany-2.22.3-r10.ebuild 2216 RMD160 1e32cf5e13b10e9320b580b1236cb6b84c84a919 SHA1 661a74c18402d2fc741c642a9887eace17406c43 SHA256 5c99d69a998593a2af5dedd9e392d9ba21a622bd89ef9d762d91294ce55ff0bb
-EBUILD epiphany-2.22.3-r11.ebuild 2343 RMD160 992d5820098596207f3c32891059a57e0e8bd5ac SHA1 1f7d7834fe9a993f5e08c8d870db9da2fc8b4706 SHA256 4f45bf528991cd74ef7eb84fa5a9d9689ddbc79495329866883d90486fd98a28
-EBUILD epiphany-2.22.3.ebuild 2776 RMD160 6b1f53a487cdfdc9fdbeab4c4ae00d113323e1f7 SHA1 a70f2e94518afe26cb327e014b224dab15b20ea1 SHA256 96435405bf7469005e9281ff2c937c4a9fb4fd72a1109e2f4ee8cda55331abc3
-EBUILD epiphany-2.24.0.1.ebuild 2315 RMD160 feb1f358a9a467bdc7c50be83cf95f4abec8c00f SHA1 e04cf3651c5fd94f1e26cd0d310107b667b3cdae SHA256 20a38bb01d24a4fd49930cf680640b39d991f98c157b3491accb5609f65ab66c
-EBUILD epiphany-2.24.1-r10.ebuild 2314 RMD160 d8714f11766450ec6af3a244255905f1bc43069c SHA1 92ae72ec50023ba0c476db532ca069f11ec39f80 SHA256 afaf08757a8c8a5d0ce386083d6c031c8cac792e5ea36624de33a11f738c6e51
-EBUILD epiphany-2.24.1.ebuild 2657 RMD160 c7c3345d936ebb9df99e9b4e1ac43c6ba2f11b71 SHA1 fe30978e85886dcc55990652b8c04e0278a45da1 SHA256 fd520ecf5453dae0400dc405cdf7b3a9abdb362c86c4f0fc5588f5997ea39b92
-EBUILD epiphany-2.24.2.1-r10.ebuild 2316 RMD160 3a43585f9ad331a2a493f8940570b0d5373fa89e SHA1 272d65e5dc2a5401cd799b8254619a4a83aa332e SHA256 dec4d57170e59e2aa469c2f52bb4f86c619d57d902cc34b9b9235c919785d027
-EBUILD epiphany-2.24.2.1.ebuild 2659 RMD160 2daf1191b07ac89d5c49685af8a6bc02d1bbaf65 SHA1 3b345fab20738b47da603f805362098631eb2d6f SHA256 5506b017721f0244d206707ee8a8eaaff68549895d5ca9a1f6321ab8bd1ad36f
-MISC ChangeLog 38003 RMD160 d12b8fd199acfb387c7359b617da902beffe7690 SHA1 becf7923e795d813b114894d3c37ce130f3e451e SHA256 ca81f375846b5f3331044747ea81c023f3efc34cb73a6d198f355f51bfb7ca26
+EBUILD epiphany-2.22.3-r1.ebuild 3002 RMD160 fb2c03f3dab1bd9b0abea1373d37a4aefd7af412 SHA1 44c386c61d2c0de32f6ae1c579a4e0bd887535a4 SHA256 65bea48983de9bff7cfb4900464843b139b40898d42bfb8345eead439aed703e
+EBUILD epiphany-2.22.3-r10.ebuild 2297 RMD160 ff1861d61f00ae83f21c815274d0c92a48c70719 SHA1 463e6bb81b903d9331851ec44dbf5fe42fd98f6e SHA256 d1c5cc8789d8d2b01ac89572d8af7d265cbbdfc31a8d952d4afa0c139ca82bf8
+EBUILD epiphany-2.22.3-r11.ebuild 2424 RMD160 637372de93d7fa3f0c6203012085d0904c42af73 SHA1 550ec54d5e947ac997bd95ad54a326e13739529f SHA256 b5f6cd8d3d9f045840f8e6105b7acdfe6e932ed872ba03b0353cae3211a041fa
+EBUILD epiphany-2.22.3.ebuild 2901 RMD160 90a467e02809efbff48ca328b3e112030f2482af SHA1 e71aefb2687df7f29551516d70dbb293af67bd45 SHA256 a87362736f4fa415c1d1b1a0dc1cf063d2c642f956bb11942631183c794d1bd9
+EBUILD epiphany-2.24.0.1.ebuild 2394 RMD160 7f0664fac58ac86eb19bc22f5d61a3fb9f18f4d6 SHA1 d4b8c296a3a1602af1f8a2532466a1730e347b79 SHA256 d269fcac31efb3019e71e03e40a251d3107b2f999a7eb469569e9dd606d8b1dc
+EBUILD epiphany-2.24.1-r10.ebuild 2396 RMD160 4d48330423c7fc615cc3a2f6b20659d8ca5a019a SHA1 7d937f6a27ac85c85d00cc7f957f379a27fe8148 SHA256 3991adccc5b98ea8ef57f4a2221a6de28d1c1c439a26d6781e8907dff0759af4
+EBUILD epiphany-2.24.1.ebuild 2739 RMD160 ae1a75dd8fda0d71280e06d43c85082db930ed0b SHA1 8d0f16ade80d4f2e12c34db66eb8c1e3d5deb1b7 SHA256 e925ec44dc1fbe2321903ed8cb3bcd862911f9b8bbc8c01f2f19aeac35e05636
+EBUILD epiphany-2.24.2.1-r10.ebuild 2398 RMD160 395d44b77d4bc55c8d6fb1b15077f5785ab0acad SHA1 7f19778e024025ca13bfc99dd4a32bf25a1deaf1 SHA256 aa58bec78c72e062d928e4df29c7cf59f3f6f85aaf48dbf78f9960e265fc7787
+EBUILD epiphany-2.24.2.1.ebuild 2741 RMD160 7b13d4aba3eec36d1142c853ac99e735d3c656c6 SHA1 19a44e175a8792dbdfe31c84b2295b1d19422c9c SHA256 a85086b81394702b0637822d8eeef36046907870fee5b33b961e1624d6a2ee6c
+MISC ChangeLog 38441 RMD160 d6e2f60dd131e357dffdb0722cc852baf0d3883d SHA1 608e7316d87d7cffcb492ef61040379b5559720c SHA256 d0087e69bfea9450ece91d768f77c638c0bfd60875fcf709d81bc8f6f1cd3db4
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklfXlwACgkQ1fmVwcYIWAbx+ACgwl4px6YxCU70EDbttX0QLRbQ
+JGcAnjfOnu/GO/5Hl7v12awlPqFeE/6I
+=/nYB
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.20.3.ebuild b/www-client/epiphany/epiphany-2.20.3.ebuild
deleted file mode 100644
index fe52ea3ea7f3..000000000000
--- a/www-client/epiphany/epiphany-2.20.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.20.3.ebuild,v 1.11 2008/03/17 14:03:39 armin76 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="doc networkmanager python spell xulrunner"
-
-# FIXME: add webkit/gecko switch possibility
-# dang: *after* webkit actually works.
-
-RDEPEND=">=dev-libs/glib-2.13.4
-	>=x11-libs/gtk+-2.11.6
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=dev-libs/dbus-glib-0.71
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	networkmanager? ( net-misc/networkmanager )
-	!xulrunner? ( =www-client/mozilla-firefox-2* )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	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
-	>=gnome-base/gnome-common-2.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--with-engine=mozilla
-		$(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_unpack()
-{
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-fix-de-docs-tests.patch"
-}
-
-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
-}
diff --git a/www-client/epiphany/epiphany-2.22.3-r1.ebuild b/www-client/epiphany/epiphany-2.22.3-r1.ebuild
index 85b9b2d9b7c3..9a6466ab57b6 100644
--- a/www-client/epiphany/epiphany-2.22.3-r1.ebuild
+++ b/www-client/epiphany/epiphany-2.22.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r1.ebuild,v 1.1 2009/01/03 11:38:34 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r1.ebuild,v 1.2 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -87,8 +87,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
 
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.22.3-r10.ebuild b/www-client/epiphany/epiphany-2.22.3-r10.ebuild
index 8560a08a06a8..cf7b8e9d54f1 100644
--- a/www-client/epiphany/epiphany-2.22.3-r10.ebuild
+++ b/www-client/epiphany/epiphany-2.22.3-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r10.ebuild,v 1.2 2008/09/04 11:25:09 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r10.ebuild,v 1.3 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -64,9 +64,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.22.3-r11.ebuild b/www-client/epiphany/epiphany-2.22.3-r11.ebuild
index e6feec2fe0f2..42b2c6dda3dc 100644
--- a/www-client/epiphany/epiphany-2.22.3-r11.ebuild
+++ b/www-client/epiphany/epiphany-2.22.3-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r11.ebuild,v 1.1 2009/01/03 11:38:34 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3-r11.ebuild,v 1.2 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -71,9 +71,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.22.3.ebuild b/www-client/epiphany/epiphany-2.22.3.ebuild
index eb502af8bea0..7409a6e621f0 100644
--- a/www-client/epiphany/epiphany-2.22.3.ebuild
+++ b/www-client/epiphany/epiphany-2.22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3.ebuild,v 1.8 2008/11/13 19:37:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.22.3.ebuild,v 1.9 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -84,8 +84,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
 
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.24.0.1.ebuild b/www-client/epiphany/epiphany-2.24.0.1.ebuild
index 18ad3ac8b857..ac0990229033 100644
--- a/www-client/epiphany/epiphany-2.24.0.1.ebuild
+++ b/www-client/epiphany/epiphany-2.24.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.0.1.ebuild,v 1.3 2008/12/17 17:47:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.0.1.ebuild,v 1.4 2009/01/03 12:47:03 eva Exp $
 
 EAPI="1"
 inherit gnome2 eutils multilib
@@ -69,9 +69,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.24.1-r10.ebuild b/www-client/epiphany/epiphany-2.24.1-r10.ebuild
index 9b405fdea066..3b403c9ad3d9 100644
--- a/www-client/epiphany/epiphany-2.24.1-r10.ebuild
+++ b/www-client/epiphany/epiphany-2.24.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.1-r10.ebuild,v 1.2 2008/11/12 08:17:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.1-r10.ebuild,v 1.3 2009/01/03 12:47:03 eva Exp $
 
 EAPI="1"
 
@@ -70,9 +70,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.24.1.ebuild b/www-client/epiphany/epiphany-2.24.1.ebuild
index 01b3a3d256ff..2729949abfb1 100644
--- a/www-client/epiphany/epiphany-2.24.1.ebuild
+++ b/www-client/epiphany/epiphany-2.24.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.1.ebuild,v 1.1 2008/10/22 22:16:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.1.ebuild,v 1.2 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -78,9 +78,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild b/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild
index d60606650d19..278138987f72 100644
--- a/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild
+++ b/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild,v 1.1 2008/11/29 12:34:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.2.1-r10.ebuild,v 1.2 2009/01/03 12:47:03 eva Exp $
 
 EAPI="1"
 
@@ -70,9 +70,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/epiphany-2.24.2.1.ebuild b/www-client/epiphany/epiphany-2.24.2.1.ebuild
index 36c91c17ed47..ea5f9b2a3367 100644
--- a/www-client/epiphany/epiphany-2.24.2.1.ebuild
+++ b/www-client/epiphany/epiphany-2.24.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.2.1.ebuild,v 1.1 2008/11/29 12:34:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.2.1.ebuild,v 1.2 2009/01/03 12:47:03 eva Exp $
 
 inherit gnome2 eutils multilib
 
@@ -78,9 +78,10 @@ src_compile() {
 	addpredict /usr/$(get_libdir)/xulrunner/components/xpti.dat.tmp
 	addpredict /usr/$(get_libdir)/xulrunner/components/compreg.dat.tmp
 
-	# Why are these write-opened per bug 228589?
+	# Why are these write-opened per bug #228589 and bug #253043
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
 	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
+	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
 
 	gnome2_src_compile
 }
diff --git a/www-client/epiphany/files/epiphany-2.20.3-fix-de-docs-tests.patch b/www-client/epiphany/files/epiphany-2.20.3-fix-de-docs-tests.patch
deleted file mode 100644
index ca7e8c93b296..000000000000
--- a/www-client/epiphany/files/epiphany-2.20.3-fix-de-docs-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- help/de/de.po.orig	2008-01-31 23:07:39.000000000 +0200
-+++ help/de/de.po	2008-01-31 23:13:56.000000000 +0200
-@@ -426,7 +426,7 @@
- "<xref linkend=\"epiphany-TBL-1\"/> describes the components of a browser "
- "window."
- msgstr ""
--"<xref linkend=\"epiphany-TBL-1\"> beschreibt die Komponenten eines Browser-"
-+"<xref linkend=\"epiphany-TBL-1\"/> beschreibt die Komponenten eines Browser-"
- "Fensters."
- 
- #: C/epiphany.xml:264(title)
-@@ -1230,8 +1230,8 @@
- "guimenuitem></menuchoice>."
- msgstr ""
- "Um ein Lesezeichen der aktuell betrachteten Seite anzulegen, wählen Sie "
--"<menuchoice><guimenu>Lesezeichen</guimenu>Lesezeichen hinzufügen …</"
--"guimenuitem></menuchoice>."
-+"<menuchoice><guimenu>Lesezeichen</guimenu><guimenuitem>Lesezeichen "
-+"hinzufügen …</guimenuitem></menuchoice>."
- 
- #: C/epiphany.xml:884(para)
- msgid ""
-@@ -1415,8 +1415,8 @@
- msgstr ""
- "Wählen Sie <menuchoice><guimenu>Datei</guimenu><guimenuitem>Umbenennen …</"
- "guimenuitem></menuchoice>. Alternativ wählen Sie <guimenuitem>Umbenennen "
--"<Del>…</guimenuitem> im Kontextmenü des Lesezeichens oder Themas. Der Name "
--"des Lesezeichens oder Themas ist ausgewählt."
-+"…</guimenuitem> im Kontextmenü des Lesezeichens oder Themas. Der Name des "
-+"Lesezeichens oder Themas ist ausgewählt."
- 
- #: C/epiphany.xml:1089(para)
- msgid ""