Actually enable system hunspell so dicts. are found

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 240 insertions, 2 deletions

diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 2ed1af4d7aad..0ca95455dfa4 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.324 2010/04/08 03:47:25 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.325 2010/04/10 01:53:14 anarchy Exp $
+
+*mozilla-thunderbird-3.0.4-r1 (10 Apr 2010)
+
+  10 Apr 2010; <anarchy@gentoo.org> +mozilla-thunderbird-3.0.4-r1.ebuild:
+  actually enable system hunspell support
 
 *mozilla-thunderbird-3.0.4 (08 Apr 2010)
 
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 67da5091b40a..054a14aa19c4 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -128,6 +128,7 @@ DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fd
 EBUILD mozilla-thunderbird-2.0.0.23.ebuild 7778 RMD160 f290a913aa014b6dd7dc17793ff1bf23b8cd5c4f SHA1 07aa45c6e167bce56f66a8295405587ecb5335ca SHA256 bc64e142a94a3c8e138312e8ccd2b76ebb405f53e60319d7dd3e6d92c0ce2fed
 EBUILD mozilla-thunderbird-3.0.3-r2.ebuild 6652 RMD160 f5901954748814b6368693856ea909f2a1f22dd0 SHA1 8527febe6dbb9315cb4bce0aaae0a459389ac056 SHA256 4d6e6185ab9cf90acfa726c7786dc23b7435e91f2e3611adfc0dcbb9d3c7542e
 EBUILD mozilla-thunderbird-3.0.3.ebuild 6567 RMD160 71d660b8b7e78e3b91f56cc46aef2cc1bb78601b SHA1 fbe690b085bcefb7c607c9e03da1ae61938520ad SHA256 cdd133a0886e61c8e1f4f48bebc8355190e70a45b5e39c38739025b737f7e23d
+EBUILD mozilla-thunderbird-3.0.4-r1.ebuild 6770 RMD160 58bbb8bcbd69dbf950fef32551fc8b72e45004f8 SHA1 bcc1b651ffec72476c213f4d45a289a166c987e9 SHA256 f557be89a07722f354f7fec1008bbe29360e1c88af47c4f6ad329a365b397200
 EBUILD mozilla-thunderbird-3.0.4.ebuild 6719 RMD160 f98ad6d25bc55df0489ea723a80a93ca7a756031 SHA1 2c1c62a4485d757eb71bec5cbca17c6792a5a323 SHA256 887b649d4bfb73c515dc1a86fc50cd65d614600b0f425f86ad572f7884cfbbcd
-MISC ChangeLog 49007 RMD160 02aeccdba6e45645d0895d10f6f8edc403afa706 SHA1 31163a27303001c2aff4143e2d83752fc9fdc147 SHA256 04f6e336178cc080f004a9dab60f0a19f237f6808a1ec35b1eee9095681c400c
+MISC ChangeLog 49169 RMD160 67bc58e610db1c29462a545dfa32130c0cb7e966 SHA1 3c976a8f03919ea7fd2b9ee2598aa225d2a2a599 SHA256 3ec6dbfb92ab45d1f32223d02fb3f722c244c35df578d8423d86bb83cc181940
 MISC metadata.xml 638 RMD160 69ece61a118b4331cbf38dfeb658871963d29357 SHA1 f5a4acb54857595ad73793e9347321453712591a SHA256 7c168cc39644dad0cba0c7362d472c56a233b26c9c10959cfaf432e4b1f2efaf
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..ef4a8d8a34db
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild,v 1.1 2010/04/10 01:53:14 anarchy Exp $
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+
+LANGS="af be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr ga-IE he hu it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sv-SE tr uk zh-CN zh-TW"
+# Languages not rebuilt for "sl mk"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+
+MY_PV2="${PV/_rc/rc}"
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="alsa ldap crypt bindist lightning mozdom system-sqlite"
+PATCH="${PN}-3.0-patches-0.3"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases"
+SRC_URI="${REL_URI}/${MY_PV2}/source/thunderbird-${MY_PV2}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV2}/linux-i686/xpi/${X}.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%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.3
+	>=dev-libs/nspr-4.8
+	alsa? ( media-libs/alsa-lib )
+	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	>=media-libs/lcms-1.17
+	>=app-text/hunspell-1.2
+	x11-libs/cairo[X]
+	x11-libs/pango[X]
+	!x11-plugins/lightning"
+
+PDEPEND="crypt? ( >=x11-plugins/enigmail-1.0 )"
+
+S="${WORKDIR}"/comm-1.9.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 ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	export BUILD_OFFICIAL=1
+	export MOZILLA_OFFICIAL=1
+
+	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() {
+	unpack ${A}
+
+	linguas
+	for X in ${linguas}; do
+		# FIXME: Add support for unpacking xpis to portage
+		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_EXCLUDE="106-bz466250_att349521_fix_ftbfs_with_cairo_fb.patch"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	epatch "${FILESDIR}/1002_fix-system-hunspell-dict-detections.patch"
+
+	eautoreconf
+
+	cd mozilla
+	eautoreconf
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	touch mail/config/mozconfig
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=mail
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-system-hunspell
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	if ! use bindist; then
+		mozconfig_annotate '' --enable-official-branding
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+}
+
+src_compile() {
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
+	emake ${jobs} || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use lightning ; then
+		declare emid
+
+		cd "${T}"
+		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi install.rdf
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
+	fi
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	done
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/nightly/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+	fi
+
+	# Warn user that remerging enigmail is neccessary on USE=crypt
+	use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}."
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+}