Version bump for latest tb-3.1

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

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 909c97367a770c97f87fac9586c2a10ec2f6d299..4ff5d11aaf2219113554595b554141f534139171 100644 (file)
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.185 2010/06/13 02:27:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.186 2010/06/18 18:41:47 anarchy Exp $
+
+*enigmail-1.1 (18 Jun 2010)
+
+  18 Jun 2010; <anarchy@gentoo.org> +enigmail-1.1.ebuild:
+  Version bump for latest tb-3.1
 
   13 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
   enigmail-1.0.1-r3.ebuild:

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index e39b10e0103d2a2fb0443d3e36fa7e699f0515f3..d1eb73d520ab6753f9ff9b1b445252b7ddf29111 100644 (file)
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,7 +1,11 @@
 AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
+DIST enigmail-1.1.tar.gz 1278216 RMD160 d9dc3a0f131516bb0b3aad4c3c69eea8eff23724 SHA1 4d0d13913092dfd3f2600040d53d4d13edf4e555 SHA256 6a2daf57571bf698cfa49b0722149ed45dc4580f6a9dccb3896d9928643b14ed
 DIST mozilla-thunderbird-3.0-patches-0.3.tar.bz2 3241 RMD160 bc3b163b9c5bd7c7fb497786b2dc2da4e0a4bd28 SHA1 0182b73d48cd21204504f3bb8e17f0d9a7289464 SHA256 a430c71a12fe63662d43b4eeb5b185841a4788cbbbbd7178a3c73056ba94c5cd
+DIST mozilla-thunderbird-3.1-patches-0.1.tar.bz2 2451 RMD160 31b5126836b4fb6b5e62f4d1772fab2e4111320e SHA1 b86c3e93edc632801f3e331884404332b458d7b1 SHA256 79c6a48cdcf322226e39c0d8b5136506d6fb9c939c7ce531ac7f5c6ad3588d28
 DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
+DIST thunderbird-3.1rc1.source.tar.bz2 65629389 RMD160 3042f3e0a69301822a132074a6a58644348d391e SHA1 0febfacf411e3428d94013910ed9fb77329e0a78 SHA256 39a6ad50184a5520e331d738e2c2d4e910da5f5f4c92f33f805b9b93e76c6b35
 EBUILD enigmail-1.0.1-r3.ebuild 4108 RMD160 8706883241129e832b007eb466322083f3eef350 SHA1 cd04496787dd88196e12b289b5193759b4581015 SHA256 3202a5485200e9fa86adbbcabfdda1c08274a723a1243b7a92d62ee566c29550
-MISC ChangeLog 25707 RMD160 fa928ee1461bc8473039041f4e04b610675caf53 SHA1 94400428d68990c01b754755a88eaedb5f662147 SHA256 87a75b09b13631b6bea167eaebe66f53be4005e41a2abfc00ab51747d6e44e15
+EBUILD enigmail-1.1.ebuild 4124 RMD160 17bd25857a5e4379971fe06cc225a8e66da07935 SHA1 3482c209823862f4526591c6d20ed25480a44002 SHA256 2f0e2f45369a8967f770003dd78250d88c99e9626d9f32c0df5a793e80cc77db
+MISC ChangeLog 25827 RMD160 464ec58412c361abf633c24db267835e0386fe1e SHA1 9194e4c51eb2a13679000599954bcaac60871f1b SHA256 c76df83b4f3a99c3a310d5cc8b3b49497ab87fd4487c2d7a04c33f77b67fd66c
 MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd

diff --git a/x11-plugins/enigmail/enigmail-1.1.ebuild b/x11-plugins/enigmail/enigmail-1.1.ebuild
new file mode 100644 (file)
index 0000000..2b0f8b8
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-1.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.ebuild,v 1.1 2010/06/18 18:41:47 anarchy Exp $
+
+WANT_AUTOCONF="2.1"
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
+MY_P="${P/_beta/b}"
+EMVER="${PV}"
+TBVER="3.1rc1"
+PATCH="mozilla-thunderbird-3.1-patches-0.1"
+
+DESCRIPTION="GnuPG encryption plugin for thunderbird."
+HOMEPAGE="http://enigmail.mozdev.org"
+REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
+       http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
+       http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2"
+IUSE="system-sqlite"
+
+DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]"
+RDEPEND="${DEPEND}
+       system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+       || (
+               (
+                       >=app-crypt/gnupg-2.0
+                       || (
+                               app-crypt/pinentry[gtk]
+                               app-crypt/pinentry[qt4]
+                       )
+               )
+               =app-crypt/gnupg-1.4*
+       )"
+
+S="${WORKDIR}"/comm-1.9.2
+
+pkg_setup() {
+       # EAPI=2 ensures they are set properly.
+       export BUILD_OFFICIAL=1
+       export MOZILLA_OFFICIAL=1
+       export MOZ_CO_PROJECT=mail
+}
+
+src_unpack() {
+       unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
+}
+
+src_prepare(){
+       # Apply our patches
+       EPATCH_SUFFIX="patch" \
+       EPATCH_FORCE="yes" \
+       epatch "${WORKDIR}"
+
+       cd mozilla
+       eautoreconf
+       cd js/src
+       eautoreconf
+
+       # Unpack the enigmail plugin
+       cd "${S}"/mailnews/extensions || die
+       unpack enigmail-${EMVER}.tar.gz
+       cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
+       makemake2
+
+       cd "${S}"
+
+       # Fix installation of enigmail.js
+       epatch "${FILESDIR}"/70_enigmail-fix.patch
+
+       eautoreconf
+}
+
+src_configure() {
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       touch mail/config/mozconfig
+       mozconfig_init
+       mozconfig_config
+
+       # tb-specific settings
+       mozconfig_annotate '' \
+               --with-system-nspr \
+               --with-system-nss \
+               --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+               --with-user-appdir=.thunderbird \
+               --enable-application=mail \
+               --disable-necko-wifi \
+               --disable-libnotify
+
+       mozconfig_use_enable system-sqlite
+
+       # Finalize and report settings
+       mozconfig_final
+
+       # Disable no-print-directory
+       MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               append-cxxflags -fno-stack-protector
+       fi
+
+       ####################################
+       #
+       #  Configure and build Thunderbird
+       #
+       ####################################
+       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
+}
+
+src_compile() {
+       # Only build the parts necessary to support building enigmail
+       emake -j1 export || die "make export failed"
+       emake -C mozilla/modules/libreg || die "make modules/libreg failed"
+       emake -C mozilla/xpcom/string || die "make xpcom/string failed"
+       emake -C mozilla/xpcom || die "make xpcom failed"
+       emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed"
+
+       # Build the enigmail plugin
+       einfo "Building Enigmail plugin..."
+       emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+
+       # Package the enigmail plugin; this may be the easiest way to collect the
+       # necessary files
+       emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
+}
+
+src_install() {
+       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
+       declare emid
+
+       cd "${T}"
+       unzip "${S}"/mozilla/dist/bin/*.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/bin/*.xpi
+}