Put bash-completion file into correct location.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

6 files changed, 33 insertions, 25 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/Manifest b/net-mail/notmuch/Manifest
index 35e3bf43bbed..fb1bf6601f0f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -8,20 +8,20 @@ DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886
 DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95 SHA512 cb649aceba1a3e25d4cff51f212aa85d0efe9907af4bcb9390cd1cf5e29c48d4145d9ecd1b040eaef588c63bfb5296bdfef683c22872841b5631481f5d832c03 WHIRLPOOL 98d4a5c5b72ac6d237b2c77d80481dcaa43be87c4bcd0a53aa55e4d008c70a88738706b92a169fa8b12681cb6e169162d0bfc01a5fbce95d73dccf5c12b267c4
 DIST notmuch-0.18.2.tar.gz 635438 SHA256 e99f7bfee1250aa9f23e05d926ec278316fb8dd135262b0e24f4ba1a78febc9c SHA512 f6c7c9f17b1a7560bae8d3c7023be2fa6661a1dee5d69a6449a7b7c4468730b6917a857f015b67f09e18801e084a4c65a24a01603683e0ed12fc24b9feb9250e WHIRLPOOL 40191e7078088b45deda2ab2d61a3e2448c61e63b69dd725a88ff68cfaedf68a6270f2d9171ef6a8cb475c4faefd9d84b899f7239953b53aebceede79a76199c
 DIST notmuch-0.19.tar.gz 659038 SHA256 396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb SHA512 41eba85d2e6f89693f53d607abdef837973204e709f2c7385e64507a19b316913851f17b3b6dc93d8a622c72756b3e696aad8189570a563df38994cf346791a5 WHIRLPOOL 380d2508f106fc08b31f7928d63587cfc7ed63835a0cde287d7ba09d3f6814070c789aad1d0bf6a3bab387273b2d37a8c783d939c2f4afa475b9785f2618a25a
