Removed the oldest versions: 0.10 and 0.11.

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

10 files changed, 19 insertions, 597 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index ad01ebce2fd7..22aaacbeab77 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.80 2013/09/14 17:28:42 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.81 2013/09/14 17:32:35 aidecoe Exp $
+
+  14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  -notmuch-0.10.2-r3.ebuild, -notmuch-0.11.1-r3.ebuild,
+  -files/0.10.2-build-with-gmime-2.4-only.patch,
+  -files/0.10.2-emacsui-mml-tags-quoting-fix.patch,
+  -files/0.10.2-emacsui-mml-tags-quoting-test.patch,
+  -files/0.10.2-fix-test-build.patch,
+  -files/0.10.2-lib-call-g_mime_init-db-open.patch,
+  -files/0.11.1-build-with-gmime-2.4-only.patch:
+  Removed the oldest versions: 0.10 and 0.11.
 
   14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
   -files/0.15-0001-lib-Makefile.local-depend-on-libs-we-a.patch,
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 460a0f463aac..086eb7fabdf3 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.10.2-build-with-gmime-2.4-only.patch 443 SHA256 c9476070f21708f9813e9123445166fb1806d1924c15552e223f164818793c6f SHA512 df729de5ec12ab843d23500a30b7334e774aa78d4302015649c8904d4e847ce705421ae04d16abb29067a2d90f932e71e9a9f5f66c38a3e5cdea01bcd1fe52e5 WHIRLPOOL 9e95d6c04b6a23108d29ece9e2d12dd3bba876613afd4be1a583addb566d4f5f93bd5f7ae6a2cdab3fbc8ef26720f15c7b316178759e4563d1c48dd41e990f02
-AUX 0.10.2-emacsui-mml-tags-quoting-fix.patch 1741 SHA256 acaedefdc6ecbdf921c146ed6e110416cd7cfff09cf985376a0ee94755075306 SHA512 e1ab44df2eb0c63b857d3f0c7a38bf91db90a54382e56fd56f99a39f1549c8051e111b3b8a96f72ea068abe30ecabd9c7cdbf112f7c3d45d0093a9ba293b8391 WHIRLPOOL db3b2dd8ee295d258f2092e61a35ff6d80e2e44376d8f19c89f9de79488ba846fec42207af1510ffe48a9c5b28285600a9a9cf82a77e003c230a7f4093322ef1
-AUX 0.10.2-emacsui-mml-tags-quoting-test.patch 1737 SHA256 e5eaecf2a794f9239d47a021d84a4726de458ca93f04ff27bb9b20c5c8773a9c SHA512 9e14d80c3f928755c493155ee06d0cdd04a76aa712c90ec3d5df708241d33f11e89f95bf6d9060c61767397aa02245fc3ff1fa5e404f6fc18b54d926baef7781 WHIRLPOOL 2d222b676dc66caefb24a1434622b4b3850fb929d398b0aab160e1cba8f8831802dc276aa1f8c5e8cd0e846fb84090f35de28a0625fd25ae898d402f58f58d27
-AUX 0.10.2-fix-test-build.patch 3709 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227 SHA512 9fbc9f8e2dba81772ebbfed1b4b1b61967eb409afc7999cf183cc9129f5146446c5bad0bfb2b5d4616d0434a45bfbf2ebe4c3fc47bdd60da467c60b0d4c720ac WHIRLPOOL 9f05b5aec9777733c87b9af1034ed650e772c1aa478f4753124f072b27a6fd515ab81de85ed4945d8ad76781affcaab66e7e6824d9e42154dd8b7e129ba95e12
-AUX 0.10.2-lib-call-g_mime_init-db-open.patch 1783 SHA256 257491740a4f751799f6d24b406dc84efa2925cac85dd9eb3cda43924d9a1243 SHA512 0d22c66115a86ec5cd9d96819a493ae0b3b526b3f598e5dec7491019faef826532bf117bfade494fc81b8117987adfbed69066b202bf3c8668ec021168aa3330 WHIRLPOOL 1ba36c0c4ff836f2fe89c4f11d3b81e1769e6c0585a3102dfc117b9debc35a0d0cc9c9c68d58991467fe401499a7ea54fc637b16bf74aba3951185734b8bd03d
-AUX 0.11.1-build-with-gmime-2.4-only.patch 443 SHA256 c9476070f21708f9813e9123445166fb1806d1924c15552e223f164818793c6f SHA512 df729de5ec12ab843d23500a30b7334e774aa78d4302015649c8904d4e847ce705421ae04d16abb29067a2d90f932e71e9a9f5f66c38a3e5cdea01bcd1fe52e5 WHIRLPOOL 9e95d6c04b6a23108d29ece9e2d12dd3bba876613afd4be1a583addb566d4f5f93bd5f7ae6a2cdab3fbc8ef26720f15c7b316178759e4563d1c48dd41e990f02
 AUX 0.12-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
 AUX 0.13.1-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
 AUX 0.14-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
