Stop using mozilla-launcher

Package-Manager: portage-2.1.4.4

3 files changed, 292 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 4e020bfec9a7..2593887c3e32 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.390 2008/04/18 10:56:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.391 2008/04/19 10:02:43 armin76 Exp $
+
+*mozilla-firefox-3.0_beta5-r1 (19 Apr 2008)
+
+  19 Apr 2008; Raúl Porcel <armin76@gentoo.org>
+  +mozilla-firefox-3.0_beta5-r1.ebuild:
+  Stop using mozilla-launcher
 
   18 Apr 2008; Raúl Porcel <armin76@gentoo.org>
   mozilla-firefox-2.0.0.14.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index e30b2b1f9f1b..9a253301cd86 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -236,6 +236,7 @@ EBUILD mozilla-firefox-2.0.0.11.ebuild 9942 RMD160 45c9ee5c37f3fbec77acaa4321b36
 EBUILD mozilla-firefox-2.0.0.12.ebuild 10000 RMD160 fe7baeb08746562b39f000e77034eece7b049360 SHA1 4741dd2ca465f34170ca8e47be271b4264a70df0 SHA256 614d0a43a876ed6ef3d8c2c9eff68bd1a935e92fcf37b75ac93c82152ce83578
 EBUILD mozilla-firefox-2.0.0.13.ebuild 9986 RMD160 75a4c7375a7882f82c4a1dcc8b19306ce819d811 SHA1 b02477d41be7f9e3708a5fb33e81c1f7bf45c153 SHA256 31d1011b39afcfff6bcf0339367b11f2d305a015b2f4f2e3528974bc9fdb7836
 EBUILD mozilla-firefox-2.0.0.14.ebuild 10003 RMD160 a01477c661463b962b7e7caff1bec6dd624d3996 SHA1 8e4d94c3074bc2d7775e26dd8262e5af91db10dc SHA256 2923dd08801545290336e3a5a94181ee6b97cfb449e9ba6543cee5e965df5eb5
+EBUILD mozilla-firefox-3.0_beta5-r1.ebuild 9387 RMD160 29f48dc8b4707c276e7d74030885ea56fad0f1ff SHA1 847deded8eede3e75c34869a3c0d082218d14954 SHA256 aaf38d5d6687af20f93b2baacb2b6d3332b5d8f8a8bf7b0075a2b42bf7106521
 EBUILD mozilla-firefox-3.0_beta5.ebuild 9789 RMD160 8379fc0607d97632807626c001114f74971e2f80 SHA1 c5ba83df0501ceedf259a020c3103681177fac1d SHA256 705c76779f21c6926fd90113642dfd11d93c9da1ad6844d930dcb1651a7551ea
-MISC ChangeLog 80430 RMD160 7d4aca10a06f3428ebe4a2a11668c5d12f8a7ec9 SHA1 27057ef024acade51f8deb39cf9b5229ce20e18f SHA256 0877448bd8ad8b09f565acf5a2dc440be628eccbe8e1ce11b57d61a56869125d
+MISC ChangeLog 80595 RMD160 9c8f1de1c8cb1ed5a1528662fbc32c566f4d6bf9 SHA1 9c90f97c64b30d84ebf9534840a7ec850dfc815e SHA256 a41fb9928bf0aa523a2eb29708d9651dbe498535a0d32c523b349643a2242c8c
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..0f9c45a00470
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.0_beta5-r1.ebuild
@@ -0,0 +1,283 @@
+# 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_beta5-r1.ebuild,v 1.1 2008/04/19 10:02:43 armin76 Exp $
+EAPI="1"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension
+PATCH="${P}-patches-0.1"
+
+LANGS="af ar be ca cs de el en-GB es-AR es-ES eu fi fr fy-NL gu-IN he hu id it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sq sv-SE tr uk zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
+
+MY_PV=${PV/_beta/b}
+MY_P="${PN}-${MY_PV}"
+MY_PV=${PV/3.0/}
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+
+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"
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PATCH}.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
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P}-xpi/${MY_P}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P}-xpi/${MY_P}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND="java? ( virtual/jre )
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12_beta3
+	>=dev-libs/nspr-4.7.1_beta2
+	>=media-libs/lcms-1.17
+	>=app-text/hunspell-1.1.9
+	>=dev-db/sqlite-3.5
+	xulrunner? ( >=net-libs/xulrunner-1.9${MY_PV} )"
+
+DEPEND="${RDEPEND}
+	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 ! use bindist; 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
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" ]]; 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
+
+	eautoreconf || die "failed  running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default,typeaheadfind"
+
+	#if use xforms; then
+	#	MEXTENSIONS="${MEXTENSIONS},xforms"
+	#fi
+	####################################
+	#
+	# 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; 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
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	# 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}"/"${MY_P}-${X}"
+	done
+
+	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/preferences/firefox.js \
+			${MOZILLA_FIVE_HOME}/defaults/preferences/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Install icon and .desktop for menu entry
+	if ! 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/firefox/content/icon48.png firefox-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \
+			mozilla-firefox-3.0.desktop
+	fi
+
+	dodir ${MOZILLA_FIVE_HOME}/defaults/preferences
+	cp "${FILESDIR}"/gentoo-default-prefs.js "${D}"${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js
+
+	if use xulrunner; then
+		PKG_CONFIG=`which pkg-config`
+		X_DATE=`date +%Y%m%d`
+		XULRUNNER_VERSION=`${PKG_CONFIG} --modversion libxul`
+
+		#set the application.ini
+		sed -i -e "s|BuildID=.*$|BuildID=${X_DATE}GentooMozillaFirefox|"	"${D}"${MOZILLA_FIVE_HOME}/application.ini
+		sed -i -e "s|MinVersion=.*$|MinVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini
+		sed -i -e "s|MaxVersion=.*$|MaxVersion=${XULRUNNER_VERSION}|" "${D}"${MOZILLA_FIVE_HOME}/application.ini
+		# Create /usr/bin/firefox
+		make_wrapper firefox "/usr/bin/xulrunner-1.9 ${MOZILLA_FIVE_HOME}/application.ini"
+	else
+		# Create /usr/bin/firefox
+		make_wrapper firefox "${MOZILLA_FIVE_HOME}/firefox-bin"
+	fi
+}
+
+pkg_postinst() {
+	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."
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+}