Version bump. Fix system plugin lookup, bug #279417. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 51 insertions, 91 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index bc976bf5cf81..2461fd01b4e1 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.212 2009/07/06 22:08:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.213 2009/08/02 10:12:47 eva Exp $
+
+*epiphany-2.26.3-r1 (02 Aug 2009)
+
+  02 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -epiphany-2.26.1.ebuild, -epiphany-2.26.2.ebuild,
+  +epiphany-2.26.3-r1.ebuild, +files/epiphany-2.26.3-system-plugin.patch:
+  Version bump. Fix system plugin lookup, bug #279417. Clean up old
+  revisions.
 
 *epiphany-2.26.3 (07 Jul 2009)
 
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 3f93eca04521..1523232fc99d 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -7,21 +7,19 @@ AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e
 AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
+AUX epiphany-2.26.3-system-plugin.patch 1180 RMD160 d27462c6d352de40103ee843ddd1eafdccd0a367 SHA1 7d1fa738d302f45715ae2dd4b3546d59055b40ce SHA256 4df1a20abdcd3f1591ba5dad241f96d31d0bca8be91f6a20e7c586748ae949a7
 DIST epiphany-2.24.3.tar.bz2 5722991 RMD160 d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b SHA1 945d7935273cf341f7c5445b31202ed257cfc9a6 SHA256 cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
-DIST epiphany-2.26.1.tar.bz2 5631650 RMD160 b25f3d3edab539ec1ce90181b4ef40e557a3286b SHA1 57b4b3112ec0a224fcd508b5cce133ebec62be03 SHA256 8b49b6e527814d2e66748a2ed35aa275738f46cab056cc58e2721a3b65f6b0ca
-DIST epiphany-2.26.2.tar.bz2 5655320 RMD160 8759787ff8b7fabfaf2b0362272c0d38e23a549c SHA1 446aa5475d478e447bae8e19c75ecbc802f9b144 SHA256 2cccfd27d454d5899c372969ba54e9231068c606ac5fb779a860081c519dec9c
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
 EBUILD epiphany-2.24.3-r10.ebuild 2410 RMD160 76f47e3085e03ea7519b8d9e08ae545c324cdddc SHA1 30e86b5b74e58934acdcbeb87c2d5240b37e0e63 SHA256 fa37df1cdf0b11219c7f3ec6f0101f1223c3dc2ad3492c7b9901327dee26e68b
 EBUILD epiphany-2.24.3.ebuild 2756 RMD160 cc01f406e1380d82e10a8df44348cb330d83eef3 SHA1 cb36053f0eb8b124fef19954f8836a490d2212d5 SHA256 f1acd30586027c353982c4298c1704459bcdb9729f133fafd0495ef1dc60b862
-EBUILD epiphany-2.26.1.ebuild 2273 RMD160 6f8e3212ab967dba6e0d5e3c9fd09cc946f3ed76 SHA1 8c7aa8e458a590d801487fddb390e2f66a992e5f SHA256 895f5b8909b4856c09bbbbe4a92cc2dca5775e93d07af93ddd9635cdd0b27a1b
-EBUILD epiphany-2.26.2.ebuild 2281 RMD160 d00f04127553c706be094096078bd47150d4bb8b SHA1 bacc27fec5a14d3ef52b833a2f2274d114ced637 SHA256 752205d87308cbbff55328c763b3405658d606475562c388f6eca11f1e47e033
+EBUILD epiphany-2.26.3-r1.ebuild 2443 RMD160 4237ead15a268c4852c233fa4c8fc794096eed06 SHA1 92096146728acac9bd62eff6fc729aa547c7632c SHA256 927f4afdf571d7b4abae23b8a1e111d0c1fcf54af9d53a0d5cf02c2ea4d99bea
 EBUILD epiphany-2.26.3.ebuild 2245 RMD160 e09d82b971f20470f6bd90efe66b7344edddd42c SHA1 6e98d0403731f52a3cd55cfd5c072eb4dd7f484b SHA256 e5192108d7d4fb407b4d3ac2fccf09792d83db3dd5f13fabad98bc4f5830a7d2