@@ -14,30 +8,26 @@ AUX 0.15.2-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188
 AUX 0.16-0001-test-exit-with-nonzero-value-when-not-.patch 1391 SHA256 7f20188e016f112415093fccb12c9800e89d7492eeed2e0b0149845377f26085 SHA512 a84181e3207839e0b039508f45defe0d97c8913e97bee36be6e1fcf4153b39c47e1320ab99bc2c2fa1dad0a30c427ad77ab3567419790ad08831198475acd6e2 WHIRLPOOL 6755a92ad71bf885896e57ad993850f6e020f70175a8ffb8d75a0fcb6545697b49caf2aaaeb226e9b55581272a7b4d3e659a32011855ada212d080d70bf8792f
 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.10.2.tar.gz 408872 SHA256 2ba5ba9b32e62180d7d5f2bc3f89360aede72319e57962ffeffa98cd1c37f0f7 SHA512 0ec867ff3e81dfe310eadbdebe31a78177b1d45aa5032153c4a2a8884ba700725f3a7846de1e489b7e7f8a1a9b4b70e39463e5aab986324810e1f75dce2b8b73 WHIRLPOOL 918bc6349578d0cb4171b2509d717c9bf6ab4b7f88a74934a7afb50486e2ed204a6058d878fe269c9bcb46161c48a5ffdc539972ea2c579c65f4d97ebe654c4a
-DIST notmuch-0.11.1.tar.gz 439099 SHA256 d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706 SHA512 a65c3017334a3f3cb997419e0aff3dcb3410197bfb2021c361ce0ce0f8eb49c4a15e165fe214847349efc04dd5bb254330effb8324fbf7eb97c1ea8e415650a7 WHIRLPOOL a743653b3e4977947d4e790bd6754279a8b4c1f657c1a58c0da5408b5c4638dd31183c3fcc50324bf3003cbe406a16b8f5911a91de439decca238227e6a1fe39
 DIST notmuch-0.12.tar.gz 464967 SHA256 1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992 SHA512 e6254cdd869d4a542f06c4e483255bb76a1befc0a1778f1f1ed77cb4e382ff56d63e7cf3290e58eee7a82aa5c050735d088e95e022140b2e7ddb8c3d4a855b82 WHIRLPOOL 07895be7c9aac47657258a84f77fe9aa8d7fd0778874eefd33a956d53bbcaca239705afd6fc5927d8add1dca870e23bc9dd274f4c2f6f69e7ceeac925199a0f8
 DIST notmuch-0.13.1.tar.gz 483776 SHA256 cf909876551e3345941e1ed40f5ef851f34b78fe3c93db3bf37789580035ce48 SHA512 110eb54b04c77e75ad8217aa3725802085a604c457014aa1f1b6ee0937f694de9ac36c47d225dcdcea1bb9b5f6d49ce476eafc61deb85c3435106bbc3784e406 WHIRLPOOL cebe7090a52838bcd42119ca360b4a038eb3cfe7d3854183fe71b1f98f222bc8ac16d4a8cf92a0206b5ad8a8f9f552d6cf760c42febdf9fb1755c51b8f6c2e7c
 DIST notmuch-0.14.tar.gz 488310 SHA256 095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753 SHA512 64f277906c085cc391e9ae3283e38905d95a931b0223cc986ca213d2191aa810b5b0f3abdf5fed84f5d6c4e6baacca8ca02574e29cd13537be01ac00e2501ed0 WHIRLPOOL b924cc3a922c209c52ae18446b363b29e81e77cdde3e37c47a99647f1a66dc55daf77db57dc9c9acd0d9953a5456ba1e82014585205bcca869f9fc4d0bd99eb3
 DIST notmuch-0.15.2.tar.gz 560411 SHA256 a6e8af6382ab6df4a944bbffda9eb22639612c047b94632168b4270f2af59c0d SHA512 c31d147f7a3e464562c720f7884b51b14cee6d482e76a9d413be22493b62609301b50977d8727984f5c41ebf4f893d2607c03f4c51608a65aa843ef18e9e0fa6 WHIRLPOOL 827f94eb2eacc9d2b40effcb17e52a76a4716656b2a67ac7a3b8bc7ac924c421aa421541a45e3485851f3736a5e04a99965e32e267c856483d1af9bffb459b78
 DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
