Fix bug 412441. I do not believe that having curl built without nss is required for sending crash reports.

(Portage version: 2.2.0_alpha119/cvs/Linux i686)

5 files changed, 39 insertions, 29 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 16b2d4c2ec80..022a235e2c1a 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.111 2012/07/17 05:31:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.112 2012/07/19 19:07:18 jdhore Exp $
+
+  19 Jul 2012; Jeff Horelick <jdhore@gentoo.org> firefox-bin-10.0.5.ebuild,
+  firefox-bin-10.0.6.ebuild, firefox-bin-13.0.1.ebuild,
+  firefox-bin-14.0.1.ebuild:
+  Fix bug 412441. I do not believe that having curl built without nss is
+  required for sending crash reports.
 
 *firefox-bin-10.0.6 (17 Jul 2012)
 
diff --git a/www-client/firefox-bin/firefox-bin-10.0.5.ebuild b/www-client/firefox-bin/firefox-bin-10.0.5.ebuild
index 3a628b450682..19034daae67f 100644
--- a/www-client/firefox-bin/firefox-bin-10.0.5.ebuild
+++ b/www-client/firefox-bin/firefox-bin-10.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.5.ebuild,v 1.4 2012/07/04 19:57:45 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.5.ebuild,v 1.5 2012/07/19 19:07:18 jdhore Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -128,12 +128,13 @@ pkg_postinst() {
 		einfo "gnome-base/orbit and net-misc/curl emerged."
 		einfo
 	fi
-	if has_version 'net-misc/curl[nss]'; then
-		einfo
-		einfo "Crashreporter won't be able to send reports"
-		einfo "if you have curl emerged with the nss USE-flag"
-		einfo
-	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/firefox-bin/firefox-bin-10.0.6.ebuild b/www-client/firefox-bin/firefox-bin-10.0.6.ebuild
index 57f9058ab00c..97e41e4ed1ee 100644
--- a/www-client/firefox-bin/firefox-bin-10.0.6.ebuild
+++ b/www-client/firefox-bin/firefox-bin-10.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.6.ebuild,v 1.1 2012/07/17 05:31:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.6.ebuild,v 1.2 2012/07/19 19:07:18 jdhore Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -128,12 +128,13 @@ pkg_postinst() {
 		einfo "gnome-base/orbit and net-misc/curl emerged."
 		einfo
 	fi
-	if has_version 'net-misc/curl[nss]'; then
-		einfo
-		einfo "Crashreporter won't be able to send reports"
-		einfo "if you have curl emerged with the nss USE-flag"
-		einfo
-	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/firefox-bin/firefox-bin-13.0.1.ebuild b/www-client/firefox-bin/firefox-bin-13.0.1.ebuild
index c0a4b4049aeb..32c86ca2fb2e 100644
--- a/www-client/firefox-bin/firefox-bin-13.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-13.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-13.0.1.ebuild,v 1.3 2012/07/04 19:57:45 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-13.0.1.ebuild,v 1.4 2012/07/19 19:07:18 jdhore Exp $
 
 EAPI="4"
 
@@ -121,12 +121,13 @@ pkg_postinst() {
 		einfo "gnome-base/orbit and net-misc/curl emerged."
 		einfo
 	fi
-	if has_version 'net-misc/curl[nss]'; then
-		einfo
-		einfo "Crashreporter won't be able to send reports"
-		einfo "if you have curl emerged with the nss USE-flag"
-		einfo
-	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update
diff --git a/www-client/firefox-bin/firefox-bin-14.0.1.ebuild b/www-client/firefox-bin/firefox-bin-14.0.1.ebuild
index ad7c59dce5f8..911626027103 100644
--- a/www-client/firefox-bin/firefox-bin-14.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-14.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-14.0.1.ebuild,v 1.1 2012/07/17 05:26:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-14.0.1.ebuild,v 1.2 2012/07/19 19:07:18 jdhore Exp $
 
 EAPI="4"
 
@@ -121,12 +121,13 @@ pkg_postinst() {
 		einfo "gnome-base/orbit and net-misc/curl emerged."
 		einfo
 	fi
-	if has_version 'net-misc/curl[nss]'; then
-		einfo
-		einfo "Crashreporter won't be able to send reports"
-		einfo "if you have curl emerged with the nss USE-flag"
-		einfo
-	fi
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update