4 files changed, 13 insertions, 306 deletions
diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index e5907bc73631..2ab2bc41a8c5 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2012/02/23 11:13:15 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.25 2012/02/28 15:13:27 aidecoe Exp $
+
+  28 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -notmuch-0.11.ebuild,
+  -notmuch-0.11.1.ebuild:
+  Removed old 0.11.* versions.
 
   23 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.10.2.ebuild,
   notmuch-0.11.ebuild, notmuch-0.11.1.ebuild, notmuch-0.11.1-r1.ebuild:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3f69f47b201d..0aee243fbb67 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -5,21 +5,18 @@ AUX 0.10.2-fix-test-build.patch 3709 RMD160 3f63fbb83bed50f7a011778a46f4404e63bc
 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.11.tar.gz 438168 RMD160 184ba8a7589d499ae18b8ec61c1cc05c1b1b2d1e SHA1 11eb1d967af089ed36f6816f61ebae308bc19339 SHA256 ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0
 EBUILD notmuch-0.10.2.ebuild 3212 RMD160 d4fc79fbad0dbc8deb79b277e0c722e9159c48c6 SHA1 db45226c70c982a7d547c919c2e93ecc40e76b0d SHA256 fa5c740adebea22fe4126f833dad8e5bca57a9dc0397f15509e8c592b332b30f
 EBUILD notmuch-0.11.1-r1.ebuild 3195 RMD160 80439ffc99a182cf6d6d88b11d34269a5b8aaee9 SHA1 58dbddc5702410b8ace1676e9d945e69834cefe8 SHA256 622b65301b3610a0cdd647a868f695e0a66f885db681ff9010ba455dffdc1894
-EBUILD notmuch-0.11.1.ebuild 3068 RMD160 a885bc8a364e67fcc0902dd1f59479d5cb3c1d50 SHA1 a3c1df9f2a37e6f08e1ee789c04e84eea3aeed6d SHA256 04e0f5d0eee5ce795dbf7caa05796ad8f8bb79b79607366b18cd721d8f4cf75c
-EBUILD notmuch-0.11.ebuild 3064 RMD160 1f60ad0224e3cd9b09f7b49f0ba584417944595d SHA1 a63996e43f73516a5001ba6258cb7cdb8ff7cf0d SHA256 6dd4d870c7e876108e4a8e321a03a338230003333849cf830028e7ab6673ee0a
-MISC ChangeLog 6377 RMD160 ff8be47c669c77b2b99f5c30fb53e69b8010d8e2 SHA1 e2c4d7c9b72f10f089e4d6389c10a345715e3d5f SHA256 a8aa5dd62ada85a111c7b93bd660a0a9a95d9395a2f4d0ecd065885aab63496b
+MISC ChangeLog 6514 RMD160 78567ee6c8390625c84d07951dc407cd0ecf1bdd SHA1 d291d6a6f8928e0f14ac1bf546fe17a8bf1dd79e SHA256 06728793955f759f7d56a1fbb4bc9bb95a954a679a83705b60f0b697c5815eb8
 MISC metadata.xml 1003 RMD160 12fa19220fd58eade62c7aafc6a3c2bf5adb6ca5 SHA1 8be789b19b3140dc24694d5c535a7d8a4e8c4b0a SHA256 48f0e1b14cf9bd31f53f6bb481570ec1f067308e067913edbcea50a986b875bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPRh9QAAoJEPATRTHh2/q1owcH/jAa8de9hPevk1th/u8Bpnf2
