0.18.1 comes with important fixes for 0.18, thus removing 0.18.

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

6 files changed, 16 insertions, 293 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 5cad67751502..c69f3b88aaa9 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,13 @@
 # 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.95 2014/07/09 11:38:34 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.96 2014/07/09 11:41:28 aidecoe Exp $
+
+  09 Jul 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  -notmuch-0.18-r1.ebuild,
+  -files/0.18-0001-emacs-install-make-sure-all-components.patch,
+  -files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch,
+  -files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch:
+  0.18.1 comes with important fixes for 0.18, thus removing 0.18.
 
   09 Jul 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.18.1.ebuild:
   Include database upgrade test.
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4262aa0abfdf..65a6114ac63d 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,29 +6,24 @@ AUX 0.13.1-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188
 AUX 0.14-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
 AUX 0.15.2-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
 AUX 0.16-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
-AUX 0.18-0001-emacs-install-make-sure-all-components.patch 1145 SHA256 cefba7e2edc8346ade21be391fb6ce9e5ba83fccad193875baef5bb6f3c00a44 SHA512 d53e71bed38a4a59b8204311c61c45937c8b73fdbdf1b259d8febce496aeb552652ddd80cbffe3a5648d74d7f7a5429df681f57f591674bd552d45169425069e WHIRLPOOL 52a313b4702de6bdb68f02bb8e8139506b9959b6d73a4bbf6b5315ea7bf1c303c4fcf9f6602fa8e69f56757ae26cab51474325cd636cf0fc9b4076571d4268db
-AUX 0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch 1172 SHA256 309c8da0eb592c5d07cc7bbd2035cde69500197ec3bd47814cefb04bc7e9a2ff SHA512 566929190d7aa3b0e93adf076957b3450d294cb704e77d5128404d111b040e810359deb64d3d5eb3cd030cdc03a9311789cb4c8c661314d58afb090e4b533fe1 WHIRLPOOL cd6f51ab33e03ce174dd2c3e1aac9cb9f5370277ed1dee4af6bd35bdf8dd57e560a2ae656d7accc6256df7246587a16ea899ec605e39f62681044f5cce915177
-AUX 0.18-0003-Unset-html_static_path-in-Python-bindi.patch 1162 SHA256 4bd9654385437c9e4eb940d6c1002d7d2e1dfd73c48880854a200c731fc3f30a SHA512 7a3c8c6931fd9ceb0d583d4ced186e4c613860d7eb38bd235aa58672686e7963378206975379887f83b341c6190baaab98283bafff4352f973bbe16eac129561 WHIRLPOOL b864a76e6d4f448d4164d717584362dd0a653df97de0e371bd0698a4bbb5ba0de79d90318a937f2cf731d8c81ae09192904719080ab30c83b3d3e5db6df074ec
 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
 DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
 DIST notmuch-0.18.1.tar.gz 634691 SHA256 f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd SHA512 4268a32036b42cbacb0b43d7838f67c83f2c20ad9018e44c51f6112e22f3ffe5847a9f1418527865447a2442ee6ab9e77cf05b61090c2a1f02356dde6eae8ece WHIRLPOOL dc35171b2a1b20acfc5a8de3993335893ea73b236066a2f88b9a7aa2fe3389f88b791e72c8c9f493548ef0fddb19abfabc9f7664b2bd2d404eb964ec67cc2458
