Fix bug #327099, issue connecting to gpg-agent for some

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 37 insertions, 310 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 4e8e08e41602..f003b96e010c 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.190 2010/07/11 12:53:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.191 2010/07/14 22:22:05 anarchy Exp $
+
+*enigmail-1.1.2-r1 (14 Jul 2010)
+
+  14 Jul 2010; <anarchy@gentoo.org> +files/75_enigmai-js-fixup.patch,
+  -enigmail-1.1.ebuild, -enigmail-1.1.1.ebuild, -enigmail-1.1.2.ebuild,
+  +enigmail-1.1.2-r1.ebuild:
+  Fix bug #327099, issue connecting to gpg-agent for some
 
   11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> enigmail-1.1.2.ebuild,
   +files/thunderbird-xul-1.9.2-arm-fixes.patch:
diff --git a/x11-plugins/enigmail/enigmail-1.1.1.ebuild b/x11-plugins/enigmail/enigmail-1.1.1.ebuild
deleted file mode 100644
index e8551bc14e98..000000000000
--- a/x11-plugins/enigmail/enigmail-1.1.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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.1.ebuild,v 1.1 2010/06/26 14:44:05 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.1"
-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
-}
diff --git a/x11-plugins/enigmail/enigmail-1.1.2.ebuild b/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild
index 9d8fbb63532e..20dfe825d457 100644
--- a/x11-plugins/enigmail/enigmail-1.1.2.ebuild
+++ b/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2010/07/11 12:53:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild,v 1.1 2010/07/14 22:22:05 anarchy Exp $
 
 WANT_AUTOCONF="2.1"
 EAPI="2"
@@ -74,6 +74,7 @@ src_prepare(){
 
 	# Fix installation of enigmail.js
 	epatch "${FILESDIR}"/70_enigmail-fix.patch
+	epatch "${FILESDIR}"/75_enigmai-js-fixup.patch
 
 	eautoreconf
 }
diff --git a/x11-plugins/enigmail/enigmail-1.1.ebuild b/x11-plugins/enigmail/enigmail-1.1.ebuild
deleted file mode 100644
index 26f5a4e244c4..000000000000
--- a/x11-plugins/enigmail/enigmail-1.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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.2 2010/06/21 15:16:54 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.1rc2"
-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
-}
diff --git a/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
new file mode 100644
index 000000000000..8e85cfcc9a3f
--- /dev/null
+++ b/x11-plugins/enigmail/files/75_enigmai-js-fixup.patch
@@ -0,0 +1,27 @@
+--- mailnews/extensions/enigmail/package/enigmail.js	2010-06-26 19:51:30.000000000 +0200
++++ mailnews/extensions/enigmail/package/enigmail.js	2010-07-10 17:34:46.000000000 +0200
+@@ -1231,7 +1231,10 @@ function () {
+                .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+       var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+       extensionLoc.append("gpg-agent-wrapper.sh");
+-			extensionLoc.permissions=0755;
++      try {
++        extensionLoc.permissions=0755;
++      }
++      catch(ex) {}
+       agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
+       agentProcess.init(extensionLoc);
+       agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
+@@ -1758,7 +1761,10 @@ function (domWindow) {
+                    .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+           var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+           extensionLoc.append("gpg-agent-wrapper.sh");
+-          extensionLoc.permissions=0755;
++          try {
++            extensionLoc.permissions=0755;
++          }
++          catch(ex) {}
+           args.unshift(command.path);
+           args.unshift("start");
+           command = extensionLoc;
+