-5Y8kXKBtNYE9jlEZTCoj480Fjz0oorYbZPNE1TP2mSg7BFJ3+9PvcvVuCE3Qjp0w
-QxdWI+kgW3MbmiQGCEpIuxPyeABUvhUcipj4toXjE4FMF0BscUcHzRbzhGKFJaPK
-XeISQr4CM38UurnO9kdH2ugA3LdYjxHnsQVO+nJL3Z2qyGiDs3X5INkKj4PSuT0l
-sTvjq8+qlcEAbi0Olo3Ssb1dK4xs+p8SZrO0atv8kl6ykuSdnYc6TXUewsz4hqFq
-oNU/KGx5bGilWZDpoecP3ctgDFTuBGMb+79o1sy+w4bB7fQABvrTtQqeJP9qKek=
-=UI7/
+iQEcBAEBAgAGBQJPTO8aAAoJEPATRTHh2/q1tPAH/1WI5pOYyQPF69W/m8LpjZ6F
+fAeM2QbALXHw1KewniVKhcr24b3suB9ZdmZJu838g/IcrjcRaVI7AbnAYX6VXdM3
+K++rfu3raYfa7EiNLXqWyS1oMsaRLM+4GKfhbzWQNE7Q7J1LLL+yqRlZNocMDj5x
+q3QgnAKihsdy/vUUwRNNpTa2MPlvx/8TiB3I7tuV6WtsJCU4zhiFH8ZN9Jvx7mNS
+COr089dAB2wVsBjIU9vDV38Q4L7EcwwOjfc9SFY0p69kfxWMsmZsFKwSFCB77W9S
+1yFaG7k908JP9c4ib5YItfGs9y2IdX5NFdLTDVRn3Cf284Gr74K59hKevPFTJMU=
+=O7hi
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.11.1.ebuild b/net-mail/notmuch/notmuch-0.11.1.ebuild
deleted file mode 100644
index 559583bc422e..000000000000
--- a/net-mail/notmuch/notmuch-0.11.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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.ebuild,v 1.2 2012/02/23 11:13:15 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-RUBY="/usr/bin/ruby18"
-RDOC="/usr/bin/rdoc18"
-
-inherit elisp-common 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 )"
-IUSE="bash-completion crypt debug doc emacs python ruby test vim zsh-completion"
-
-CDEPEND="
-	>=dev-libs/glib-2.14
-	dev-libs/gmime:2.4
-	dev-libs/xapian
-	doc? ( python? ( dev-python/sphinx ) )
-	sys-libs/talloc
-	debug? ( dev-util/valgrind )
-	emacs? ( >=virtual/emacs-23 )
-	ruby? ( dev-lang/ruby:1.8 )
-	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 )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-
-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() {
-	default
-	bindings python distutils_src_prepare
-
-	r_fix() {
-		local pattern="\(find_library('notmuch', '[^']*', '\)\([^']*\)\(')\)"
-		local replace="\1${WORKDIR}/${PF}_build/lib\3"
-
-		sed -i "s|$pattern|$replace|" extconf.rb || die
-	}
-	bindings ruby r_fix
-}
-
-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
-
-	r_make() {
-		${RUBY} extconf.rb || die
-		emake
-	}
-	bindings ruby r_make
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			mv html ../python || die
-			popd || die
-		}
-
-		rdocs() {
-			${RDOC} --main 'Notmuch' --title 'Notmuch Ruby API' --op ruby *.c
-		}
-
-		LD_LIBRARY_PATH="${WORKDIR}/${PF}_build/lib" bindings python pydocs
-		bindings ruby rdocs
-	fi
-}
-
-src_install() {
-	default
-
-	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
-	bindings ruby emake DESTDIR="'${D}'" install
-
-	if use doc; then
-		bindings python dohtml -r python
-		bindings ruby dohtml -r ruby
-	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.ebuild b/net-mail/notmuch/notmuch-0.11.ebuild
deleted file mode 100644
index c4eb86511f19..000000000000
--- a/net-mail/notmuch/notmuch-0.11.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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.ebuild,v 1.2 2012/02/23 11:13:15 aidecoe Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-RUBY="/usr/bin/ruby18"
-RDOC="/usr/bin/rdoc18"
-
-inherit elisp-common 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 )"
-IUSE="bash-completion crypt debug doc emacs python ruby test vim zsh-completion"
-
-CDEPEND="
-	>=dev-libs/glib-2.14
-	dev-libs/gmime:2.4
-	dev-libs/xapian
-	doc? ( python? ( dev-python/sphinx ) )
-	sys-libs/talloc
-	debug? ( dev-util/valgrind )
-	emacs? ( >=virtual/emacs-23 )
-	ruby? ( dev-lang/ruby:1.8 )
-	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 )
-	"
-
-DOCS=( AUTHORS NEWS README )
-SITEFILE="50${PN}-gentoo.el"
-
-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() {
-	default
-	bindings python distutils_src_prepare
-
-	r_fix() {
-		local pattern="\(find_library('notmuch', '[^']*', '\)\([^']*\)\(')\)"
-		local replace="\1${WORKDIR}/${PF}_build/lib\3"
-
-		sed -i "s|$pattern|$replace|" extconf.rb || die
-	}
-	bindings ruby r_fix
-}
-
-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
-
-	r_make() {
-		${RUBY} extconf.rb || die
-		emake
-	}
-	bindings ruby r_make
-
-	if use doc; then
-		pydocs() {
-			pushd docs || die
-			emake html
-			mv html ../python || die
-			popd || die
-		}
-
-		rdocs() {
-			${RDOC} --main 'Notmuch' --title 'Notmuch Ruby API' --op ruby *.c
-		}
-
-		LD_LIBRARY_PATH="${WORKDIR}/${PF}_build/lib" bindings python pydocs
-		bindings ruby rdocs
-	fi
-}
-
-src_install() {
-	default
-
-	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
-	bindings ruby emake DESTDIR="'${D}'" install
-
-	if use doc; then
-		bindings python dohtml -r python
-		bindings ruby dohtml -r ruby
-	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
-}