From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1O0Psx-0006jz-Lo for garchives@archives.gentoo.org; Sat, 10 Apr 2010 01:53:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D540E0724; Sat, 10 Apr 2010 01:53:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 387B6E0724 for ; Sat, 10 Apr 2010 01:53:16 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A7C951B4226 for ; Sat, 10 Apr 2010 01:53:15 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 942) id D99022C04A; Sat, 10 Apr 2010 01:53:14 +0000 (UTC) From: "Jory Pratt (anarchy)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, anarchy@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in mail-client/mozilla-thunderbird: mozilla-thunderbird-3.0.4-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: mozilla-thunderbird-3.0.4-r1.ebuild ChangeLog X-VCS-Directories: mail-client/mozilla-thunderbird X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt Content-Type: text/plain; charset=utf8 Message-Id: <20100410015314.D99022C04A@corvid.gentoo.org> Date: Sat, 10 Apr 2010 01:53:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 35cb75db-3887-44d8-9a59-ac437bb7c364 X-Archives-Hash: ce79976d378584812044c5c60d9cf58a anarchy 10/04/10 01:53:14 Modified: ChangeLog Added: mozilla-thunderbird-3.0.4-r1.ebuild Log: Actually enable system hunspell so dicts. are found (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.325 mail-client/mozilla-thunderbird/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mozill= a-thunderbird/ChangeLog?rev=3D1.325&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mozill= a-thunderbird/ChangeLog?rev=3D1.325&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mozill= a-thunderbird/ChangeLog?r1=3D1.324&r2=3D1.325 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeL= og,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- ChangeLog 8 Apr 2010 03:47:25 -0000 1.324 +++ ChangeLog 10 Apr 2010 01:53:14 -0000 1.325 @@ -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/Chang= eLog,v 1.324 2010/04/08 03:47:25 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/Chang= eLog,v 1.325 2010/04/10 01:53:14 anarchy Exp $ + +*mozilla-thunderbird-3.0.4-r1 (10 Apr 2010) + + 10 Apr 2010; +mozilla-thunderbird-3.0.4-r1.ebuild= : + actually enable system hunspell support =20 *mozilla-thunderbird-3.0.4 (08 Apr 2010) =20 1.1 mail-client/mozilla-thunderbird/mozilla-thunderbird-= 3.0.4-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mozill= a-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mozill= a-thunderbird/mozilla-thunderbird-3.0.4-r1.ebuild?rev=3D1.1&content-type=3D= text/plain Index: mozilla-thunderbird-3.0.4-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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/mozill= a-thunderbird-3.0.4-r1.ebuild,v 1.1 2010/04/10 01:53:14 anarchy Exp $ EAPI=3D"2" WANT_AUTOCONF=3D"2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib= mozextension autotools LANGS=3D"af be bg ca cs da de el en-GB en-US es-AR es-ES eu fi fr ga-IE h= e 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=3D"en-GB es-AR pt-BR zh-TW" MY_PV2=3D"${PV/_rc/rc}" MY_P=3D"${P/_rc/rc}" DESCRIPTION=3D"Thunderbird Mail Client" HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" KEYWORDS=3D"~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"alsa ldap crypt bindist lightning mozdom system-sqlite" PATCH=3D"${PN}-3.0-patches-0.3" REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/thunderbird/releas= es" SRC_URI=3D"${REL_URI}/${MY_PV2}/source/thunderbird-${MY_PV2}.source.tar.b= z2 http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" for X in ${LANGS} ; do if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X/-/_}? ( ${REL_URI}/${MY_PV2}/linux-i686/xpi/${X}.xpi -> ${= P}-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" # english is handled internally if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then if [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-= ${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X%%-*}" fi done RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.3 >=3Ddev-libs/nspr-4.8 alsa? ( media-libs/alsa-lib ) system-sqlite? ( >=3Ddev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) >=3Dmedia-libs/lcms-1.17 >=3Dapp-text/hunspell-1.2 x11-libs/cairo[X] x11-libs/pango[X] !x11-plugins/lightning" PDEPEND=3D"crypt? ( >=3Dx11-plugins/enigmail-1.0 )" S=3D"${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=3D"${linguas:+"${linguas} "}en" continue elif has ${LANG} ${LANGS//-/_}; then has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${L= ANG//_/-}" continue elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then for X in ${LANGS}; do if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" continue 2 fi done fi ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" done } pkg_setup() { export BUILD_OFFICIAL=3D1 export MOZILLA_OFFICIAL=3D1 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 yours= elf 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} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" done if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then einfo "Selected language packs (first will be default): ${linguas}" fi } src_prepare() { # Apply our patches EPATCH_EXCLUDE=3D"106-bz466250_att349521_fix_ftbfs_with_cairo_fb.patch" EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"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=3D"/usr/$(get_libdir)/${PN}" MEXTENSIONS=3D"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=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dmail mozconfig_use_enable ldap mozconfig_use_enable ldap ldap-experimental mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE_= HOME} mozconfig_annotate '' --with-user-appdir=3D.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=3D"${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=3D${MAKEOPTS/--no-print-directory/} if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi CPPFLAGS=3D"${CPPFLAGS}" \ CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \ econf || die } src_compile() { # Should the build use multiprocessing? Not enabled by default, as it te= nds to break [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" emake ${jobs} || die } src_install() { declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" emake DESTDIR=3D"${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=3D$(sed -n '//!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} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" done if ! use bindist; then newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png t= hunderbird-icon.png domenu "${FILESDIR}"/icon/${PN}.desktop else newicon "${S}"/mail/branding/nightly/content/icon48.png thunderbird-ico= n-unbranded.png newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ ${PN}.desktop fi # Warn user that remerging enigmail is neccessary on USE=3Dcrypt 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" }