warn user when filepicker is absent in firefox flags, bug #209167

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 i686

5 files changed, 27 insertions, 105 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index b5540e3883a9..480fe68a01df 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,11 @@
 # 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.85 2008/06/08 18:17:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.86 2008/07/11 14:46:01 eva Exp $
+
+  11 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  epiphany-extensions-2.20.3.ebuild, -epiphany-extensions-2.22.1.ebuild,
+  epiphany-extensions-2.22.2.ebuild:
+  warn user when filepicker is absent in firefox flags, bug #209167
 
 *epiphany-extensions-2.22.2 (08 Jun 2008)
 
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 83618ab04d5e..737e28c15954 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 AUX epiphany-extensions-2.18.0-sessionsaver-v4.patch.gz 9992 RMD160 397765c966f94c38e513f80adb73478abedeb0b0 SHA1 6fc87dcf3d261f2b024ff35f6b67e5d7dd026b85 SHA256 c6e9f279ae93495f4633903ff3fcdfc18bfcfd04ff727b9dc2d5c20917c3f32b
 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
-EBUILD epiphany-extensions-2.22.2.ebuild 2630 RMD160 9f950712426164bd27a2a2e74569ad9787263c6a SHA1 0651468b7017e405dc16c76fc293509e3109b52f SHA256 1b8c8220fe920faf9beae138387dd64f31f19c9dee9f0551f9282e54aa4972fe
-MISC ChangeLog 14577 RMD160 2720585598511738d4711afb5ee6ee373b8eb180 SHA1 0fdb2753b083f4595ffb2596bba81de108c4b75e SHA256 a4212ec3c26a6eb4d5092673db2f8dd4c2236fde25072fc6694fb48cbfef71c9
+EBUILD epiphany-extensions-2.20.3.ebuild 2728 RMD160 2a7034ca9e105f0ad63611d89627ee96c63d4463 SHA1 ab9e6d8ad6a304d1690f380b8238d43295c4990e SHA256 40125910cfac3f9cd9dba14781e3aeaceb6d1e74e2cf0809483411fffa78bc8d
+EBUILD epiphany-extensions-2.22.2.ebuild 2826 RMD160 8b1eeef40018e7bedec92e0e2b3b8911a37854c2 SHA1 481644b65220b661faf70203585de4d2165f76eb SHA256 3e567749932bf5c5cda42b68288bbccf4dfb30c1945b3ccf681aaf8025d199a6
+MISC ChangeLog 14810 RMD160 fa4f4f4630bd89db33f99a1e46ca12e9a6de75e7 SHA1 6e7614979204662bd87f9dbba789334101e13d99 SHA256 35a3ca36939be6204e768473c0619170b8ed1df0a44f3dd3faf379059b25a39e
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhMIkgACgkQ1fmVwcYIWAakSACgtQcncq1qv24e3s5BgPGkb0oS
-/RsAoLC/NeIUbZX3VxIReE3UxwYzqxAB
-=MPiA
+iEYEARECAAYFAkh3cjcACgkQ1fmVwcYIWAZNtQCdEIEaYbnAEGZI+1YKePwvDrCh
+F98An2uZBvXskYAYH7flb+2o4ONIz/3q
+=2TFY
 -----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
index b2bdf0b90b88..3c33cf026188 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # 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.20.3.ebuild,v 1.13 2008/05/29 18:17:03 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.20.3.ebuild,v 1.14 2008/07/11 14:46:01 eva Exp $
 
 WANT_AUTOMAKE="1.10"
 inherit eutils gnome2 autotools python versionator
@@ -49,7 +49,7 @@ src_unpack() {
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
 
-	AT_M4DIR="m4" eautoreconf
+	eautoreconf
 }
 
 pkg_setup() {
@@ -75,6 +75,11 @@ pkg_setup() {
 		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
 }
 
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.22.1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.22.1.ebuild
deleted file mode 100644
index 5c5de1a63ad6..000000000000
--- a/www-client/epiphany-extensions/epiphany-extensions-2.22.1.ebuild
+++ /dev/null
@@ -1,91 +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-extensions/epiphany-extensions-2.22.1.ebuild,v 1.2 2008/05/29 18:17:03 hawking 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/epiphany-extensions/epiphany-extensions-2.22.2.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild
index efd3a07f22c5..f5c5ff0c3e11 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.22.2.ebuild,v 1.2 2008/07/11 14:46:01 eva Exp $
 
 inherit autotools eutils gnome2 python versionator
 
@@ -22,7 +22,7 @@ RDEPEND=">=www-client/epiphany-${MY_MAJORV}
 	>=x11-libs/gtk+-2.11.6
 	>=gnome-base/libglade-2
 	xulrunner? ( net-libs/xulrunner )
-	!xulrunner? ( >=www-client/mozilla-firefox-1.5 )
+	!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 )"
@@ -58,6 +58,11 @@ pkg_setup() {
 		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
 }
 
@@ -71,7 +76,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
-	AT_M4DIR="m4" eautoreconf
+	eautoreconf
 }
 
 pkg_postinst() {