-EBUILD notmuch-0.16-r1.ebuild 4052 SHA256 a8c36b4ef4bb165f4d878439b0cd3e11d676b8a3a7a8232c16604efcb0cfc206 SHA512 a19d9d9d23d00af2c45eb1939508a2748022fe02fe52513c8bb384fb5cfa11b8b4a123af4a7b163fee9896f1a963cd92cf07531ff4fe08313c719e048d1ae660 WHIRLPOOL 856583e3a51457549c96925cc6980aa4e180a07b20333d6b2239ecea9142f848f68afff3760ba2e8adc82205185c2e29f2d1924d24b61470735e4c079b682522
-EBUILD notmuch-0.17.ebuild 3685 SHA256 25ac83e2fc0145393b79a58197b37e2610d6b2b30ea67bdc84fd20964f5bb59b SHA512 5095742bbc1f4dbd758eb84bd0de515d65eff67c80613d7c16eb5f9a8419c3f24a948020987204b355d869d787fec8291cdaa6226e401b8fa010d55196fa9a57 WHIRLPOOL 91d14a975408e53e180c008410ad58d3ebd28cf577838a576d6617ce90a789126652f62dacf19b12b4de029856f02a86c3aeb9428b1f7c1fa30399093e383802
-EBUILD notmuch-0.18.2.ebuild 4044 SHA256 71be486350e17bb560696d56e3236bf8e0aa729ca0e7993ebd40822b26ac3c38 SHA512 6ff4448c93b3d2bbc65a8c9f95973ef21966cfe15f37b8231b7bb21fe8713a0d4ab9e86173e5f671d9bbedba11bb6d2df06bb7e4cd4c483c75f7379812f54325 WHIRLPOOL f84aa79543ec304b275185569a977bcaf441b289ea27014e3897850daa0feb4488fb138df890be1ab0096f74b6f1a37131535c2f8f3eab61e242fe54fb72268b
-EBUILD notmuch-0.19.ebuild 4248 SHA256 b19636a96dda147d9a9e69be3bb8cad4cec6eb661737be42b15cad2734d62b49 SHA512 5601eb33f42bad75be7dbe7b48a3bf2c039266eb659dd4f7b72d7b603172e2dbd19c909fd426a1834df324b0bf12693bd63579bd42b2131f8f9359772f671012 WHIRLPOOL fa246d31f4ecd2440c7dcc10a7ccca498b95e64c49fa6347f667c2c682ad2c127362ca581ac98e5129ee4010ad1bb50079f7f08a910fb2ecde04328143a6c655
-MISC ChangeLog 32805 SHA256 08650b94119ec40865c8e6bf45796a53fb605f29baf5fee8ecf2d4d5a2b25f57 SHA512 e6e6156c131220e62ec666e156af4bb4715886434eb8f1204dc826d0e792997a252ab9b071206e1641d49058a07957a3e0bad11a47a65449e6c8742264c09219 WHIRLPOOL fb4f4ac4c9a5ee3545581be2e67e6478c28f2cb350aa968e0f8197b4e52da12834b05f0cb7bd41cc0fca3e2353f3378fb53451e1813838e8902134243b9f5aa7
+EBUILD notmuch-0.16-r1.ebuild 4054 SHA256 bf8e78cbcfe57c2b2f4f4cad2018f26b5b8a088bb7c1e0b6a5bb57997492b811 SHA512 e4619d7ac96703fb04c04e1177ddad255aecc3f412ce22678062deb72da6f9d1f37cb8a0c31e66d5e06af1544f547a25b5b513f355395f22cf2d5d7eb76ccfac WHIRLPOOL c27d4abfc0dbef3841facda73ae9417a7d1a52023cfe52b8503de48e59fe622e6436e9edf3dc488b456e4701548c9a2c190863cccb44f1cc9d5ba6053a23121f
+EBUILD notmuch-0.17.ebuild 3690 SHA256 526b90d9b8126e28da8c2437f1967d65f5a71985cc6fbcb559fe7e757a373024 SHA512 52786bfc95cbe7854697966ec52f1a4416e062651200b3f5d6a16d4c15387499a3ae855e5b2d8751ef725772ce457d7ee7a86873d589ab7e8b110e6bbba92a52 WHIRLPOOL b8ea7195a53cdcbe31d1a2139a9d6684b597ea6d7506797329c834e2a215249f038016ac0e34319e5e033cd15c02807759b39c9c72a278af7f531d91d11eee55
+EBUILD notmuch-0.18.2.ebuild 4050 SHA256 326436d58414462e74c8a90cd254dc3541094acdcf62c2205140fcd814d739dd SHA512 5c3e3b1f2e45c355f3db93d05063d125c066d092771390dc690765f14779fbfe9899878deaf04f41924e966068196b32b037b2b67cba38b7c340aca2cd9287ae WHIRLPOOL ef1d38d043d8433da4dee325ad87802e9df54d091dd93d3183119a3b3a7a5a0b37561c1002b6a05c0ec1c9449f54a73766f62dfc93a60d1e61fc55ff4a14b8e1
+EBUILD notmuch-0.19.ebuild 4252 SHA256 de9c0b8bda7ff9701520722772125bc090844f7584ac4f590b7a2094833cbad8 SHA512 b3090ecdcf73b0856e1147128573bbd0c0e5e47a78333b87ce613e58b9df2f5a1f225a65ea4814715fde798a6cd296bd1731c3b6dfe04a723d89d5d7c37706ae WHIRLPOOL d150f7c71acb103d4dd567013e90c3404e99bcbfe55102b3891114a341021c990a9a33181b1ceffd2711ece95580979a30f2bab215b48aa967decf1753c4d58e
+MISC ChangeLog 33006 SHA256 5bcd08c5461cd8d606f48f28405a442f695c81d48a213f4deaecbf5be7dde927 SHA512 926fa5fc345d0d36ffa1255f859b500487e46c5ae2de2dc52ee40333f57b8e253a5941562d6ee806c646e6ce3f69fd174342ad9577fe9d3dfbeac42c259e63e6 WHIRLPOOL e1e2b99e2b8d7cd1a4cd7dafbbbaa218937cd0e01ab2a1f45a8ed80e590471b2bb2c0f864245cb9e1281be90a370e6bd552fa2dd01fb65d226b5537d93de0a36
 MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUewFUAAoJEPATRTHh2/q1h2AH/2OigtWub1kofhmks2+H0HnM
-63PIA6Qwy+vpJVD6tZtGLcpWee7q1u1FhniN83d00JJa+SRbwiO1QuuksX78lacB
-yN88pBIe9xFD+NUqJ9f/vOYdt77t8zDdqMYUv3bPZrd1DkVNAIt7BjghNt8Gi+Z7
-6OLlYG7UtxjYrDgpKVb6eCiOkXXpEeNgk4KQpzXI2NQklRj8wcPyEoEsekNfCJdY
-4PV093HsJQSwoMKAO0tk+94W09xcpSoVtlDXoNEGJG9j7T5EpXljqABQP01RHdvC
-Tc4hH1EWAWCsiiDS++RAfqBpRksB3j85i4J4j2GdclsaBU5VRwXNsCvErEd4b+8=
-=nRtU
+iQEcBAEBCAAGBQJUfdYPAAoJEPATRTHh2/q1If4H/0Wbl8Uo/lwiEBJJXzgSNvi4
+VV85c2VZXoYEFXIqNo8VYOn6wCIPAjm3ZscWvh4RAVs3GlETsNppULhITmGEeZcw
+TSgUf1PMROhqOWaIHUPpGd5/aTR2qxTM2LYQmCUkwzztrMsrCr+H8sI5P7OdXMBp
+gRY5DVhiBBaDuDHUrg4xPy6g5RHROp9KkHzkVeHIShFRfkgckB2GSQZsMiENIr7T
+3/0+n0bHVfrIHrgyTew+/7obyTK7p3hODSazjETXeEDP8wu6m+viHE9jB+ypvPYP
+A9Gj+SHnctGA+aSWj3t1L6YGCxZQUXv4v2KyPW3Mrz++6EMXgTQ36T3D/Yvtm2g=
+=zFtB
 -----END PGP SIGNATURE-----
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