Added patch enforcing build with GMime 2.4 only, because 2.6 is not supported

in Notmuch 0.10.2 and it's not fully supported in 0.11.1.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

6 files changed, 323 insertions, 9 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 149d90f79648..530e3e2dd269 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.42 2012/04/24 08:59:49 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.43 2012/04/24 09:30:17 aidecoe Exp $
+
+*notmuch-0.11.1-r3 (24 Apr 2012)
+*notmuch-0.10.2-r3 (24 Apr 2012)
+
+  24 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +files/0.10.2-build-with-gmime-2.4-only.patch,
+  +files/0.11.1-build-with-gmime-2.4-only.patch, +notmuch-0.10.2-r3.ebuild,
+  +notmuch-0.11.1-r3.ebuild:
+  Added patch enforcing build with GMime 2.4 only, because 2.6 is not supported
+  in Notmuch 0.10.2 and it's not fully supported in 0.11.1.
 
   24 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.10.2-r2.ebuild,
   notmuch-0.11.1-r2.ebuild, notmuch-0.12.ebuild:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4f0857d202c4..acd3954440ea 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,27 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.10.2-build-with-gmime-2.4-only.patch 443 RMD160 fdd0d61b9adb2cec545e81a29aff4e88099f8226 SHA1 7623ca0ebe9d77215db75f5a3760051d2400f8f2 SHA256 c9476070f21708f9813e9123445166fb1806d1924c15552e223f164818793c6f
 AUX 0.10.2-emacsui-mml-tags-quoting-fix.patch 1741 RMD160 0650c8f427f1138f76af6f0921f38386df01db1f SHA1 32252fa4e8f26da37e1f27d92756a8bef18fd3e9 SHA256 acaedefdc6ecbdf921c146ed6e110416cd7cfff09cf985376a0ee94755075306
 AUX 0.10.2-emacsui-mml-tags-quoting-test.patch 1737 RMD160 9f88c67c2ab2e5d5360da77ae19d3901bcc5958e SHA1 e6a8d7d1c9186b652916996176ef0c462b0f8af4 SHA256 e5eaecf2a794f9239d47a021d84a4726de458ca93f04ff27bb9b20c5c8773a9c
 AUX 0.10.2-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc8c2a SHA1 30925abc3d463d5d5cf176945def321684fc7645 SHA256 4b7820e537de6f23028b7d02d2482425b4e678522deca29fe70560757f2d4227
 AUX 0.10.2-lib-call-g_mime_init-db-open.patch 1783 RMD160 3cbe79c3aefc9e658d6b8e5a4a13e95ad3adea2e SHA1 293dce6041642d02cbcc33585c4f4fa76b15a1e1 SHA256 257491740a4f751799f6d24b406dc84efa2925cac85dd9eb3cda43924d9a1243
+AUX 0.11.1-build-with-gmime-2.4-only.patch 443 RMD160 fdd0d61b9adb2cec545e81a29aff4e88099f8226 SHA1 7623ca0ebe9d77215db75f5a3760051d2400f8f2 SHA256 c9476070f21708f9813e9123445166fb1806d1924c15552e223f164818793c6f
 AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b
 DIST notmuch-0.10.2.tar.gz 408872 RMD160 82a3fb751340d8c58bd5e32110cfd77d273c46f6 SHA1 3064c1722d30c71f287e1ab63ac13a5847e20c14 SHA256 2ba5ba9b32e62180d7d5f2bc3f89360aede72319e57962ffeffa98cd1c37f0f7
 DIST notmuch-0.11.1.tar.gz 439099 RMD160 2b525ccb0c4919da36aeed3d645be173eb8d867a SHA1 05694ae8762076bf91d63b199e72a12e5ce012b0 SHA256 d9896ae295fd8e5471c49b0ba39872ccfdfc3488a8e7ba6fd68ba1686bc52706
 DIST notmuch-0.12.tar.gz 464967 RMD160 7ed35f09121f6a60cc42c604ce935186bba31170 SHA1 93effc7f8993c7b29b854adf8a2662b50a187819 SHA256 1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992
 EBUILD notmuch-0.10.2-r2.ebuild 3040 RMD160 d31a33ff558db061a9fcdf4c037e6ce731a8fc88 SHA1 ed7ef93bfe8ce2a88fd9cd21c0a6e91160333695 SHA256 11ba758875315033f99b08b36532a6a10a1333589bf07d6b04c0fdd56dbfb093
+EBUILD notmuch-0.10.2-r3.ebuild 3094 RMD160 615e04c5e5107d8999d01fed7c72920b94e6194c SHA1 8b836c97d4b3d53d5a2b0f7355698b4ee54c5a9b SHA256 83f24fb08ca7a7906d34fbf529be03f73edc0f41d812022dbf5158f23a21326f
 EBUILD notmuch-0.11.1-r2.ebuild 2841 RMD160 a14a083141d554cb55234f259e0a074611d2c179 SHA1 b936bbd1e6eb88449623e0ec057d50c645b653b5 SHA256 e0dd2d12201bef8208d0c0acee70977fd9c1627b0eb3f37c92574480df3e66de
