Apply rst2man related fixes. Fallback from sphinx to rst2man was ending up

with build failure. Rels bug #530522.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index caaa3e0b3a49abb99d7cb95b4f9578890f44d2a2..6e84eeeae87d8e33128deb56c37590454c6fc8a3 100644 (file)
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/notmuch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.110 2014/12/02 15:09:02 aidecoe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.111 2015/01/29 13:37:49 aidecoe Exp $
+
+*notmuch-0.19-r1 (29 Jan 2015)
+
+  29 Jan 2015; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +notmuch-0.19-r1.ebuild,
+  +files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch,
+  +files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch,
+  +files/0.19-0003-build-eliminate-use-of-python-execfile.patch:
+  Apply rst2man related fixes. Fallback from sphinx to rst2man was ending up
+  with build failure. Rels bug #530522.
 
   02 Dec 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
   notmuch-0.16-r1.ebuild, notmuch-0.17.ebuild, notmuch-0.18.2.ebuild,

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index fb1bf6601f0f091bce064d049724f6a34156b7a7..652b155d82ceb8b6ff8eaf7441c189b74e5c48bb 100644 (file)
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -2,6 +2,9 @@
 Hash: SHA256
 
 AUX 0.16-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
+AUX 0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch 889 SHA256 a51169d19b91914c11d2b28258092600b34e17a9c8224c92199b77e4ebdfdad7 SHA512 f276f24f745c6ac1c9ddbc1fe9fd6523641b86623edfaf25ec706d295bbceab20ec731ea2e969dddc3562eb205bbe1293fb693aa1d9ab4d54736c130760d1935 WHIRLPOOL b811a9eb2ed9b286bd1b4a300c7ca16087bffc58291eb36a1c06801985f2431bdb2642e1eb641cacff8718c64bff2406f7f2d994f9f40079a6fe1ed4f0353a93
+AUX 0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch 1133 SHA256 50d719721c17c4619ae28920ddab01a10c6a43f89f29dd5dc6f70996fb7773c0 SHA512 b49008ade184abd2309e4bd5bd3148af16ac42c255508cd26a321fc77a2999b75aba30456ecf129bdb277eeb9536cecfbf30941dc9d9ed0e952fff52ad87f420 WHIRLPOOL 65f58be23cf597c4121c9b3f85609d49defcea021e4800339ec7ac5fd436b3c37ecc8b2f19e2f9a1881ed36097dcb7a9b2a7753fb9936203df19fc00e84e23b8
+AUX 0.19-0003-build-eliminate-use-of-python-execfile.patch 1509 SHA256 6095dd5cc6b8d2d79058eea10186417abfe95fde3115f10d6d9569d98f580f2b SHA512 0acda6321d7f28612d41dec7b1a1c9169c00ad628395f89571eb446eadeda3d81c34e4d0d1a03131ce53b2136fd877be5464f8d80f0bfe50edd97a6c1ee3424b WHIRLPOOL 754c974cc0b38f14f22173fcf38055fdaf40a1c756f902133e7807fe2a7b1df0ce4ef74817be3759a2a68b05db0b156b92ccfbaa9c8ec57b8c04a1e3b3e85415
 AUX 50notmuch-gentoo.el 291 SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b WHIRLPOOL c149cfb298cb51bef064c433481444dbd21a20903ee8560ae758a4b4fc0dd983db789b2d1343dc8b30e5e4a0443ee636e5742ba471fe981eb2262ad03567fd22
 AUX 60notmuch-pick-gentoo.el 108 SHA256 5dea2e2113cc3ab74c351f0396ac0a98df9d3eebd14d1e811e6d723cea69d12c SHA512 35da56121a0b13a7c13d5462512277d77dd0b965e0060e58e654056a5a5755e602d3daaf4732673a6a56421fa64e6d0570d655eb1a86fb0ae37af6129a90be16 WHIRLPOOL 52603df04fff71d206fb51d3cea65eb1f403e23495846b90ad8deafeef4d326f08a27c07aa84778bef0f3d962b68d2700c50b31217caeadee9c5f5961a8b9e1c
 DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
