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.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

5 files changed, 311 insertions, 1 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/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
+}