-DIST notmuch-0.18.tar.gz 632857 SHA256 09eec1954bf1552e2d39dcab99fcd43f1fa12103d69fa2e4b8148aff552c46c5 SHA512 fcf74e15c8dd2bc50b38462a364bc7a5c3db813284b0559b49e5639d87deb652bdb58aae7ac7200ea6b3b840b9b684179c9a0a1b3200bc7666b525a9ec93bcf4 WHIRLPOOL 246ab052fd68d2cba4c5e08181224b43e498ce89881ab9701dd4dcce7e05dc6088db8f4b7286b8f298da4010f48f188f97e578f1187f516aab875fec605f1254
 EBUILD notmuch-0.16-r1.ebuild 4160 SHA256 fb43d30b1fd3f387d191b847f007d7a64c5a628feaceaa3fac7901e75673b9a8 SHA512 0be8f9ac104a2f4f1cdf611f61bf3262a258e9df30b41fab36bd7810ee6cc582fa1c16860906bdf12ed94e8f73e0c1e721c1fc3816004bfb619e6bef9c4434fe WHIRLPOOL 86f0e6fd4e3b652a04d846a59652710e79ed903c727d5ccce988dbee9fdd5d848b2f590d33d75aae4b9cae96f08093ceb7b34d812de9549fb12534e1597aef6d
 EBUILD notmuch-0.17.ebuild 3796 SHA256 d8f92cc04ff9d1fdb4a6aa8ca74bfd9afcc5dd91b9676e0a44b39fe2e7d43dec SHA512 74f18508a0ff0e7211cc2f7f3a970930e8675763a89cfddd205320df205bfee389a769469e4fe4105f231c95c3f38d13df434413eab0e00083787fe147368ac1 WHIRLPOOL 07c54774b3350e24b07b5c0174fc2f049c215a708c494cffabf6a65c7cfcb816aff762a164fe2e7ccdb775b99e7a7c21a1d5b56e03118f1c452b8f844e30e9ce
-EBUILD notmuch-0.18-r1.ebuild 4406 SHA256 f322d1484b52e308ab297598984d0e643231c90bb58ad85e5142f777321a52eb SHA512 31bfc541e6bd92a57b863456a469e0720df469a11fa33cf8d14767c18a0d57fce2fc7c5e70be7a614663817f8cae8004398a146b62ca671c75214dfda416a663 WHIRLPOOL 514d75dd34d5ed598545271f4abb409c6cd97c4a4570e22b8ff21689683ff35d1c2ee9da202244a68d01f9d7053925dc4f169e7733c06c8d22bff5ca083089f6
 EBUILD notmuch-0.18.1.ebuild 4223 SHA256 296a0e0ba52f847fa02e5f5cc719720bba7a74eee49d2ab63034a5a3ea2edb24 SHA512 0e3388fd7ea4678293e373d02d6fd3df1c80d85f6acfcbcf7e337d19d0fc62e2809bd7bcaf8689db11c685796eab7c53604650b0040cb1757e019d4cc5bf2206 WHIRLPOOL 6f4df339f8ea8437471cf8a7123aa5aed75ed1217be08bf7717af6e82572406755a59a78759a287e04290d778aed4b4481b258ac20fa50adf4f273a34417e14a