@@ -11,17 +14,18 @@ DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856
 EBUILD notmuch-0.16-r1.ebuild 4054 SHA256 bf8e78cbcfe57c2b2f4f4cad2018f26b5b8a088bb7c1e0b6a5bb57997492b811 SHA512 e4619d7ac96703fb04c04e1177ddad255aecc3f412ce22678062deb72da6f9d1f37cb8a0c31e66d5e06af1544f547a25b5b513f355395f22cf2d5d7eb76ccfac WHIRLPOOL c27d4abfc0dbef3841facda73ae9417a7d1a52023cfe52b8503de48e59fe622e6436e9edf3dc488b456e4701548c9a2c190863cccb44f1cc9d5ba6053a23121f
 EBUILD notmuch-0.17.ebuild 3690 SHA256 526b90d9b8126e28da8c2437f1967d65f5a71985cc6fbcb559fe7e757a373024 SHA512 52786bfc95cbe7854697966ec52f1a4416e062651200b3f5d6a16d4c15387499a3ae855e5b2d8751ef725772ce457d7ee7a86873d589ab7e8b110e6bbba92a52 WHIRLPOOL b8ea7195a53cdcbe31d1a2139a9d6684b597ea6d7506797329c834e2a215249f038016ac0e34319e5e033cd15c02807759b39c9c72a278af7f531d91d11eee55
 EBUILD notmuch-0.18.2.ebuild 4050 SHA256 326436d58414462e74c8a90cd254dc3541094acdcf62c2205140fcd814d739dd SHA512 5c3e3b1f2e45c355f3db93d05063d125c066d092771390dc690765f14779fbfe9899878deaf04f41924e966068196b32b037b2b67cba38b7c340aca2cd9287ae WHIRLPOOL ef1d38d043d8433da4dee325ad87802e9df54d091dd93d3183119a3b3a7a5a0b37561c1002b6a05c0ec1c9449f54a73766f62dfc93a60d1e61fc55ff4a14b8e1
+EBUILD notmuch-0.19-r1.ebuild 4469 SHA256 4ac2b5663e54af0c0914d46b04525188c9d05b4866e4672d575d8d879000acd0 SHA512 9e8cef62fb79498b607ef693ce9f01f94e59f928c77244e41dc5006e3d39d6bdbab86907dce2c13359caeb67e5226fb99a85db11ceabe358b9d034578d01dc66 WHIRLPOOL 882e3ced84651cc6eaa6efbabd1edf98a597ecc48ae0679fac854bf5c3dbc427f2015f4990eb308778fd1e37f1e70e4166ae6e71013e137bb060726e9ec87b56
 EBUILD notmuch-0.19.ebuild 4252 SHA256 de9c0b8bda7ff9701520722772125bc090844f7584ac4f590b7a2094833cbad8 SHA512 b3090ecdcf73b0856e1147128573bbd0c0e5e47a78333b87ce613e58b9df2f5a1f225a65ea4814715fde798a6cd296bd1731c3b6dfe04a723d89d5d7c37706ae WHIRLPOOL d150f7c71acb103d4dd567013e90c3404e99bcbfe55102b3891114a341021c990a9a33181b1ceffd2711ece95580979a30f2bab215b48aa967decf1753c4d58e
