Fix collisions, bug #247119, thanks to zmedico for the hints

Package-Manager: portage-2.1.4.5

3 files changed, 321 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index d8a4f89e155e..524851d1ed6d 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.455 2008/11/16 20:11:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.456 2008/11/23 17:14:59 armin76 Exp $
+
+*mozilla-firefox-3.0.4-r1 (23 Nov 2008)
+
+  23 Nov 2008; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-firefox-3.0.4-r1.ebuild:
+  Fix collisions, bug #247119, thanks to zmedico for the hints
 
   16 Nov 2008; Raúl Porcel <armin76@gentoo.org>
   -mozilla-firefox-2.0.0.17.ebuild, -mozilla-firefox-3.0.3.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 585bddfabd07..df1c01adfd7d 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -168,6 +168,7 @@ DIST xulrunner-1.9.0.4.tar.bz2 34070622 RMD160 13d5054b6967ee8290bcc098592c7848b
 DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
 EBUILD mozilla-firefox-2.0.0.18.ebuild 10373 RMD160 96409e9aa9705dc702d948fb3894b2070436908c SHA1 513f9f90357973a08c1a5046d20f781b33ec5c7f SHA256 42c7b0c7d9bea4a7cb238f56465cec7be3432bb0850eaa3678f7fa14c0d16f67
 EBUILD mozilla-firefox-3.0-r1.ebuild 10363 RMD160 16661d5500dee45fb8ff0a1ce7bcbfd85df71a0b SHA1 c3aea6473a042b20439889421fe48681e3ace060 SHA256 9b4c2059b7c90f7c981ff80013e187d690676f9c9e12aeb8db68c2f38a85546e
+EBUILD mozilla-firefox-3.0.4-r1.ebuild 10110 RMD160 f6a179b521f9cba290eac2908678ab26075271c3 SHA1 275b5e6a7fbeb3b80294321326961a282bc18459 SHA256 697d5fe35d92a39486ac18f23cece03afac8aa8cb3c48cb24ebd5c30959e5bf7
 EBUILD mozilla-firefox-3.0.4.ebuild 10079 RMD160 e1518c4f4e904b61ade59913643e4cfad2fe2b55 SHA1 4b236a651bc3d473a110fb89e0db5431e91bd4c9 SHA256 60c4bc92e3105f9ccff2415e832c66f5ea42bf9889618838a6361d0e4653f258
