diff options
author | Jory Pratt <anarchy@gentoo.org> | 2010-12-09 14:41:11 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2010-12-09 14:41:11 +0000 |
commit | 66b3d42a3e174844938ff6bab3d0661cf4b2a052 (patch) | |
tree | 84fd13652a303b30cc4aa61e0a8dad8b17b03222 /mail-client | |
parent | Version cleanup (diff) | |
download | historical-66b3d42a3e174844938ff6bab3d0661cf4b2a052.tar.gz historical-66b3d42a3e174844938ff6bab3d0661cf4b2a052.tar.bz2 historical-66b3d42a3e174844938ff6bab3d0661cf4b2a052.zip |
Version Bump
Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64
Diffstat (limited to 'mail-client')
-rw-r--r-- | mail-client/thunderbird-bin/ChangeLog | 8 | ||||
-rw-r--r-- | mail-client/thunderbird-bin/thunderbird-bin-3.1.7.ebuild | 160 | ||||
-rw-r--r-- | mail-client/thunderbird/ChangeLog | 7 | ||||
-rw-r--r-- | mail-client/thunderbird/thunderbird-3.1.7.ebuild | 250 |
4 files changed, 423 insertions, 2 deletions
diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog index d266be11ea59..5ccdb18d675e 100644 --- a/mail-client/thunderbird-bin/ChangeLog +++ b/mail-client/thunderbird-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/thunderbird-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.21 2010/10/30 10:00:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.22 2010/12/09 14:41:11 anarchy Exp $ + +*thunderbird-bin-3.1.7 (09 Dec 2010) + + 09 Dec 2010; Jory A. Pratt <anarchy@gentoo.org> + +thunderbird-bin-3.1.7.ebuild: + Version Bump 30 Oct 2010; Markus Meier <maekke@gentoo.org> thunderbird-bin-3.1.6.ebuild: diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.7.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.7.ebuild new file mode 100644 index 000000000000..8dff292cbef8 --- /dev/null +++ b/mail-client/thunderbird-bin/thunderbird-bin-3.1.7.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.7.ebuild,v 1.1 2010/12/09 14:41:11 anarchy Exp $ + +EAPI="2" + +inherit eutils multilib mozextension + +# Can be updated using scripts/get_langs.sh from mozilla overlay +# '\' at EOL is needed for ${LANG} matching in linguas() below +LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \ +fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru \ +si sk sl sq sv-SE tr uk zh-CN zh-TW" +NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" + +MY_PN="${PN/-bin}" +MY_PV="${PV/_beta/b}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Thunderbird Mail Client" +REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/" +SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2" +HOMEPAGE="http://www.mozilla.com/thunderbird" +RESTRICT="strip" + +KEYWORDS="-* ~amd64 ~x86" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="" + +for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${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}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X%%-*}" + fi +done + +DEPEND="app-arch/unzip" +RDEPEND="x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu + x86? ( + >=x11-libs/gtk+-2.2 + net-misc/curl[nss] + ) + amd64? ( + app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-gtklibs + )" + +S="${WORKDIR}/thunderbird" + +pkg_setup() { + # This is a binary x86 package => ABI=x86 + # Please keep this in future versions + # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26 + has_multilib_profile && ABI="x86" +} + +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 +} + +src_unpack() { + unpack ${A} + + linguas + for X in ${linguas}; do + [[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi" + done +} + +src_install() { + declare MOZILLA_FIVE_HOME="/opt/${MY_PN}" + + # Install thunderbird in /opt + dodir ${MOZILLA_FIVE_HOME%/*} + mv "${S}" "${D}"${MOZILLA_FIVE_HOME} + + linguas + for X in ${linguas}; do + [[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X} + done + + # Create /usr/bin/thunderbird-bin + dodir /usr/bin/ + cat <<EOF >"${D}"/usr/bin/${PN} +#!/bin/sh +unset LD_PRELOAD +LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" +exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@" +EOF + fperms 0755 /usr/bin/${PN} + + # Install icon and .desktop for menu entry + doicon "${FILESDIR}"/icon/${PN}-icon.png + domenu "${FILESDIR}"/icon/${PN}.desktop + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + doins "${FILESDIR}"/10${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" +} + +pkg_postinst() { + #elog "For enigmail, please see instructions at" + #elog " http://enigmail.mozdev.org/" + + if use x86; then + if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then + einfo + einfo "For using the crashreporter, you need gnome-base/gconf," + einfo "gnome-base/orbit and net-misc/curl emerged." + einfo + fi + else + einfo + einfo "NB: You just installed a 32-bit thunderbird" + einfo + einfo "Crashreporter won't work on amd64" + einfo + fi + + einfo + elog 'We have moved away from mozilla-launcher, as it has major design flaws.' + elog 'You will need to update your symlinks to use thunderbird-bin as the executable' + elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you' + elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"' +} diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index 0e4acf80d057..63baf5dddb73 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.51 2010/11/14 12:47:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.52 2010/12/09 14:38:32 anarchy Exp $ + +*thunderbird-3.1.7 (09 Dec 2010) + + 09 Dec 2010; Jory A. Pratt <anarchy@gentoo.org> +thunderbird-3.1.7.ebuild: + Version bump 14 Nov 2010; Raúl Porcel <armin76@gentoo.org> thunderbird-3.1.6.ebuild: alpha/ia64/sparc stable wrt #342847 diff --git a/mail-client/thunderbird/thunderbird-3.1.7.ebuild b/mail-client/thunderbird/thunderbird-3.1.7.ebuild new file mode 100644 index 000000000000..a31b53039c50 --- /dev/null +++ b/mail-client/thunderbird/thunderbird-3.1.7.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.7.ebuild,v 1.1 2010/12/09 14:38:32 anarchy Exp $ + +EAPI="3" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools + +# This list can be updated using get_langs.sh from the mozilla overlay +LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \ +fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru si \ +sk sl sq sv-SE tr uk zh-CN zh-TW" +NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" + +MY_PV="${PV/_rc/rc}" +MY_P="${P/_rc/rc}" + +DESCRIPTION="Thunderbird Mail Client" +HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa ldap +crypt bindist libnotify +lightning mozdom system-sqlite wifi" +PATCH="${PN}-3.1-patches-1.2" + +REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" +SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" + +for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/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}/${MY_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.8 + >=dev-libs/nspr-4.8.6 + >=app-text/hunspell-1.2 + x11-libs/cairo[X] + x11-libs/pango[X] + alsa? ( media-libs/alsa-lib ) + libnotify? ( >=x11-libs/libnotify-0.4 ) + system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] ) + wifi? ( net-wireless/wireless-tools ) + !x11-plugins/lightning" + +PDEPEND="crypt? ( >=x11-plugins/enigmail-1.1 )" + +S="${WORKDIR}"/comm-1.9.2 + +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_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + epatch "${FILESDIR}/bug-606109.patch" + + # Allow user to apply any additional patches without modifing ebuild + epatch_user + + 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_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}" + mozconfig_annotate '' --with-user-appdir=.thunderbird + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --with-sqlite-prefix="${EPREFIX}"/usr + mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate 'broken' --disable-crashreporter + mozconfig_annotate '' --enable-system-hunspell + + # Use enable features + mozconfig_use_enable ldap + mozconfig_use_enable ldap ldap-experimental + mozconfig_use_enable libnotify + mozconfig_use_enable lightning calendar + mozconfig_use_enable wifi necko-wifi + mozconfig_use_enable system-sqlite + mozconfig_use_enable !bindist official-branding + mozconfig_use_enable alsa ogg + mozconfig_use_enable alsa wave + + # Bug #72667 + if use mozdom; then + MEXTENSIONS="${MEXTENSIONS},inspector" + 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 emd1 emid2 + + emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} + cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} + unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi + + emid1="calendar-timezones@mozilla.org" + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1} + cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1} + unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi + + emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}" + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2} + cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2} + unzip "${S}"/mozilla/dist/xpi-stage/lightning.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/unofficial/content/icon48.png thunderbird-icon-unbranded.png + newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ + ${PN}.desktop + + sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \ + "${D}"/usr/share/applications/${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-1.js \ + "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ + die "failed to cp thunderbird-gentoo-default-prefs.js" +} |