-MISC ChangeLog 33006 SHA256 5bcd08c5461cd8d606f48f28405a442f695c81d48a213f4deaecbf5be7dde927 SHA512 926fa5fc345d0d36ffa1255f859b500487e46c5ae2de2dc52ee40333f57b8e253a5941562d6ee806c646e6ce3f69fd174342ad9577fe9d3dfbeac42c259e63e6 WHIRLPOOL e1e2b99e2b8d7cd1a4cd7dafbbbaa218937cd0e01ab2a1f45a8ed80e590471b2bb2c0f864245cb9e1281be90a370e6bd552fa2dd01fb65d226b5537d93de0a36
+MISC ChangeLog 33435 SHA256 ec0557ac16be6a2a69d0512d41cb45460618f9ee3a2120f89f182d11ba0b3be3 SHA512 7da180d272a7353dc337719fe69ef9d6cfb9c05e4ab28487d78144a83cb3a146f79c2061daa7c4683bc9efd52c3d79782b0f75468ed4bd0fd21b5dfd69941983 WHIRLPOOL 5c237dd42170c54b43d8aa95cf6bc11604307940a33cc258946d8e58a1757f535598990b5039c635a6da0e09d28c8b2dc034d0635b71324597dfb0b8d08917f9
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUfdYPAAoJEPATRTHh2/q1If4H/0Wbl8Uo/lwiEBJJXzgSNvi4
-VV85c2VZXoYEFXIqNo8VYOn6wCIPAjm3ZscWvh4RAVs3GlETsNppULhITmGEeZcw
-TSgUf1PMROhqOWaIHUPpGd5/aTR2qxTM2LYQmCUkwzztrMsrCr+H8sI5P7OdXMBp
-gRY5DVhiBBaDuDHUrg4xPy6g5RHROp9KkHzkVeHIShFRfkgckB2GSQZsMiENIr7T
-3/0+n0bHVfrIHrgyTew+/7obyTK7p3hODSazjETXeEDP8wu6m+viHE9jB+ypvPYP
-A9Gj+SHnctGA+aSWj3t1L6YGCxZQUXv4v2KyPW3Mrz++6EMXgTQ36T3D/Yvtm2g=
-=zFtB
+iQEcBAEBCAAGBQJUyjeuAAoJEPATRTHh2/q1s5sH/jHgZ2Ftx/a1nf9b3IKlFCSr
+Xp97MvosRXnFvtCkhGABDQZWTaIuN86LsXJRoWgvkXrtMmzWXh7YnMMPAiUQuUJ8
+grqyJP6MFarU3bXMsC+3Fh3RQ+a9/35dXHXtbQzp4EO0PeDjedHVfekcS5z6rQPL
+qd4p9ixi/4LM82AySL2H72Zc1sBH3VJU9O8JdqNIM810pcII6/i1p0mz/0e9vmIA
+Wa7J+AZdZaXlJ9bMUQtdBv0bKp6HV9I+2WtN/lm90k08T7s7Yd8YobgdrMeviMhE
+WnAGg/saV84EsAlyyQYgx+2ooWLi0oH/e5vv2XQnLnjn0yDVTh3LywlqFLY08wg=
+=BCBo
 -----END PGP SIGNATURE-----