+EBUILD notmuch-0.11.1-r3.ebuild 2910 RMD160 65db453871c7fea986f60be376a292fc23f3c01e SHA1 842d987b8bd82656b963f01be88a0054d765e9eb SHA256 684b28c544163338d9e8b38cf695e59dcac268ddf0b1e336034bd6a0d380e265
 EBUILD notmuch-0.12.ebuild 2847 RMD160 1f5e18de8f1f4e708fcd484b78000eb671b4c1e2 SHA1 d1e3a1af94f18c8a59c798efb1c9e335d388fee5 SHA256 b8f1c84540e8fff36464e5f52971715be5fa19d5c61de346bf913cd2b5d8e827
-MISC ChangeLog 11505 RMD160 3d9b5535309401b092b1315773993ffd0575761c SHA1 1ae468bb05dd92c03ffc460615c54cbc696a0571 SHA256 3b8044db2dc3afcce68ab3f5109734d6309d07a53116d43dba086ee9597af879
+MISC ChangeLog 11924 RMD160 97a8d5df7a2405191a2fb3ed68f345ef65e2e5ac SHA1 4eca96e3065722197ffad7b87e0310c6df63aba5 SHA256 9127c9158cef88cdfc986e495168031f576794597cbda72ba35fa54a6e7fdbcc
 MISC metadata.xml 1003 RMD160 12fa19220fd58eade62c7aafc6a3c2bf5adb6ca5 SHA1 8be789b19b3140dc24694d5c535a7d8a4e8c4b0a SHA256 48f0e1b14cf9bd31f53f6bb481570ec1f067308e067913edbcea50a986b875bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPlmuMAAoJEPATRTHh2/q17mwIAImtSWJphQIv9F4uYA5vT8W4
-Q9KWGztBvrhKe/afqeiTOPIZMqFgvqRErTVHoiyksVZetaDdskobxB1Dp4NeBbTf
-P0qkqKaWYRxochvntH+54ptA5PsrihaeDtA8Y+Ql1No3qIoTgCUJJ2QemrYegDAs
-aaIUMzo1E+swC5YNSltxF3WAwsoT/yBRYnC+eJa2IKiKwjNynuIynfU4zX5/88uf
-h7xMliSZmWhvEkeoaiyN0t6a/0ETpCs9QUuvOe0MccGXGEIzbznHuhgSjjv7l2xx
-+bKURpoTfymDE5fhGhH7NVjR9NZd8BAgBO1gw3O7dEurOxqd9GLS0xQE7B0a6ys=
-=16XV
+iQEcBAEBAgAGBQJPlnKvAAoJEPATRTHh2/q12VkH/3QrukfaNcZ0xbU4x9fTQGYg
+5waRA9uG/elVic26kjJSpZ7oMpo3oZNwzMz6yTun5QPNZn8OCxK7Shcyx7rq/KZm
+F+0CS2//Pwl3ghhdXY5o3FmSLSRvuq1ghsldrsTUlUb4/V6Fok3V2ROMvhvjl+kG
+T8STktFKlSqdlmCTdV2kqMfboCSpZjvXAosed6vVCoKUFe79gdHianxUpt8vWY4B
+cs04o/C1mk8X2H5MJa/39EiaPhYIx/SmjMZ0ccrLo9OyKOmZpcfuENTjVn8nuWL2
+XUprnv/E2QiR5WUekzIw/AFZQ38U30AN0FXZstbPXx3xwdXq3ZkR7rrx7wMqM7k=
+=vzZ5
 -----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
new file mode 100644
index 000000000000..91879509d2b3
--- /dev/null
+++ b/net-mail/notmuch/files/0.10.2-build-with-gmime-2.4-only.patch
@@ -0,0 +1,12 @@
+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.11.1-build-with-gmime-2.4-only.patch b/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch
new file mode 100644
index 000000000000..91879509d2b3
--- /dev/null
+++ b/net-mail/notmuch/files/0.11.1-build-with-gmime-2.4-only.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..87fdabfbf322
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2012 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.1 2012/04/24 09:30:17 aidecoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+
+inherit elisp-common pax-utils distutils
+inherit autotools-utils
+
+DESCRIPTION="The mail indexer"
+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 python test vim zsh-completion"
+
+CDEPEND="
+	>=dev-libs/glib-2.22
+	dev-libs/gmime:2.4
+	dev-libs/xapian
+	doc? ( python? ( dev-python/sphinx ) )
+	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}
+	dev-util/pkgconfig
+	test? ( app-misc/dtach sys-devel/gdb )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	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}_build/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() {
+	autotools-utils_src_prepare
+	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)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	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() {
+	autotools-utils_src_install
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	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
new file mode 100644
index 000000000000..a702db9198c7
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2012 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.1 2012/04/24 09:30:17 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="The mail indexer"
+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
+	doc? ( python? ( dev-python/sphinx ) )
+	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}
+	dev-util/pkgconfig
+	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 )
+	"
+
+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() {
+	epatch "${FILESDIR}/${PV}-build-with-gmime-2.4-only.patch"
+
+	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
+}