-MISC ChangeLog 43236 RMD160 bd4d3a4bbac556799b8be74357e19d108e91be3c SHA1 c13f63e607aedb267e6f50073b0d06b18f1a6489 SHA256 a260b4312366de5add12ec5f57d3a7c7dbfea1b33e9ca5759ecd83e27aefb7e2
+MISC ChangeLog 43533 RMD160 62080a4c7f50763ed955b087ca2f06884a13dfd5 SHA1 09b7d65a1188b5c16ee029ad74f31e73059eb373 SHA256 bfec6efe3a4047a985a3ab87fb26ceb69af167cd9ceca721cf6d4e8d3d35467a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpSkf8ACgkQ1fmVwcYIWAYeugCfeOFPX7SgVW9BejVHYuUPVvZ9
-g9oAoIRwoWgPAZf+1mACkJPMHZomdyqn
-=Byge
+iEYEARECAAYFAkp1ZqUACgkQ1fmVwcYIWAYpjACePSqdsV9Cpikvxdsph4wY72Yz
+ZfYAn2PZlubd4F5YwVdf/Zoytaigm6vP
+=5i7j
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany/epiphany-2.26.1.ebuild b/www-client/epiphany/epiphany-2.26.1.ebuild
deleted file mode 100644
index ffc7eeaa27d3..000000000000
--- a/www-client/epiphany/epiphany-2.26.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.26.1.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils multilib autotools
-
-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"
-IUSE="avahi doc networkmanager python spell"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.16.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
-	>=media-libs/libcanberra-0.3[gtk]
-	>=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 )
-	=net-libs/xulrunner-1.9*
-	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.40
-	>=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-gecko=libxul-embedding
-		--enable-certificate-manager
-		--with-distributor-name=Gentoo
-		--enable-canberra
-		$(use_enable avahi zeroconf)
-		$(use_enable networkmanager network-manager)
-		$(use_enable spell spell-checker)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation with xulrunner 1.9.1, bug #263990
-	epatch "${FILESDIR}/${PN}-2.26.0-xulrunner191.patch"
-
-	# Fix libcanberra automagic support, bug #266232
-	epatch "${FILESDIR}/${P}-automagic-libcanberra.patch"
-
-	# Fix sandbox violations, bug 263585
-	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
-
-	# Make it libtool-1 compatible
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/www-client/epiphany/epiphany-2.26.2.ebuild b/www-client/epiphany/epiphany-2.26.3-r1.ebuild
index 92377aeea34a..bf42d762f746 100644
--- a/www-client/epiphany/epiphany-2.26.2.ebuild
+++ b/www-client/epiphany/epiphany-2.26.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.26.2.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r1.ebuild,v 1.1 2009/08/02 10:12:47 eva Exp $
 
 EAPI="2"
 
@@ -50,7 +50,6 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--with-gecko=libxul-embedding
-		--enable-certificate-manager
 		--with-distributor-name=Gentoo
 		--enable-canberra
 		$(use_enable avahi zeroconf)
@@ -68,12 +67,22 @@ src_prepare() {
 	# Fix libcanberra automagic support, bug #266232
 	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
 
-	# Fix sandbox violations, bug 263585
+	# Fix sandbox violations, bug #263585
 	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
 
+	# Fix detection of system plugin, bug #279417
+	epatch "${FILESDIR}/${P}-system-plugin.patch"
+
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
+
+src_install() {
+	gnome2_src_install
+
+	# Drop useless .la file
+	find "${D}" -name '*.la' -delete
+}
diff --git a/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch b/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch
new file mode 100644
index 000000000000..71b408141e76
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26.3-system-plugin.patch
@@ -0,0 +1,24 @@
+# Allow plugins installed in system to be used
+# Gentoo: https://bugs.gentoo.org/attachment.cgi?id=199400
+--- a/embed/mozilla/Makefile.am	2009-07-27 21:18:46.658006845 -0500
++++ b/embed/mozilla/Makefile.am	2009-07-27 21:19:46.633007194 -0500
+@@ -161,7 +161,7 @@
+ 	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\"		\
+ 	-DMOZILLA_HOME=\"$(GECKO_HOME)\"	\
+ 	-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\"	\
+-	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\"		\
++	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\"		\
+ 	-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\"	\
+ 	-DALLOW_PRIVATE_API			\
+ 	$(AM_CPPFLAGS)
+--- a/embed/mozilla/Makefile.in	2009-07-27 21:18:53.673984077 -0500
++++ b/embed/mozilla/Makefile.in	2009-07-27 21:20:06.010983867 -0500
+@@ -493,7 +493,7 @@
+ 	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
+ 	-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
+ 	-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
+-	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
++	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/nsbrowser/plugins\" \
+ 	-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \
+ 	$(AM_CPPFLAGS) $(am__append_7)
+ libephymozillaembed_la_CXXFLAGS = \