app-text/notmuch-0.9: Fixed emacs support and more.

Checking emacs version in pkg_setup(), not in pkg_pretend().  Paths in
src_install() were prefixed with ${ROOT} and emacs files were put into ${PN}
subdirectory.  Better descriptions for vim and emacs flags in metadata.xml.

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

4 files changed, 24 insertions, 17 deletions

diff --git a/app-text/notmuch/ChangeLog b/app-text/notmuch/ChangeLog
index 6033206cd7d7..70a49fc0643a 100644
--- a/app-text/notmuch/ChangeLog
+++ b/app-text/notmuch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/notmuch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/ChangeLog,v 1.1 2011/10/24 00:03:22 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/ChangeLog,v 1.2 2011/10/24 12:17:18 aidecoe Exp $
+
+  24 Oct 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.9.ebuild,
+  metadata.xml:
+  Checking emacs version in pkg_setup(), not in pkg_pretend().  Paths in
+  src_install() were prefixed with ${ROOT} and emacs files were put into ${PN}
+  subdirectory.  Better descriptions for vim and emacs flags in metadata.xml.
 
 *notmuch-0.9 (23 Oct 2011)
 
diff --git a/app-text/notmuch/Manifest b/app-text/notmuch/Manifest
index cce88f9e4eb2..e7eade623b8e 100644
--- a/app-text/notmuch/Manifest
+++ b/app-text/notmuch/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX 0.9-fix-lib-makefile-local.patch 1897 RMD160 a5cb4d7fdb0a47e19cd5c73894400c90b470b897 SHA1 929983d5551d90393552f45e3fad4d197941468c SHA256 ce2a844ac18b3ef1059c44998e521df0594824383742a7e2d12069d9a45621e9
 DIST notmuch-0.9.tar.gz 398868 RMD160 b956ceb629943bfa65c1c6fab6b10dc78639588b SHA1 988e93545880e9465380383f00d591d8a23c61dd SHA256 e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4
-EBUILD notmuch-0.9.ebuild 1321 RMD160 bdd8e3ce2b5a047796fa207fe1e709148031b4c7 SHA1 5649749f137c4fee8173aa304609f3abb9572f77 SHA256 bfc8f56dac2c1abacbf95c97dd0ca34ac952c264e6934f8846e5c614e2bad0f9
-MISC ChangeLog 426 RMD160 3d0480407a94316dccc44d7c37bf5f7e93a45901 SHA1 af2e579b7b078db28b38c941de1f58e7be765fb7 SHA256 dfef8401f6374a4f69cad88c30d3e54f171f282ece4557cddf69f3fdb407aaea
-MISC metadata.xml 627 RMD160 f2cc57d77e2c7bfd188e7883d3966a3f1a0ca441 SHA1 09143e8aa79e0e17142a74b3d1a200a53e67b2ba SHA256 d868e95af15996458f4e28c1694e93357d51054883435b7874984e910ed38147
+EBUILD notmuch-0.9.ebuild 1396 RMD160 4054be9be4bab7b7c117d6ae584cd5d694406a8a SHA1 9d2d56295bab1bef72255038afb20250e1b57242 SHA256 4cad1cc079fdbce0907f6899f010069ecde1049ba62289892bccedcdf57e2b33
+MISC ChangeLog 750 RMD160 312cc820bcef3349e1a107ef75065468ab0b52ac SHA1 774dabb1552d7c4501910b71a87a23d254ea316c SHA256 b515423fabcbd96cf492ec24aad45453dcee51725121fd3b6b21728692a434f5
+MISC metadata.xml 680 RMD160 9a11badec2b61f6979c22c0697810e38b4d9b29e SHA1 e1155327fffd111080a11c217b2017ba9fef570d SHA256 1994e7631102e70bc89b2cee9cc662e60ea8bd3c021fa02581677ee8a7cc7b2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOpKtQAAoJEPATRTHh2/q1EHIH/iHDHlXbapRYDHRFVhXz0weH
-j8e84XeUzh9kF+a+EsoqLMXZ2dW8MknbFS/rxCTbh/O+juIsmyVwgdsDm8hZPb7b
-qGnZyLuGc3JxRvsuS6thpC2xQYuv9dB6Jxr6V1G3oSeJEDqSsUjS8ZAjkjOXsgGi
-PmGAxO6L1sqyKlhobQgmZ04t2ggTaIK7FPmLt1zVRRKtDSUdsniRHDyo3J/M/zeW
-GrN6GlsH9g5vum8X8SzOjpE7PBuhzRvZE13LpwiX1rTifFPgu2ykOD53+9trWqKr
-pFEzpr/oj9xe0WN+vJp5JbyPfUK95dE5bCnBQoEtq+NE6QEegbHusmxrXj4bSfk=
-=XkK0
+iQEcBAEBAgAGBQJOpVdTAAoJEPATRTHh2/q1WiYH/0u7Nqky5dunjpdUEZYQ22s5
++xP8ZqBXdr0zBd2Hz8rqv0ciQmj0n4SHs/jjzHy/hgNsmrJwRmndu/KdpYGvtFw7
+l0tmWuiyMbygVIshga4aGWU4bkU79G6pMveQyIrDcNCf/naAN5p2AUHhVArgXb4j
+Tu9JxiQF4ZkdOte5fxArB03L3vRNubgsVSw+5FqgSK57khW8SI9k73TtVzCLX0S3
+rIqQmOLi5vwSeINNJrV1YDBl3SmCDih9TvwUtMkgVaXH1bZuVVMM/xAC7dOuCShr
+V82DG3fWOuMgbZBDkRJimIwTB3dQycf/+vAzgneMkp1raqk5v59xoLzunheV/9U=
+=VhGD
 -----END PGP SIGNATURE-----