-MISC ChangeLog 89781 RMD160 72c3d672c488efbd6696aa857851c0c45bb60177 SHA1 fa5111146b9095e70e845b0a19e6f1fc6d33e095 SHA256 dedb6296d4cda10d8e5012f3d6cd3a7585cf9cc65bb1751ebabe7c04512eb693
+MISC ChangeLog 89971 RMD160 6100ff8e0f7093ac3e48d1ee4350376c349e47f2 SHA1 d3d87b295f6eb6ea046cb4de3fd08afc4d99693c SHA256 15ed7b5e099d3e82f851b0340f4dd24a0f919071c491878afe8d198dd89ce211
 MISC metadata.xml 860 RMD160 3197904ba75329ac8d603f9791471197f9f0d4ef SHA1 0607acccaa05ff9e533a2d505276b93a45a6cfb0 SHA256 86373386dfeed1a3bf14da81d88c924440f93ed7716f91cbeb0c9249a4577387
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.0.4-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..12b557f26869
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.0.4-r1.ebuild
@@ -0,0 +1,312 @@
+# 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.4-r1.ebuild,v 1.1 2008/11/23 17:14:59 armin76 Exp $
+EAPI="1"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension
+PATCH="${PN}-3.0.1-patches-0.3"
+
+LANGS="af ar be bg bn-IN ca cs cy da de el en-GB en-US eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
+
+MY_PV=${PV/3/}
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="java mozdevelop bindist restrict-javascript iceweasel +xulrunner"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
+	iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 )
+	!xulrunner? ( mirror://gentoo/xulrunner-1.9${MY_PV}.tar.bz2 )"
+
+# These are in
+#
+#  http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/xpi/
+#
+# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( http://dev.gentoo.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+	fi
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		if [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( http://dev.gentoo.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="java? ( virtual/jre )
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12
+	>=dev-libs/nspr-4.7.1
+	>=media-libs/lcms-1.17
+	>=app-text/hunspell-1.1.9
+	xulrunner? ( >=net-libs/xulrunner-1.9${MY_PV}-r1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+
+S="${WORKDIR}/mozilla"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=browser
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
+	if ! built_with_use --missing true x11-libs/pango X; then
+		eerror "Pango is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge pango."
+		die "Pango needs X"
+	fi
+
+	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"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+
+	fi
+}
+
+src_unpack() {
+	! use xulrunner && unpack xulrunner-1.9${MY_PV}.tar.bz2
+	unpack ${P}.tar.bz2 ${PATCH}.tar.bz2
+
+	if use iceweasel; then
+		unpack iceweasel-icons-3.0.tar.bz2
+
+		cp -r iceweaselicons/browser mozilla/
+	fi
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+
+	# Remove the patches we don't need
+	use xulrunner && rm "${WORKDIR}"/patch/*noxul* || rm "${WORKDIR}"/patch/*xulonly*
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	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
+	epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default,typeaheadfind"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-mochitest
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-hunspell
+	#mozconfig_annotate '' --enable-system-sqlite
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-system-lcms
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks
+
+	# Other ff-specific settings
+	#mozconfig_use_enable mozdevelop jsd
+	#mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	if use xulrunner; then
+		# Add xulrunner variable
+		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
+	fi
+
+	if ! use bindist && ! use iceweasel; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+	filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+	# to econf, but the quotes cause configure to fail.
+	sed -i -e \
+		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+		"${S}"/config/autoconf.mk \
+		"${S}"/toolkit/content/buildconfig.html
+
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	einfo "Removing old installs with some really ugly code.  It potentially"
+	einfo "eliminates any problems during the install, however suggestions to"
+	einfo "replace this are highly welcome.  Send comments and suggestions to"
+	einfo "mozilla@gentoo.org."
+	rm -rf "${ROOT}"${MOZILLA_FIVE_HOME}
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm "${D}"/usr/bin/firefox
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	use xulrunner && prefs=preferences || prefs=pref
+	cp "${FILESDIR}"/gentoo-default-prefs.js "${D}"${MOZILLA_FIVE_HOME}/defaults/${prefs}/all-gentoo.js
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			${MOZILLA_FIVE_HOME}/defaults/${prefs}/firefox.js \
+			${MOZILLA_FIVE_HOME}/defaults/${prefs}/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Install icon and .desktop for menu entry
+	if use iceweasel; then
+		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
+		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
+			mozilla-firefox-3.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
+		newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
+			mozilla-firefox-3.0.desktop
+		sed -i -e "s/Bon Echo/Minefield/" "${D}"/usr/share/applications/mozilla-firefox-3.0.desktop
+	fi
+
+	if use xulrunner; then
+		# Create /usr/bin/firefox
+		cat <<EOF >"${D}"/usr/bin/firefox
+#!/bin/sh
+export LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec "${MOZILLA_FIVE_HOME}"/firefox "\$@"
+EOF
+		fperms 0755 /usr/bin/firefox
+	else
+		# Create /usr/bin/firefox
+		make_wrapper firefox "${MOZILLA_FIVE_HOME}/firefox"
+
+		# Add vendor
+		echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
+			>> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
+	fi
+
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	ewarn "All the packages built against ${PN} won't compile,"
+	ewarn "if after installing firefox 3.0 you get some blockers,"
+	ewarn "please add 'xulrunner' to your USE-flags."
+
+	if use xulrunner; then
+		dosym /usr/$(get_libdir)/xulrunner-1.9/defaults/autoconfig \
+			${MOZILLA_FIVE_HOME}/defaults/autoconfig
+	fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}