Put bash-completion file into correct location.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

5 files changed, 21 insertions, 13 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 5fa7d7465375..caaa3e0b3a49 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.109 2014/11/30 11:36:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.110 2014/12/02 15:09:02 aidecoe Exp $
+
+  02 Dec 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  notmuch-0.16-r1.ebuild, notmuch-0.17.ebuild, notmuch-0.18.2.ebuild,
+  notmuch-0.19.ebuild:
+  Put bash-completion file into correct location.
 
 *notmuch-0.19 (30 Nov 2014)
 
diff --git a/net-mail/notmuch/notmuch-0.16-r1.ebuild b/net-mail/notmuch/notmuch-0.16-r1.ebuild
index 37ddea5b54e1..e7f69fc2c863 100644
--- a/net-mail/notmuch/notmuch-0.16-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.16-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16-r1.ebuild,v 1.9 2014/09/18 19:47:19 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16-r1.ebuild,v 1.10 2014/12/02 15:09:02 aidecoe Exp $
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit elisp-common eutils pax-utils distutils-r1
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="http://notmuchmail.org/"
@@ -85,7 +85,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bashcompletiondir="${EPREFIX}/usr/share/bash-completion"
+		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6
diff --git a/net-mail/notmuch/notmuch-0.17.ebuild b/net-mail/notmuch/notmuch-0.17.ebuild
index ae15b39aa2cd..1aa8ae9b6ce8 100644
--- a/net-mail/notmuch/notmuch-0.17.ebuild
+++ b/net-mail/notmuch/notmuch-0.17.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.17.ebuild,v 1.9 2014/09/18 19:47:19 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.17.ebuild,v 1.10 2014/12/02 15:09:02 aidecoe Exp $
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit elisp-common eutils pax-utils distutils-r1 toolchain-funcs
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 \
+	toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="http://notmuchmail.org/"
@@ -82,7 +83,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bashcompletiondir="${EPREFIX}/usr/share/bash-completion"
+		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6
diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
index de9dab46d8b7..2dcb0f043c1b 100644
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.2.ebuild,v 1.3 2014/11/28 13:56:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.2.ebuild,v 1.4 2014/12/02 15:09:02 aidecoe Exp $
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
-inherit elisp-common eutils pax-utils distutils-r1 toolchain-funcs
+inherit bash-completion-r1 elisp-common eutils pax-utils distutils-r1 \
+	toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="http://notmuchmail.org/"
@@ -95,7 +96,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bashcompletiondir="${EPREFIX}/usr/share/bash-completion"
+		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6
diff --git a/net-mail/notmuch/notmuch-0.19.ebuild b/net-mail/notmuch/notmuch-0.19.ebuild
index 8b15a9328a01..4ec67ff347da 100644
--- a/net-mail/notmuch/notmuch-0.19.ebuild
+++ b/net-mail/notmuch/notmuch-0.19.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.19.ebuild,v 1.1 2014/11/30 11:36:51 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.19.ebuild,v 1.2 2014/12/02 15:09:02 aidecoe Exp $
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
-inherit elisp-common eutils flag-o-matic pax-utils distutils-r1 toolchain-funcs
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="http://notmuchmail.org/"
@@ -105,7 +106,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--bashcompletiondir="${EPREFIX}/usr/share/bash-completion"
+		--bashcompletiondir="$(get_bashcompdir)"
 		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
 		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
 		--with-gmime-version=2.6