Fix sqlite useage, disable sound support as not required for building bug #310675

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

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index fb729a3f18fd9eafda36646afc544de82d86d684..cae36ca3aecbcc4b9e0d288551b93b83462b1945 100644 (file)
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.176 2010/03/14 19:24:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.177 2010/03/28 15:22:53 anarchy Exp $
+
+*enigmail-1.0.1-r2 (28 Mar 2010)
+
+  28 Mar 2010; <anarchy@gentoo.org> +enigmail-1.0.1-r2.ebuild:
+  Fix sqlite useage, disable sound support as not required for building bug
+  #310675
 
   14 Mar 2010; Raúl Porcel <armin76@gentoo.org> enigmail-1.0.1-r1.ebuild:
   alpha/ia64/sparc stable wrt #307045

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 5b5c007f5a4ad03ef36ca6da8ff6b44f31c42ea9..e810ea8739e3c5fae734e6be4e022cb0b3759526 100644 (file)
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -86,5 +86,6 @@ EBUILD enigmail-0.94.4.ebuild 5818 RMD160 4b058e7ded7b6bfd2820420bfadf8c4456e5c7
 EBUILD enigmail-0.95.7-r5.ebuild 5996 RMD160 4ac50cb1da05003957f043f6eeab7104cd167d03 SHA1 dd4676f6b0fd0ed0b819816e1d2b1b2459c32a2c SHA256 646e453822f8c6d986ee587d6e47d91a02945a9532cd6633d9e23e9d17355b73
 EBUILD enigmail-0.96.0-r1.ebuild 5772 RMD160 a20612398b893efadd0fb79c235ae2443bdfc0d3 SHA1 676d8cbbbdda7512cf6de2eb7222174d4e9e19ef SHA256 ae6ce909a7e19391184953832b530a2a74e240c94a7f24f7ebb5b1e928e53d4e
 EBUILD enigmail-1.0.1-r1.ebuild 4105 RMD160 b8f40b2f6daf9656e38856b7f2c37c23b41e8b76 SHA1 7e22304853f8b220a8d407902bc35f3fddc20fb2 SHA256 904eb9b0e40c9c380dee9b903549403a84ee67e47bebe2bdf1738094da0d83eb
-MISC ChangeLog 24100 RMD160 069b079f0c5f1ac532c7c753d216a5d7721d7f5f SHA1 36f8edee914aded72ef0b56fecf566903a9b5e10 SHA256 cbfa67ad5aec1425499ed38679354714ceb2cfde2d4ad6f6eb027176d053d064
+EBUILD enigmail-1.0.1-r2.ebuild 4122 RMD160 d21def7c145b6f1808670a9212951763c69fbe2c SHA1 2872274d30f4ab07d15f478e9b28eda8858ac75b SHA256 1ce3ff3e841019cc6e97be3d0b03cddb044a23aa2f877221f355d3f80e9454df
+MISC ChangeLog 24284 RMD160 8ad5ae8c207c24bdf360e03f8b01a247525ce41a SHA1 735a46f10615fae2d6cdcca3d0f0bed83becbd52 SHA256 71bb9606a7e82d797257aff715d13d7d9a91c5ce9babba86d6657596fb6a7cfb
 MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd

diff --git a/x11-plugins/enigmail/enigmail-1.0.1-r2.ebuild b/x11-plugins/enigmail/enigmail-1.0.1-r2.ebuild
new file mode 100644 (file)
index 0000000..e9324a1
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-1.0.1-r2.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.0.1-r2.ebuild,v 1.1 2010/03/28 15:22:53 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.0.1"
+PATCH="mozilla-thunderbird-3.0-patches-0.3"
+
+DESCRIPTION="GnuPG encryption plugin for thunderbird."
+HOMEPAGE="http://enigmail.mozdev.org"
+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/mozilla-thunderbird-3.0[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.1
+
+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_EXCLUDE="106-bz466250_att349521_fix_ftbfs_with_cairo_fb.patch" \
+       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 \
+               --disable-wave \
+               --disable-ogg \
+               --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+               --with-user-appdir=.thunderbird \
+               --enable-application=mail
+
+       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
+}