-EBUILD notmuch-0.10.2-r3.ebuild 3242 SHA256 0e42ef4102ae887f93734d2e79d22fe4e9c9b44ce83321a0447837f522375f56 SHA512 6f3e3798b07b85d4240afaff6df8e36a228e8f2a84b137752e6efc8ce2a200a1a05c0f9b510f26c3104ae38ce372fcf8e8885dd21f370a1c11594c8396e6ca97 WHIRLPOOL 3f84a896ce1386c8a9178a335429417d9b1a8c7cd4f687ab4228301b8a86b9f322a21a8438644dc8b1761f321f3e57ea01b5e7cd9a72b43a7790484a4f91acf0
-EBUILD notmuch-0.11.1-r3.ebuild 3026 SHA256 419ffc1d4048e8df3c0254ba52b23fed38e68f76c660717f5e022017bfc142f5 SHA512 a01afaa07072e96a634bbf53bdfb592c57d310321ed215ae5a97f127231822d8614194cc4b462b10f37ff43410d696a32f381e5b3608ee303807282e2cdf6ca6 WHIRLPOOL 471fb3ff36c95796ef9f9ad43a1c31afa1be03672bb23a92516ad98c9195b5bbafa0a82f87fc712a27eee2fb0a800f5e4797d3244dfb84a7a12ddc8a2ffff930
 EBUILD notmuch-0.12.ebuild 2983 SHA256 43a61d110bf8732d41a76722cbb76feea9b353a2d25f386584a2220420e4fff9 SHA512 8f71cafa3204fba15652bdcd84724afebbf2dcf3646ba5aa1226cfa0bd84823f55d31d212be67bfb608c1529672243578833172b3fdfcb82efc7db4e1e26b9c9 WHIRLPOOL 7ad02a1b917c95a655a5d14e2055fe8d7e3a971defdbdbcd44f2d1e2df35b148406d37175d88b18b4c93b5a893d0fe96b7c0ba1a26ce67b1b048677aff544400
 EBUILD notmuch-0.13.1.ebuild 3797 SHA256 2e57e9844c5ca496a7c46f4a4acb027c4447d18c035a3f41666f78e96631851a SHA512 3a5c36c949c76edf0aebb80ac903b41a12ed07ef9aab75644ba496e33124f01d26c86379fcc6edfe6bd81742848f59afa59e5d4aa7f75aa915392de671fde260 WHIRLPOOL d943ab249d3c693a5e849c0c4df3b98f2103941376589d34f010d71f695cf18e01271981b2feb54db06f61cb1d32536af03f2b4d44fccceb314a14cd784d13f6
 EBUILD notmuch-0.14-r1.ebuild 3850 SHA256 cd1fccdc6b42775b82a7914dc2debe21e5ff9c158449d6da9ed0543fd2449fab SHA512 a26fd40f4746afa0a9160d2168675927f131171624c0f885fb0802ac4495a7d7c07c5917e131b714cea1b985ab9bec5495f2b57d40789930a46d3c3a1baa4f4c WHIRLPOOL c36f184f89b82d69e93170ba3a2099aca97842ed0fecc61d631dea9b38d65929b52f83b819950b2190b34cea4639c1eb86f76484be09aab1579b785e8e5d9b6e
 EBUILD notmuch-0.15.2.ebuild 4367 SHA256 a1c34bdb4f3683b4bc24f35c5a973c0d72512c734f6b4359e5bdf83241ab1fae SHA512 e1e9d9321aac742d57f74f7be218c7eaed09f8a4ff0999cd692bb841b22530c8e15e0e4baf2985fe342b020e7286728b88d9a4123fd885b08cb929ecc30e94ff WHIRLPOOL 346ead6adfc49e816a64fb3c11704d37b70a1a0e3d1674ad49d163b5df910420d7e7ea3af0c6449b485a90413af801d19c40155b53ac37bb98f55d94dd1742a7
 EBUILD notmuch-0.16-r1.ebuild 4158 SHA256 6cf2f9ee13e0fd9ed7fdc64685e45f3c7762f950846d6726127beaa9990cf133 SHA512 cf0af59e6e20d768ba5e5a509d5617aec04a66cc8b473faf38795a06aeb3e520c544ff99d0462a0dc8d6218cd0acfba0ed5ec1883b0e49e91c16874f745f806c WHIRLPOOL 2e9d07762fb59e061bbd46d8566129624030713d5e487eb026bf2103518d255323ae1539dbd82ef091766817ea05fc2232b2c7e46b812e63a8ffbe54b6163cea