diff --git a/app-text/notmuch/metadata.xml b/app-text/notmuch/metadata.xml
index 407c40db8d8a..a062b2ac438a 100644
--- a/app-text/notmuch/metadata.xml
+++ b/app-text/notmuch/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Amadeusz Żołnowski</name>
 	</maintainer>
 	<use>
-		<flag name="vim">Install Vim script which allows reading notmuch mail
-			through Vim</flag>
+		<flag name="emacs">Install Notmuch client for Emacs (main client)</flag>
+		<flag name="vim">Install Notmuch client for Vim (experimental)</flag>
 	</use>
 	<longdescription lang="en">
 		Notmuch is a system for indexing, searching, reading, and tagging large
diff --git a/app-text/notmuch/notmuch-0.9.ebuild b/app-text/notmuch/notmuch-0.9.ebuild
index 88937c192345..78e892600eee 100644
--- a/app-text/notmuch/notmuch-0.9.ebuild
+++ b/app-text/notmuch/notmuch-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/notmuch-0.9.ebuild,v 1.1 2011/10/24 00:03:22 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/notmuch-0.9.ebuild,v 1.2 2011/10/24 12:17:18 aidecoe Exp $
 
 EAPI=4
 
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 DOCS=( AUTHORS NEWS README TODO )
 PATCHES=( "${FILESDIR}/${PV}-fix-lib-makefile-local.patch" )
 
-pkg_pretend() {
+pkg_setup() {
 	if use emacs; then
 		elisp-need-emacs 23 || die "Emacs version too low"
 	fi
@@ -39,8 +39,9 @@ pkg_pretend() {
 
 src_configure() {
 	local myeconfargs=(
-		--bashcompletiondir=/usr/share/bash-completion
-		--zshcompletiondir=/usr/share/zsh/site-functions
+		--bashcompletiondir="${ROOT}/usr/share/bash-completion"
+		--emacslispdir="${ROOT}/usr/share/emacs/site-lisp/${PN}"
+		--zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
 		$(use_with bash-completion)
 		$(use_with emacs)
 		$(use_with zsh-completion)