[gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox: ChangeLog mozilla-firefox-3.0-r1.ebuild

[Raul Porcel (armin76)]

armin76     08/06/21 19:34:54

  Modified:             ChangeLog mozilla-firefox-3.0-r1.ebuild
  Log:
  Add iceweasel branding, to make rbu happy
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.417                www-client/mozilla-firefox/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.417&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?rev=1.417&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/ChangeLog?r1=1.416&r2=1.417

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- ChangeLog	20 Jun 2008 14:41:05 -0000	1.416
+++ ChangeLog	21 Jun 2008 19:34:53 -0000	1.417
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.416 2008/06/20 14:41:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.417 2008/06/21 19:34:53 armin76 Exp $
+
+  21 Jun 2008; Raúl Porcel <armin76@g.o>
+  mozilla-firefox-3.0-r1.ebuild:
+  Add iceweasel branding, to make rbu happy
 
   20 Jun 2008; Raúl Porcel <armin76@g.o>
   mozilla-firefox-3.0-r1.ebuild:



1.3                  www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild?r1=1.2&r2=1.3

Index: mozilla-firefox-3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-firefox-3.0-r1.ebuild	20 Jun 2008 14:41:05 -0000	1.2
+++ mozilla-firefox-3.0-r1.ebuild	21 Jun 2008 19:34:53 -0000	1.3
@@ -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/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild,v 1.2 2008/06/20 14:41:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.0-r1.ebuild,v 1.3 2008/06/21 19:34:53 armin76 Exp $
 EAPI="1"
 WANT_AUTOCONF="2.1"
 
@@ -18,11 +18,12 @@
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="java mozdevelop bindist restrict-javascript +xulrunner"
+IUSE="java mozdevelop bindist restrict-javascript iceweasel +xulrunner"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~armin76/${P}.tar.bz2
 	mirror://gentoo/${PATCH}.tar.bz2
+	iceweasel? ( mirror://gentoo/iceweasel-icons-2.0.0.11.tar.bz2 )
 	!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )"
 
 # These are in
@@ -104,7 +105,7 @@
 		die "Pango needs X"
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use iceweasel; then
 		elog "You are enabling official branding. You may not redistribute this build"
 		elog "to any users on your network or the internet. Doing so puts yourself into"
 		elog "a legal problem with Mozilla Foundation"
@@ -117,6 +118,12 @@
 	! use xulrunner && unpack xulrunner-1.9${MY_PV}.tar.bz2
 	unpack ${P}.tar.bz2 ${PATCH}.tar.bz2
 
+	if use iceweasel; then
+		unpack iceweasel-icons-2.0.0.11.tar.bz2
+
+		cp -r iceweaselicons/browser mozilla/
+	fi
+
 	linguas
 	for X in ${linguas}; do
 		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
@@ -134,6 +141,11 @@
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
+	if use iceweasel; then
+		sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* \
+			browser/branding/nightly/configure.sh
+	fi
+
 	eautoreconf
 
 	# We need to re-patch this because autoreconf overwrites it
@@ -177,7 +189,7 @@
 		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
 	fi
 
-	if ! use bindist; then
+	if ! use bindist && ! use iceweasel; then
 		mozconfig_annotate '' --enable-official-branding
 	fi
 
@@ -252,8 +264,12 @@
 	fi
 
 	# Install icon and .desktop for menu entry
-	if ! use bindist; then
-		 newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
+	if use iceweasel; then
+		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
+		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
+			mozilla-firefox-2.0.desktop
+	elif ! use bindist; then
+		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firefox-icon.png
 		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \
 			mozilla-firefox-3.0.desktop
 	else
@@ -289,9 +305,8 @@
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
 
 	ewarn "All the packages built against ${PN} won't compile,"
-	ewarn "since they should be built against net-libs/xulrunner,"
-	ewarn "therefore you should check if your package builds against"
-	ewarn "xulrunner and if it doesn't, file a bug, thanks."
+	ewarn "if after installing firefox 3.0 you get some blockers,"
+	ewarn "please add 'xulrunner' to your USE-flags."
 
 	# Update mimedb for the new .desktop file
 	fdo-mime_desktop_database_update



-- 
gentoo-commits@l.g.o mailing list