-MISC ChangeLog 22711 SHA256 c7c43970eef549ac2331164311b71e99afd22c9da9fc97814ddabbe2de62faa2 SHA512 5b2e03c61a7aed2799940e0d1f648a929f898fb3f34faac657e13a837f053e9008d691c376026a3302a39e4eca249e4b79271d2ad2bd53c561c756e7067204a2 WHIRLPOOL 86017ae3d9d6dc09341388ec842f59b059f04bda7af618cd7ff24f574cef0dc793979bcfabeb5147f9bf6d4c848ef0c2ba6c286322e9364244ea3a8edcbaaea2
+MISC ChangeLog 23164 SHA256 8101ff1713861e1ac895621a0cf15d50e149a69e961e9fa0dd0f0b8ba2b7d728 SHA512 a1811f018716b53c0c8af08d39f1b962f4a4f1368ce2020fa595581a0b9104a8015384432b16b565aca8baaee91cbf46ae2e6105eaef22718bf1a2f6dd52ec78 WHIRLPOOL cf01d2bb04e56305036887b30fdb790e335699fc70d72c6181eaf748a22093101bee68ea6ead880437281c2d8c9e03ebbb4de241744e5bdd3c3144fb1607d3c9
 MISC metadata.xml 1130 SHA256 bef417ea1ad1a12a2639eb9644e7b8fda664f2c19047e2357aa56c3964bafb7b SHA512 e58811e997cdf258f70a9c2baa526d8c3acb76dfc208b43bc8bff3a4d1433ed08231956f9fbe098fd9ee26d4002bdb35617fbb0e578510489c9671d969b84eef WHIRLPOOL e72970d425eda43b1f635406f2ad04c725373662716ed4e4c1e88366da0d80bc2cb9b90da264a3cbd71d474881984b187fcfff15e78ffda7fdf161663e27b5d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSNJzLAAoJEPATRTHh2/q1y1gIAKYCyDB6SUhWOI+qfl9f59tZ
