net-mail/notmuch: Fix QA warnings

Fix compressed man pages warning and "jobserver unavailable" warning.

Bug: https://bugs.gentoo.org/670854
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe@gentoo.org>

diff --git a/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
new file mode 100644 (file)
index 0000000..85ca4b6
--- /dev/null
+++ b/net-mail/notmuch/files/0002-Fix-jobserver-unavailable-warning.patch
@@ -0,0 +1,26 @@
+From b5e15feee139096720272d2b435ce7c4114fda15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
+ <aidecoe@aidecoe.name>
+Date: Sat, 9 Mar 2019 22:42:21 +0000
+Subject: [PATCH 2/2] Fix "jobserver unavailable" warning
+
+---
+ doc/Makefile.local | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index bab3d0d2..dfe62295 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -56,7 +56,7 @@ sphinx-texinfo:
+       $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
+ 
+ sphinx-info: sphinx-texinfo
+-      make -C $(DOCBUILDDIR)/texinfo info
++      $(MAKE) -C $(DOCBUILDDIR)/texinfo info
+ 
+ # Use the man page converter that is available. We should never depend
+ # on MAN_ROFF_FILES if a converter is not available.
+-- 
+2.19.2
+

diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
index cfb18c0518024a065b097b7288b3558b520add42..445fa176ab44936df28f3e3f37b5a5361106576d 100644 (file)
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -30,7 +30,7 @@ CDEPEND="
        !!<app-shells/bash-completion-1.9
        >=dev-libs/glib-2.22:2
        >=dev-libs/gmime-3.0.3:3.0
-       >=dev-libs/xapian-1.4.9:=
+       >=dev-libs/xapian-1.4.8:=
        dev-python/sphinx[${PYTHON_USEDEP}]
        sys-apps/texinfo
        >=sys-libs/zlib-1.2.5.2
@@ -59,7 +59,10 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS NEWS README )
 SITEFILE="50${PN}-gentoo.el"
 MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-PATCHES=( "${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch )
+PATCHES=(
+       "${FILESDIR}"/0001-Use-loopback-IP-address-rather-than-name.patch
+       "${FILESDIR}"/0002-Fix-jobserver-unavailable-warning.patch
+)
 
 bindings() {
        local ret=0
@@ -109,6 +112,8 @@ src_prepare() {
        # assure that new Makefile.config will be generated
        rm -f Makefile.config || die
 
+       sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
        if use test; then
                append-cflags -g
                append-cxxflags -g
@@ -164,6 +169,8 @@ src_test() {
 src_install() {
        default
 
+       doman doc/_build/man/man?/*.?
+
        if use emacs; then
                elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
        fi
@@ -198,11 +205,6 @@ pkg_preinst() {
 
 pkg_postinst() {
        use emacs && elisp-site-regen
-
-       if has_version '<dev-libs/xapian-1.4'; then
-               elog "Regular expression searches supported for from: and subject:"
-               elog "require >=dev-libs/xapian-1.4."
-       fi
 }
 
 pkg_postrm() {