diff --git a/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch b/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
new file mode 100644 (file)
index 0000000..3890328
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0001-doc-gzipped-notmuch.3-before-trying-to.patch
@@ -0,0 +1,28 @@
+From a95173249ae8811241da7640814934837abce53b Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Sun, 25 Jan 2015 15:04:51 +0100
+Subject: [PATCH] doc: gzipped notmuch.3 before trying to install notmuch.3.gz
+
+If HAVE_SPHINX=0 but HAVE_DOXYGEN=1, then the previous version was
+trying to install notmuch.3.gz but only got as far as creating
+notmuch.3
+---
+ doc/Makefile.local | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index e7d0bac..a719d8b 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -63,7 +63,7 @@ install-man: install-apidocs
+ ifeq ($(HAVE_DOXYGEN),1)
+ MAN_GZIP_FILES += ${APIMAN}.gz
+ apidocs: $(APIMAN)
+-install-apidocs: apidocs
++install-apidocs: ${APIMAN}.gz
+       mkdir -p "$(DESTDIR)$(mandir)/man3"
+       install -m0644  $(DOCBUILDDIR)/man/man3/*.3.gz  $(DESTDIR)/$(mandir)/man3
+ 
+-- 
+2.2.2
+

diff --git a/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch b/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
new file mode 100644 (file)
index 0000000..beda83d
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch
@@ -0,0 +1,38 @@
+From dcae4803d006af1a7b961a492d65c28a3cffbc3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Thu, 29 Jan 2015 14:17:01 +0100
+Subject: [PATCH 2/2] Rename rst2man to rst2man.py for Gentoo
+
+Gentoo doesn't provide symlink rst2man.py -> rst2man.
+---
+ configure         | 2 +-
+ doc/prerst2man.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index d14e7d1..bf78066 100755
+--- a/configure
++++ b/configure
+@@ -436,7 +436,7 @@ else
+     have_sphinx=0
+ 
+     printf "Checking if rst2man is available... "
+-    if rst2man -V > /dev/null 2>&1; then
++    if rst2man.py -V > /dev/null 2>&1; then
+        printf "Yes.\n"
+        have_rst2man=1
+     else
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py
+index 437dea9..22b8258 100644
+--- a/doc/prerst2man.py
++++ b/doc/prerst2man.py
+@@ -59,5 +59,5 @@ for page in man_pages:
+     outfile.write("".join(lines))
+     outfile.close()
+ 
+-    system('set -x; rst2man {0} {1}/{2}.{3}'
++    system('set -x; rst2man.py {0} {1}/{2}.{3}'
+            .format(filename, outdir, page[0], page[4]))
+-- 
+2.2.2
+

diff --git a/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch b/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
new file mode 100644 (file)
index 0000000..2eff9d6
--- /dev/null
+++ b/net-mail/notmuch/files/0.19-0003-build-eliminate-use-of-python-execfile.patch
@@ -0,0 +1,47 @@
+From 381385ccb7581bb16b72c23fd804c40b0330fe71 Mon Sep 17 00:00:00 2001
+From: David Bremner <david@tethera.net>
+Date: Sat, 3 Jan 2015 14:14:03 +0100
+Subject: [PATCH 3/3] build: eliminate use of python execfile command
+
+As discussed in
+id:8cc9dd580ad672527e12f43706f9803b2c8e99d8.1405220724.git.wking@tremily.us,
+execfile is unavailable in python3.
+
+The approach of this commit avoids modifying the python module path,
+which is arguably preferable since it avoids potentially accidentally
+importing a module from the wrong place.
+---
+ devel/release-checks.sh | 2 +-
+ doc/prerst2man.py       | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/devel/release-checks.sh b/devel/release-checks.sh
+index 797d62a..ae02f55 100755
+--- a/devel/release-checks.sh
++++ b/devel/release-checks.sh
+@@ -130,7 +130,7 @@ else
+ fi
+ 
+ echo -n "Checking that python bindings version is $VERSION... "
+-py_version=`python -c "execfile('$PV_FILE'); print __VERSION__"`
++py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`
+ if [ "$py_version" = "$VERSION" ]
+ then
+       echo Yes.
+diff --git a/doc/prerst2man.py b/doc/prerst2man.py
+index 22b8258..45dddca 100644
+--- a/doc/prerst2man.py
++++ b/doc/prerst2man.py
+@@ -10,7 +10,8 @@ outdir = argv[2]
+ if not isdir(outdir):
+     makedirs(outdir, 0o755)
+ 
+-execfile(sourcedir + "/conf.py")
++with open(sourcedir + "/conf.py") as cf:
++    exec(cf.read())
+ 
+ 
+ def header(file, startdocname, command, description, authors, section):
+-- 
+2.2.2
+

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
new file mode 100644 (file)
index 0000000..1c0f94c
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.19-r1.ebuild,v 1.1 2015/01/29 13:37:49 aidecoe Exp $
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+       distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="
+       nmbug? ( python )
+       python? ( ${PYTHON_REQUIRED_USE} )
+       test? ( crypt debug emacs python )
+       "
+IUSE="crypt debug doc emacs mutt nmbug python test"
+
+CDEPEND="
+       >=app-shells/bash-completion-1.9
+       >=dev-libs/glib-2.22
+       >=dev-libs/gmime-2.6.7
+       !=dev-libs/gmime-2.6.19
+       <dev-libs/xapian-1.3
+       >=sys-libs/zlib-1.2.5.2
+       sys-libs/talloc
+       debug? ( dev-util/valgrind )
+       emacs? ( >=virtual/emacs-23 )
+       python? ( ${PYTHON_DEPS} )
+       x86? ( >=dev-libs/xapian-1.2.7-r2 )
+       "
+DEPEND="${CDEPEND}
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen
+               python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) )
+       test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+               >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb )
+       "
+RDEPEND="${CDEPEND}
+       crypt? ( app-crypt/gnupg )
+       nmbug? ( dev-vcs/git )
+       mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
+               dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
+               virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
+               virtual/perl-Pod-Parser
+               )
+       "
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+MY_PATCHES=(
+       "${FILESDIR}/${PV}-0001-doc-gzipped-notmuch.3-before-trying-to.patch"
+       "${FILESDIR}/${PV}-0002-Rename-rst2man-to-rst2man.py-for-Gento.patch"
+       "${FILESDIR}/${PV}-0003-build-eliminate-use-of-python-execfile.patch"
+       )
+
+bindings() {
+       local ret=0
+
+       if use $1; then
+               pushd bindings/$1 || die
+               shift
+               "$@"
+               ret=$?
+               popd || die
+       fi
+
+       return $ret
+}
+
+pkg_pretend() {
+       if has_version '<net-mail/notmuch-0.18'; then
+               ewarn
+               ewarn "There are few not backward compatible changes between"
+               ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+               ewarn "(0.18 section) for details before first use!"
+               ewarn
+       fi
+}
+
+pkg_setup() {
+       if use emacs; then
+               elisp-need-emacs 23 || die "Emacs version too low"
+       fi
+}
+
+src_prepare() {
+       [[ "${MY_PATCHES[@]}" ]] && epatch "${MY_PATCHES[@]}"
+
+       bindings python distutils-r1_src_prepare
+       bindings python mv README README-python || die
+       mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+       rm -f Makefile.config # assure that new Makefile.config will be generated
+
+       if use debug; then
+               append-cflags -g
+               append-cxxflags -g
+       fi
+}
+
+src_configure() {
+       local myeconfargs=(
+               --bashcompletiondir="$(get_bashcompdir)"
+               --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+               --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+               --with-gmime-version=2.6
+               --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+               $(use_with emacs)
+       )
+       tc-export CC CXX
+       econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+       V=1 default
+       bindings python distutils-r1_src_compile
+
+       if use mutt; then
+               pushd contrib/notmuch-mutt || die
+               emake notmuch-mutt.1
+               popd || die
+       fi
+
+       if use doc; then
+               pydocs() {
+                       pushd docs || die
+                       emake html
+                       mv html ../python || die
+                       popd || die
+               }
+               LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+       fi
+}
+
+src_test() {
+       pax-mark -m notmuch
+       emake download-test-databases
+       LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" default
+       pax-mark -ze notmuch
+}
+
+src_install() {
+       default
+
+       if use emacs; then
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+       fi
+
+       if use nmbug; then
+               dobin devel/nmbug/nmbug
+               dobin devel/nmbug/nmbug-status
+       fi
+
+       if use mutt; then
+               pushd contrib/notmuch-mutt || die
+               dobin notmuch-mutt
+               doman notmuch-mutt.1
+               insinto /etc/mutt
+               doins notmuch-mutt.rc
+               dodoc README-mutt
+               popd || die
+       fi
+
+       DOCS="" bindings python distutils-r1_src_install
+       use doc && bindings python dohtml -r python
+}
+
+pkg_preinst() {
+       if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+               elog "To enable notmuch support in mutt, add the following line into"
+               elog "your mutt config file, please:"
+               elog ""
+               elog "  source /etc/mutt/notmuch-mutt.rc"
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}