-MISC ChangeLog 28630 SHA256 1bd51830a0199f5605af90fd1350204c808d2cd362e87b6ca0afc0e7ad16b721 SHA512 fa6b2e547f94d615816e6d42bede6ccf196e397f2f6c13fa2d9ec1c3016468b8bcb605ee37401433e178658ea0e85b904628be275c96efaa34230caf95a0de3d WHIRLPOOL b2f3f035be9538484ddb5f285f47d4579a5041e5dcb2b9e067f4737e285904fd04afe6ae975dad7c8369ba3f2c105ba16a6c9b0b4736b64b2158b7a528276fd4
+MISC ChangeLog 28976 SHA256 862aec7093680b12baa466dfbcbb63f522d8ed12d3712fc232c75da9db8bb250 SHA512 02985720956b56a40890113a70490a78d3fc24c44cdf72f5330610de602142ad25c37ffce2b8345a8812b905d6e7445ba1f2f43d5769fd9c82059c03ccf0f841 WHIRLPOOL de1ce0a7d3573b2699a0911f868de7948cdb92a1c93614a7d2e8ced4f2fe1f26f436f0187888af0372c9c5b717498c365d7e8fd4453b93243e1936cde65dc6b7
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTvSm7AAoJEPATRTHh2/q1zd0H/1BPkK759x5Llve77wF1u1Y3
-DcLoS8izSoO/VA84iCNak/LMLxW/rxm+jLhWWrmBEIqJaYRGv3gTE8ejykXVwbTL
-o8qMZcVmQXbqUqUSgxrU3J0qlxVXfuO1Qg3mWnqB6sYnJN4twzWcg0WdNgfBkBov
-z9+XZAtf9b3VI5YveFQK0qXqUwKp1CkuneZAy0+5Qv9F5QaybMivQlr7+nGavosn
-qWlzgeizkFxEKZ0PMBDGS6sjuj1pvrSSdZ3IFKMVJjw9HYQzGPZRVVty7J5JbGoL
-Oyc9mHOSgxs2wlFN4gauSgxjmLVoqaO4NWVOuqEKtSTTW23Zocci2/yiap7CP8c=
-=0dF/
+iQEcBAEBCAAGBQJTvSppAAoJEPATRTHh2/q1+DYIAJZrUap11mxil8+E74seWMH1
+T5JnAgPvv2RbB5kzP/lxWFO36jD0wdSTG5ni2HlMbcUuHP8HqanPcuA7e8ChdkK2
+CLQi6/vI4F7PY8Wg57mQdUIkyCYEY1N9C8aApanF728LM0jwy2ncXgHkwajGvNbW
+pT5p0FeloNfRkkALRi6C/5qP8Co4dL827TN24vPBYuYK4Xjp/+ufNw+3SfmXt+4K
+or0d9DREhUACWt9D8qTe9J3p6USXR2rL3MnwhO6lM/hgFeVPcKuosGClxGK3po5K
+XjpDkCMX/SHLyUYfE41fSUYm8BeAlQvQ9OJBj9Yjpc18EQ6LrDJ5A8U8LH1pB+k=
+=I/ol
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch b/net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch
deleted file mode 100644
index e9582fdad8b7..000000000000
--- a/net-mail/notmuch/files/0.18-0001-emacs-install-make-sure-all-components.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0211b37f150f35f8015e9455d84f0764bb1cf8b1 Mon Sep 17 00:00:00 2001
-From: Tomi Ollila <tomi.ollila@iki.fi>
-Date: Sun, 11 May 2014 00:36:43 +0300
-Subject: [PATCH 1/3] emacs install: make sure all components to be installed
- are there
-
-`make install-emacs` will copy $(emacs_sources), $(emacs_images) and
-$(emacs_bytecode) to their target directories. $(emacs_bytecode) was
-already a prerequisite of make install-emacs as these obviously needed
-to be build. Until a while ago all of $(emacs_sources) was available
-in the repository, but now it includes `notmuch-version.el` which
-is generated. In the future we may have generated emacs images too.
----
- emacs/Makefile.local | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/emacs/Makefile.local b/emacs/Makefile.local
-index dcb4995..c0d6b19 100644
---- a/emacs/Makefile.local
-+++ b/emacs/Makefile.local
-@@ -69,7 +69,7 @@ install: install-emacs
- endif
- 
- .PHONY: install-emacs
--install-emacs:
-+install-emacs: $(emacs_sources) $(emacs_images)
- 	mkdir -p "$(DESTDIR)$(emacslispdir)"
- 	install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
- ifeq ($(HAVE_EMACS),1)
--- 
-1.9.3
-
diff --git a/net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch b/net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch
deleted file mode 100644
index d9b48c0c5a17..000000000000
--- a/net-mail/notmuch/files/0.18-0002-doc-conf.py-Remove-_static-from-html_s.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 29712ff47411c950e1426e638a13975e6de8952f Mon Sep 17 00:00:00 2001
-From: "W. Trevor King" <wking@tremily.us>
-Date: Sat, 10 May 2014 08:55:21 -0700
-Subject: [PATCH 2/3] doc/conf.py: Remove _static from html_static_path
-
-Avoid:
-
-  $ make HAVE_SPHINX=1 sphinx-html
-  python ./doc/mkdocdeps.py ./doc doc/_build doc/docdeps.mk
-  sphinx-build -b html -d doc/_build/doctrees -q ./doc doc/_build/html
-  Making output directory...
-  WARNING: html_static_path entry '/home/wking/src/notmuch/notmuch/doc/_static' does not exist
-
-because we have no static source in doc/_static.
----
- doc/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/conf.py b/doc/conf.py
-index a926fe4..70ba1b8 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -42,7 +42,7 @@ html_theme = 'default'
- # Add any paths that contain custom static files (such as style sheets) here,
- # relative to this directory. They are copied after the builtin static files,
- # so a file named "default.css" will overwrite the builtin "default.css".
--html_static_path = ['_static']
-+html_static_path = []
- 
- # Output file base name for HTML help builder.
- htmlhelp_basename = 'notmuchdoc'
--- 
-1.9.3
-
diff --git a/net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch b/net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch
deleted file mode 100644
index 7daf0554ebcb..000000000000
--- a/net-mail/notmuch/files/0.18-0003-Unset-html_static_path-in-Python-bindi.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b2bbe0b0a30c11d307a29b23f0e22268bd8edcc1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 12 May 2014 12:35:41 +0200
-Subject: [PATCH 3/3] Unset html_static_path in Python bindings docs
-
-html_static_path is a kind of source directory and it was set to
-destination directory (../html) which caused infinite recursion with
-Sphinx 1.2 and above.
----
- bindings/python/docs/source/conf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/python/docs/source/conf.py b/bindings/python/docs/source/conf.py
-index 9db377f..5107a96 100644
---- a/bindings/python/docs/source/conf.py
-+++ b/bindings/python/docs/source/conf.py
-@@ -140,7 +140,7 @@ html_theme = 'default'
- # Add any paths that contain custom static files (such as style sheets) here,
- # relative to this directory. They are copied after the builtin static files,
- # so a file named "default.css" will overwrite the builtin "default.css".
--html_static_path = ['../html']
-+html_static_path = []
- 
- # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
- # using the given strftime format.
--- 
-1.9.3
-
diff --git a/net-mail/notmuch/notmuch-0.18-r1.ebuild b/net-mail/notmuch/notmuch-0.18-r1.ebuild
deleted file mode 100644
index 1abd26d15087..000000000000
--- a/net-mail/notmuch/notmuch-0.18-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18-r1.ebuild,v 1.1 2014/05/14 13:12:03 aidecoe Exp $
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit elisp-common eutils 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="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( crypt emacs python )
-	"
-IUSE="bash-completion crypt debug doc emacs mutt nmbug python test
-	zsh-completion"
-
-CDEPEND="
-	>=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? ( 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}
-	bash-completion? ( >=app-shells/bash-completion-1.9 )
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser )
-	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-PodParser
-		)
-	zsh-completion? ( app-shells/zsh )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-MY_PATCHES=(
-	"${FILESDIR}/${PV}-0001-emacs-install-make-sure-all-components.patch"
-	"${FILESDIR}/${PV}-0002-doc-conf.py-Remove-_static-from-html_s.patch"
-	"${FILESDIR}/${PV}-0003-Unset-html_static_path-in-Python-bindi.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 "Notmuch 0.18 comes with few not backward compatible changes."
-		ewarn "See NEWS file 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[@]}"
-
-	default
-	bindings python distutils-r1_src_prepare
-	bindings python mv README README-python || die
-	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
-		--emacslispdir="${ROOT}/${SITELISP}/${PN}"
-		--emacsetcdir="${ROOT}/${SITEETC}/${PN}"
-		--with-gmime-version=2.6
-		--zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
-		$(use_with bash-completion)
-		$(use_with emacs)
-		$(use_with zsh-completion)
-	)
-	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
-	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
-		[[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1
-		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_postinst() {
-	use emacs && elisp-site-regen
-
-	if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; 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_postrm() {
-	use emacs && elisp-site-regen
-}