-buRa9YMzS1AP6XCKNQiVFGiav69siD9qi3DY4VSbX9UY4IjCPBNcC6vf6XyyXkRO
-d/uvsO8JV0FZaF/cQ/xbpcNCeeiqPTokKLn0L1QCFcR8uCcfITISgDQ7eELjYfIs
-1KJDnRg/MUC/OqcvkCurtjEhUOMrGkt7xR6LpNobONwf+dHDARRYLC4bR509VdPG
-qfkNokowjzgHwk6JHplBHArVh5XJ+/II5zXOHYsgl20gV2SmSWZeeBmr80YFLeer
-/dDizHwzsDiv2OrwohcKV70xKD0fwhQHDgpnCqSbArHm/7SGvYdI9K3vA6GVmGI=
-=h9de
+iQEcBAEBCAAGBQJSNJ20AAoJEPATRTHh2/q14FAH/R8cqmKBIiG/BPX6oJKwt/WP
+7UHgElJzTjw03VwmfkyF4mz50UpDVG0zr/sc551QXO1CoQ0E9PdmTwUEYR2gEOvO
+h6JCizQ8BPWmO6EQ2eZhnAirpQNr+Dp8IrCk/T8xmos5mDsiCmWQFTYLTgdzke+w
+o4LLitGDu6J9UNHoxrtaBGmY5+sz7yqLmU9kGKNE5hUCLLW5ic5G0qH+4i5dbRYB
+piKQjqgXnkxsAk3+GnXTPgaPXkvwA2fPBe1Xs6/SmDQr/WNFJ67qoz+M+w5427kM
+IqGfTjTAKyrB9ukzi+C3iSq/9kMx5LDpZtKBsPxrxUbcCKPQO1zH3lKhpqIGCVw=
+=YdVt
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch b/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch
deleted file mode 100644
index 91879509d2b3..000000000000
--- a/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur notmuch-0.10.2/configure notmuch-0.10.2.new/configure
---- notmuch-0.10.2/configure	2011-12-06 04:06:50.000000000 +0100
-+++ notmuch-0.10.2.new/configure	2012-04-22 12:04:52.227816674 +0200
-@@ -275,7 +275,7 @@
- 
- printf "Checking for GMime development files... "
- have_gmime=0
--for gmimepc in gmime-2.6 gmime-2.4; do
-+for gmimepc in gmime-2.4; do
-     if pkg-config --exists $gmimepc; then
- 	printf "Yes ($gmimepc).\n"
- 	have_gmime=1
diff --git a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch b/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch
deleted file mode 100644
index e6d8099f8d4e..000000000000
--- a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 52a5f9e1756a5f69570bf694fe3e384cbef84eb9 Mon Sep 17 00:00:00 2001
-From: Aaron Ecay <aaronecay@gmail.com>
-Date: Fri, 3 Feb 2012 11:24:08 +0100
-Subject: [PATCH 2/4] emacs: quote MML tags in replies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Emacs message-mode uses certain text strings to indicate how to attach
-files to outgoing mail.  If these are present in the text of an email,
-and a user is tricked into replying to the message, the user’s files
-could be exposed.
-
-Edited-by: Pieter Praet <pieter@praet.org>:  Rebased to release branch.
-
-Conflicts:
-
-	NEWS
----
- emacs/notmuch-mua.el |    7 ++++++-
- test/emacs           |    1 -
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
-index 8824b08..a123c71 100644
---- a/emacs/notmuch-mua.el
-+++ b/emacs/notmuch-mua.el
-@@ -109,7 +109,12 @@ list."
-     (insert body))
-   (set-buffer-modified-p nil)
- 
--  (message-goto-body))
-+  (message-goto-body)
-+  ;; Original message may contain (malicious) MML tags.  We must
-+  ;; properly quote them in the reply.  Note that using `point-max'
-+  ;; instead of `mark' here is wrong.  The buffer may include user's
-+  ;; signature which should not be MML-quoted.
-+  (mml-quote-region (point) (point-max)))
- 
- (defun notmuch-mua-forward-message ()
-   (message-forward)
-diff --git a/test/emacs b/test/emacs
-index a8f4be4..ad8941c 100755
---- a/test/emacs
-+++ b/test/emacs
-@@ -253,7 +253,6 @@ EOF
- test_expect_equal_file OUTPUT EXPECTED
- 
- test_begin_subtest "Quote MML tags in reply"
--test_subtest_known_broken
- message_id='test-emacs-mml-quoting@message.id'
- add_message [id]="$message_id" \
- 	    "[subject]='$test_subtest_name'" \
--- 
-1.7.8.4
-
diff --git a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch b/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch
deleted file mode 100644
index b293814d1a9e..000000000000
--- a/net-mail/notmuch/files/0.10.2-emacsui-mml-tags-quoting-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1c34ca30118ee8c7fb08228bfb211ff1a7f4f260 Mon Sep 17 00:00:00 2001
-From: Aaron Ecay <aaronecay@gmail.com>
-Date: Fri, 3 Feb 2012 11:24:07 +0100
-Subject: [PATCH 1/4] test: add tests for quoting of MML tags in replies
-
-The test is broken at this time; the next commit will introduce a fix.
-
-Edited-by: Pieter Praet <pieter@praet.org>:
-  Rebased to release branch, moved expected output into the actual test,
-  and fixed "Fcc:" line.
----
- test/emacs |   21 +++++++++++++++++++++
- 1 files changed, 21 insertions(+), 0 deletions(-)
-
-diff --git a/test/emacs b/test/emacs
-index 75a0a74..a8f4be4 100755
---- a/test/emacs
-+++ b/test/emacs
-@@ -252,6 +252,27 @@ On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> w
- EOF
- test_expect_equal_file OUTPUT EXPECTED
- 
-+test_begin_subtest "Quote MML tags in reply"
-+test_subtest_known_broken
-+message_id='test-emacs-mml-quoting@message.id'
-+add_message [id]="$message_id" \
-+	    "[subject]='$test_subtest_name'" \
-+	    '[body]="<#part disposition=inline>"'
-+test_emacs "(notmuch-show \"id:$message_id\")
-+	      (notmuch-show-reply)
-+	      (test-output)"
-+cat <<EOF >EXPECTED
-+From: Notmuch Test Suite <test_suite@notmuchmail.org>
-+To: 
-+Subject: Re: Quote MML tags in reply
-+In-Reply-To: <test-emacs-mml-quoting@message.id>
-+Fcc: ${MAIL_DIR}/sent
-+--text follows this line--
-+On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
-+> <#!part disposition=inline>
-+EOF
-+test_expect_equal_file OUTPUT EXPECTED
-+
- test_begin_subtest "Save attachment from within emacs using notmuch-show-save-attachments"
- # save as archive to test that Emacs does not re-compress .gz
- test_emacs '(let ((standard-input "\"attachment1.gz\""))
--- 
-1.7.8.4
-
diff --git a/net-mail/notmuch/files/0.10.2-fix-test-build.patch b/net-mail/notmuch/files/0.10.2-fix-test-build.patch
deleted file mode 100644
index 7b326fb85c61..000000000000
--- a/net-mail/notmuch/files/0.10.2-fix-test-build.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From dc1fae07d2896d9eace61989b7c25d9434ee7f3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Nov 2011 10:08:47 +0100
-Subject: [PATCH] Build symbol-test with make instead of hardcoding in
- symbol-hiding.
-
-If symbol-test is built in symbol-hiding with hardcoded g++ invokation, it's
-not so easy to pass $(srcdir) which is required to find notmuch.h when srcdir
-and builddir are separate directories.
-
-Fixed warnings in symbol-test.cc, btw.
----
- test/.gitignore     |    1 +
- test/Makefile.local |    5 ++++-
- test/basic          |    2 +-
- test/symbol-hiding  |    3 +--
- test/symbol-test.cc |    9 ++++-----
- 5 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/test/.gitignore b/test/.gitignore
-index 9e97052..7e30e8d 100644
---- a/test/.gitignore
-+++ b/test/.gitignore
-@@ -1,4 +1,5 @@
- test-results
- corpus.mail
- smtp-dummy
-+symbol-test
- tmp.*
-diff --git a/test/Makefile.local b/test/Makefile.local
-index 8eb0433..a672fd3 100644
---- a/test/Makefile.local
-+++ b/test/Makefile.local
-@@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
- $(dir)/smtp-dummy: $(smtp_dummy_modules)
- 	$(call quiet,CC) $^ -o $@
- 
-+$(dir)/symbol-test: $(dir)/symbol-test.o
-+	$(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
-+
- .PHONY: test check
--test:	all $(dir)/smtp-dummy
-+test:	all $(dir)/smtp-dummy $(dir)/symbol-test
- 	@${dir}/notmuch-test $(OPTIONS)
- 
- check: test
-diff --git a/test/basic b/test/basic
-index 38db2ba..5463bf8 100755
---- a/test/basic
-+++ b/test/basic
-@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
- available=$(ls -1 $TEST_DIRECTORY/ | \
-     sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
- 	   -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
--	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
-+	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \
- 	   -e "/^(test.expected-output|.*~)/d" \
- 	   -e "/^(gnupg-secret-key.asc)/d" \
- 	   -e "/^(gnupg-secret-key.NOTE)/d" \
-diff --git a/test/symbol-hiding b/test/symbol-hiding
-index d0b31ae..f67b653 100755
---- a/test/symbol-hiding
-+++ b/test/symbol-hiding
-@@ -12,13 +12,12 @@ test_description='exception symbol hiding'
- . ./test-lib.sh
- 
- run_test(){
--    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1)
-+    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)
- }
- 
- output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
- caught No chert database found at path \`./nonexistant'"
- 
--g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian
- mkdir -p fakedb/.notmuch
- test_expect_success 'running test' run_test
- test_begin_subtest 'checking output'
-diff --git a/test/symbol-test.cc b/test/symbol-test.cc
-index 1de06ea..bfbe38f 100644
---- a/test/symbol-test.cc
-+++ b/test/symbol-test.cc
-@@ -1,14 +1,13 @@
- #include <stdio.h>
- #include <xapian.h>
- #include <notmuch.h>
--main (int argc, char **argv){
-+int main (){
- 
--    notmuch_database_t *notmuch
--      = notmuch_database_open ("fakedb",
--				     NOTMUCH_DATABASE_MODE_READ_ONLY);
-+  //notmuch_database_t *notmuch =
-+  notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY);
- 
-   try{
--    (void)new Xapian::WritableDatabase ("./nonexistant",					Xapian::DB_OPEN);
-+    (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
-   } catch (const Xapian::Error &error) {
-     printf("caught %s\n",error.get_msg().c_str());
-     return 0;
--- 
-1.7.8.rc3
-
diff --git a/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch b/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch
deleted file mode 100644
index 7521e39b0358..000000000000
--- a/net-mail/notmuch/files/0.10.2-lib-call-g_mime_init-db-open.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5f4dad1b12e224f06576e5ed9e71b3f9f16a13f1 Mon Sep 17 00:00:00 2001
-From: Kazuo Teramoto <kaz.rag@gmail.com>
-Date: Sat, 31 Dec 2011 02:37:41 -0200
-Subject: [PATCH 3/3] lib: call g_mime_init() from notmuch_database_open()
-
-As reported in
-id:"CAEbOPGyuHnz4BPtDutnTPUHcP3eYcRCRkXhYoJR43RUMw671+g@mail.gmail.com"
-sometimes gmime tries to access a NULL pointer, e.g. g_mime_iconv_open()
-tries to access iconv_cache that is NULL if g_mime_init() is not called.
-This causes notmuch to segfault when calling gmime functions.
-
-Calling g_mime_init() initializes iconv_cache and others variables needed
-by gmime, making sure they are initialized when notmuch calls gmime
-functions.
----
- lib/database.cc |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/lib/database.cc b/lib/database.cc
-index 98f101e..df6c8d0 100644
---- a/lib/database.cc
-+++ b/lib/database.cc
-@@ -28,6 +28,8 @@
- #include <glib.h> /* g_free, GPtrArray, GHashTable */
- #include <glib-object.h> /* g_type_init */
- 
-+#include <gmime/gmime.h> /* g_mime_init */
-+
- using namespace std;
- 
- #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
-@@ -581,6 +583,7 @@ notmuch_database_open (const char *path,
-     struct stat st;
-     int err;
-     unsigned int i, version;
-+    static int initialized = 0;
- 
-     if (asprintf (&notmuch_path, "%s/%s", path, ".notmuch") == -1) {
- 	notmuch_path = NULL;
-@@ -604,6 +607,12 @@ notmuch_database_open (const char *path,
-     /* Initialize the GLib type system and threads */
-     g_type_init ();
- 
-+    /* Initialize gmime */
-+    if (! initialized) {
-+	g_mime_init (0);
-+	initialized = 1;
-+    }
-+
-     notmuch = talloc (NULL, notmuch_database_t);
-     notmuch->exception_reported = FALSE;
-     notmuch->path = talloc_strdup (notmuch, path);
--- 
-1.7.8.4
-
diff --git a/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch b/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch
deleted file mode 100644
index 91879509d2b3..000000000000
--- a/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur notmuch-0.10.2/configure notmuch-0.10.2.new/configure
---- notmuch-0.10.2/configure	2011-12-06 04:06:50.000000000 +0100
-+++ notmuch-0.10.2.new/configure	2012-04-22 12:04:52.227816674 +0200
-@@ -275,7 +275,7 @@
- 
- printf "Checking for GMime development files... "
- have_gmime=0
--for gmimepc in gmime-2.6 gmime-2.4; do
-+for gmimepc in gmime-2.4; do
-     if pkg-config --exists $gmimepc; then
- 	printf "Yes ($gmimepc).\n"
- 	have_gmime=1
diff --git a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild b/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
deleted file mode 100644
index 5bccb0920afb..000000000000
--- a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.2-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit elisp-common eutils pax-utils distutils
-
-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="test? ( crypt emacs python )"
-IUSE="bash-completion crypt debug doc emacs nmbug python test vim
-	zsh-completion"
-
-CDEPEND="
-	>=dev-libs/glib-2.22
-	dev-libs/gmime:2.4
-	<dev-libs/xapian-1.3
-	sys-libs/talloc
-	debug? ( dev-util/valgrind )
-	emacs? ( >=virtual/emacs-23 )
-	x86? ( >=dev-libs/xapian-1.2.7-r2 )
-	vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( python? ( dev-python/sphinx ) )
-	test? ( app-misc/dtach sys-devel/gdb )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser )
-	zsh-completion? ( app-shells/zsh )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-fix-test-build.patch"
-	"${FILESDIR}/${PV}-emacsui-mml-tags-quoting-test.patch"
-	"${FILESDIR}/${PV}-emacsui-mml-tags-quoting-fix.patch"
-	"${FILESDIR}/${PV}-lib-call-g_mime_init-db-open.patch"
-	"${FILESDIR}/${PV}-build-with-gmime-2.4-only.patch"
-	)
-DOCS=( AUTHORS NEWS README TODO )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		$@
-		popd || die
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	local p
-	for p in "${PATCHES[@]}"; do
-		epatch "${p}"
-	done
-	default
-	bindings python distutils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
-		--emacslispdir="${ROOT}/${SITELISP}/${PN}"
-		--emacsetcdir="${ROOT}/${SITEETC}/${PN}"
-		--zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
-		$(use_with bash-completion)
-		$(use_with emacs)
-		$(use_with zsh-completion)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	bindings python distutils_src_compile
-
-	if use doc; then
-		pydocs() {
-			mv README README-python || die
-			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 contrib/nmbug
-	fi
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles
-		doins -r vim/plugin vim/syntax
-	fi
-
-	DOCS="" bindings python distutils_src_install
-
-	if use doc; then
-		bindings python dohtml -r python
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use python && distutils_pkg_postrm
-}
diff --git a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild b/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
deleted file mode 100644
index 4f4eccb33381..000000000000
--- a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.11.1-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit elisp-common eutils pax-utils distutils
-
-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="test? ( crypt emacs python )"
-IUSE="bash-completion crypt debug doc emacs nmbug python test vim
-	zsh-completion"
-
-CDEPEND="
-	>=dev-libs/glib-2.22
-	dev-libs/gmime:2.4
-	<dev-libs/xapian-1.3
-	sys-libs/talloc
-	debug? ( dev-util/valgrind )
-	emacs? ( >=virtual/emacs-23 )
-	x86? ( >=dev-libs/xapian-1.2.7-r2 )
-	vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( python? ( dev-python/sphinx ) )
-	test? ( app-misc/dtach sys-devel/gdb )
-	"
-RDEPEND="${CDEPEND}
-	crypt? ( app-crypt/gnupg )
-	nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-PodParser )
-	zsh-completion? ( app-shells/zsh )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-build-with-gmime-2.4-only.patch"
-	)
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
-
-bindings() {
-	if use $1; then
-		pushd bindings/$1 || die
-		shift
-		$@
-		popd || die
-	fi
-}
-
-pkg_setup() {
-	if use emacs; then
-		elisp-need-emacs 23 || die "Emacs version too low"
-	fi
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	local p
-	for p in "${PATCHES[@]}"; do
-		epatch "${p}"
-	done
-	default
-	bindings python distutils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
-		--emacslispdir="${ROOT}/${SITELISP}/${PN}"
-		--emacsetcdir="${ROOT}/${SITEETC}/${PN}"
-		--zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
-		$(use_with bash-completion)
-		$(use_with emacs)
-		$(use_with zsh-completion)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	bindings python distutils_src_compile
-
-	if use doc; then
-		pydocs() {
-			mv README README-python || die
-			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 contrib/nmbug
-	fi
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles
-		doins -r vim/plugin vim/syntax
-	fi
-
-	DOCS="" bindings python distutils_src_install
-
-	if use doc; then
-		bindings python dohtml -r python
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use python && distutils_pkg_postrm
-}