diff options
4 files changed, 5 insertions, 492 deletions
diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog index efbb0dec7ca2..ef0f518e8b7d 100644 --- a/mail-client/mozilla-thunderbird/ChangeLog +++ b/mail-client/mozilla-thunderbird/ChangeLog @@ -1,6 +1,10 @@ # 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.331 2010/04/23 19:05:34 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.332 2010/05/16 18:07:43 anarchy Exp $ + + 16 May 2010; <anarchy@gentoo.org> -files/1000_fix-menus-gentoo.patch, + -mozilla-thunderbird-2.0.0.23.ebuild, -mozilla-thunderbird-3.0.3.ebuild: + prepare for pkg-move 23 Apr 2010; Raúl Porcel <armin76@gentoo.org> mozilla-thunderbird-3.0.4-r1.ebuild: diff --git a/mail-client/mozilla-thunderbird/files/1000_fix-menus-gentoo.patch b/mail-client/mozilla-thunderbird/files/1000_fix-menus-gentoo.patch deleted file mode 100644 index 3a5f0010b645..000000000000 --- a/mail-client/mozilla-thunderbird/files/1000_fix-menus-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mail/base/content/mailWindowOverlay.xul 2009-12-08 14:15:28.891818550 -0600 -+++ b/mail/base/content/mailWindowOverlay.xul 2009-12-08 14:15:33.154839643 -0600 -@@ -40,6 +40,8 @@ - <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?> - <?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?> - -+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?> -+ - <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?> - #ifdef XP_MACOSX - <?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?> diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.23.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.23.ebuild deleted file mode 100644 index fd4c0c5ddeb8..000000000000 --- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.23.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-2.0.0.23.ebuild,v 1.6 2009/09/20 18:36:04 volkmar Exp $ - -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib mozextension autotools - -PATCH="${PN}-2.0.0.21-patches-0.1" -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 mk nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW" -NOSHORTLANGS="en-GB es-AR pt-BR zh-TW" - -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="ldap crypt bindist mozdom replytolist" - -MOZ_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}" -SRC_URI="${MOZ_URI}/source/thunderbird-${PV}-source.tar.bz2 - mirror://gentoo/${PATCH}.tar.bz2" - -# These are in -# -# http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${MY_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.gentooexperimental.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.gentooexperimental.org/~armin76/dist/${P}-xpi/${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -RDEPEND=">=www-client/mozilla-launcher-1.56 - >=dev-libs/nss-3.11.5 - >=dev-libs/nspr-4.6.5-r1" - -PDEPEND="crypt? ( >=x11-plugins/enigmail-0.95.7-r5 ) - replytolist? ( x11-plugins/replytolist )" - -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=mail -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 ${PN} 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; 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 - - use moznopango && warn_mozilla_launcher_stub -} - -src_unpack() { - unpack thunderbird-${PV}-source.tar.bz2 ${PATCH}.tar.bz2 - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" - done - if [[ ${linguas} != "" && ${linguas} != "en" ]]; then - elog "Selected language packs (first will be default): ${linguas}" - fi - - # Apply our patches - cd "${S}" || die "cd failed" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patch - - eautoreconf -} - -src_compile() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # tb-specific settings - 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 - - # Bug 223375, 217805 - # Breaks builds with gcc-4.3 - if [[ $(gcc-version) == "4.3" ]]; then - mozconfig_annotate 'gcc-4.3 breaks builds' --disable-optimize - fi - - # Bug #72667 - if use mozdom; then - mozconfig_annotate '' --enable-extensions=default,inspector - else - mozconfig_annotate '' --enable-extensions=default - fi - - if ! use bindist; then - mozconfig_annotate '' --enable-official-branding - fi - - # Finalize and report settings - mozconfig_final - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - #################################### - # - # Configure and build - # - #################################### - - CPPFLAGS="${CPPFLAGS}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - econf || die - - # This removes extraneous CFLAGS from the Makefiles to reduce RAM - # requirements while compiling - edit_makefiles - - emake || die -} - -src_install() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # Most of the installation happens here - dodir "${MOZILLA_FIVE_HOME}" - cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed" - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" - done - - local LANG=${linguas%% *} - if [[ ${LANG} != "" && ${LANG} != "en" ]]; then - ebegin "Setting default locale to ${LANG}" - sed -i "s:pref(\"general.useragent.locale\", \"en-US\"):pref(\"general.useragent.locale\", \"${LANG}\"):" \ - "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-thunderbird.js \ - "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-l10n.js - eend $? || die "sed failed to change locale" - fi - - # Create directory structure to support portage-installed extensions. - # See update_chrome() in mozilla-launcher - keepdir ${MOZILLA_FIVE_HOME}/chrome.d - keepdir ${MOZILLA_FIVE_HOME}/extensions.d - cp "${D}"${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \ - "${D}"${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt - - # Create /usr/bin/thunderbird - install_mozilla_launcher_stub thunderbird ${MOZILLA_FIVE_HOME} - - if ! use bindist; then - doicon "${FILESDIR}"/icon/thunderbird-icon.png - domenu "${FILESDIR}"/icon/${PN}.desktop - else - doicon "${FILESDIR}"/icon/thunderbird-icon-unbranded.png - newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ - ${PN}.desktop - fi - - # Install files necessary for applications to build against thunderbird - elog "Installing includes and idl files..." - cp -LfR "${S}"/dist/include "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed" - cp -LfR "${S}"/dist/idl "${D}"/"${MOZILLA_FIVE_HOME}" || die "cp failed" - - # Dirty hack to get some applications using this header running - dosym "${MOZILLA_FIVE_HOME}"/include/necko/nsIURI.h \ - "${MOZILLA_FIVE_HOME}"/include/nsIURI.h - - # Warn user that remerging enigmail is neccessary on USE=crypt - use crypt && ewarn "Please remerge x11-plugins/enigmail after updating ${PN}." -} - -pkg_postinst() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - # This should be called in the postinst and postrm of all the - # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and - # thunderbird-bin ebuilds. - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - update_mozilla_launcher_symlinks -} diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.3.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.3.ebuild deleted file mode 100644 index 68b1591476a3..000000000000 --- a/mail-client/mozilla-thunderbird/mozilla-thunderbird-3.0.3.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# 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.3.ebuild,v 1.6 2010/03/14 19:22:58 armin76 Exp $ -EAPI="2" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools - -LANGS="af ar be ca cs de el en-US en-GB es-AR es-ES et eu fi fr fy-NL ga-IE hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR ro ru si sk sv-SE ta-LK tr uk" -# Languages not rebuilt for beta3 "pt-PT he sr bg gl zn-CN vi" -NOSHORTLANGS="es-AR en-GB pt-BR" - -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="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 - 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}" - - 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 - - # Use enable features - mozconfig_use_enable lightning calendar - mozconfig_use_enable system-sqlite - - # 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" -} |