From: Amadeusz Żołnowski <aidecoe@gentoo.org>
Date: Sun, 5 Feb 2017 10:29:51 +0000 (+0000)
Subject: net-mail/notmuch: Fix tests to work with >=app-crypt/gnupg-2.1.16
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c932649c01ff95cdc89b328548de7f44ee1384da;p=gentoo.git

net-mail/notmuch: Fix tests to work with >=app-crypt/gnupg-2.1.16

Tests have been failing because path for Unix socket was too long.
Socket had been created in temporary directory within workdir. Create
temporary directory in /tmp instead.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/net-mail/notmuch/files/fix-gpg-tests.patch b/net-mail/notmuch/files/fix-gpg-tests.patch
new file mode 100644
index 000000000000..e674f185fde4
--- /dev/null
+++ b/net-mail/notmuch/files/fix-gpg-tests.patch
@@ -0,0 +1,16 @@
+diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
+index 03ef1d2d..178820bd 100644
+--- a/test/test-lib-common.sh
++++ b/test/test-lib-common.sh
+@@ -139,10 +139,7 @@ export PATH MANPATH
+ # Test repository
+ test="tmp.$(basename "$0" .sh)"
+ test -n "$root" && test="$root/$test"
+-case "$test" in
+-/*) TMP_DIRECTORY="$test" ;;
+- *) TMP_DIRECTORY="$TEST_DIRECTORY/$test" ;;
+-esac
++TMP_DIRECTORY="$(mktemp -d)"
+ test ! -z "$debug" || remove_tmp=$TMP_DIRECTORY
+ rm -fr "$test" || {
+ 	GIT_EXIT_OK=t
diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 8a372a99c338..9799558eccc9 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
 
diff --git a/net-mail/notmuch/notmuch-0.23.5.ebuild b/net-mail/notmuch/notmuch-0.23.5.ebuild
index b448318b1255..86e50bb2204b 100644
--- a/net-mail/notmuch/notmuch-0.23.5.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.5.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${CDEPEND}
 	"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/fix-gpg-tests.patch" )
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"