respect bashcompdir (bug 477384)

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 25 insertions, 27 deletions

diff --git a/net-misc/mosh/ChangeLog b/net-misc/mosh/ChangeLog
index 5a7bc554de23..38dd9ad4feb6 100644
--- a/net-misc/mosh/ChangeLog
+++ b/net-misc/mosh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mosh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.43 2013/06/11 09:40:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/ChangeLog,v 1.44 2013/07/20 13:08:24 xmw Exp $
+
+  20 Jul 2013; Michael Weber <xmw@gentoo.org> mosh-1.2.4.ebuild,
+  mosh-9999.ebuild:
+  respect bashcompdir (bug 477384)
 
   11 Jun 2013; Michael Weber <xmw@gentoo.org> -mosh-1.2.2.ebuild,
   -mosh-1.2.3.95_rc1.ebuild, -mosh-1.2.3.ebuild:
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 936c04433cfb..73fbebdf12a2 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST mosh-1.2.4.tar.gz 283047 SHA256 e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46 SHA512 f7505faffdc8da734179b37339b554f83cbf5450b251cd2aa50d63cd6e4cbefa0da17a1c1b2a61858735ac9e5cee5841ed20e81e244380f5f9a02af1b87199cc WHIRLPOOL b7fe6c87deb139faa4c6542b8de8bb8356e00889a8fc5a9a4d9609312f1654720eda0bdf9db97f48ccf6f15e6b4b2cd9c8d5105e84177a7ce0d3d36923a15e34
-EBUILD mosh-1.2.4.ebuild 1457 SHA256 834599398bc89dfcee52c3608b06476180b25edaeec202272daebd9665ac4051 SHA512 f9ec4508b1de241a46c096acfbd4744212a77d11132e6dc2708ce75ba45a6ff8bc2cdb6b6e5402d6197c89bdc6f2327a6d964c3c4b6f996ad0d6a30a4f2472b4 WHIRLPOOL 0392a65f8763fb5d41e8acb6e52b40a2eafbc4796911f90a717dca4dbdf36dad31a7b6cab950f46382a46e19efc7a873485f7aee4cc3e9a10525f8da734e4232
-EBUILD mosh-9999.ebuild 1437 SHA256 136391dc404830b64751331b67f9196468dbd2f3c4ce5b0bcc19d5f287155568 SHA512 7d732d4f9dd90406406b97cc3729ca790f47b90cbca7ed0cf3abbe44dd0beb07859310a5284ede1de0e24aa9cf1050485c6405c5e9177fd32f4f2e95ef6a84a4 WHIRLPOOL a79e95905cbfe6388d9e4ad4508674fcab82657b94ffdf48f03989156ece75cce9f468cb23ea151496954ee62018d9905992d561f06a17c39e7b022e110d547c
-MISC ChangeLog 5944 SHA256 461ae19a3932b9a8f80798a5d3f1c39e7fdd87caa59bffa43ab558f49c98c04c SHA512 ea9bdb00d9a284dd538c732ed50da62412a47b2d7dc3006c785d1350dffcfc7a77fa692e297cc868a9532bb7c51779d3f7fec3f156d5cf10c7774ae70c1ab9e9 WHIRLPOOL 15420ac316dfe27815133638ef2c2ab3254585fa196841f16e9f9c5af8f2812befab4e54ab627f917afbabdea785c640623ac51e0c31080e8c4c691ddcbadd62
+EBUILD mosh-1.2.4.ebuild 1340 SHA256 044f48f372c5281070f13178a3b2f7c20857620fb522210cf22ec445caa0c4b2 SHA512 2e0c678dd3155b131dcd7cc506d00dd7d5ff8d90a5574685d43abd441c86742ad99f257bf530e8835eebd3996404182c2ec65e2a02972a40175679cecb6f760d WHIRLPOOL 1298c164aa1d3bdc9927bd1e83473108285cdaf211200382849736e8cad8bf94f9bd3b4c2904cdf0e099c4d180971d5f8c5c6f90c6c0ba5602669ec9504c7a60
+EBUILD mosh-9999.ebuild 1320 SHA256 ded9d53a15fc956ba7807df1c77899ad8a0ca41801685d04c83933946bf34a06 SHA512 a73583e7e4b9177393d2c2ce10cae1c74f5ff8688d6d5250e04c70cf4c20f06701f7455f02619a55abc37fdc738f0df231b684aec15338f9698bb11154cedb6b WHIRLPOOL 317f611016c3fadb6a2d2b2c80a6961a387cc8674b4893643a873c04548fd2e387b6d20b955c64f488808c3c8595f0e30bc875b17cea6106d82815ffd0d21757
+MISC ChangeLog 6065 SHA256 3cd87850f29e81b0ee58f373523bfa495b157d685652d0979e666d4971d68e9b SHA512 9b94b1edb4ab1e11bcf4ead159cb64e7d39d9e8f0ea9160b4c84e663154844a46d143dc3988809966beba2bd16c4adf25379bf5608de44cc5f1b8fb32cf38b13 WHIRLPOOL d875152f4bd8c9b7873f1a0a89cbe24275873fd18f52577d0cef3bc29d18b68c945f3f060569a50ab8d126c16e75d3b93e452151bbe36987a6f13a2e6f85c2ed
 MISC metadata.xml 1018 SHA256 72eee63d90ac2cf1a0386ee16edfb7c3e68d715805004bbe7f72f1a473a1a9dc SHA512 f4847f2e51210dd228202e0c239bde2444e3424b084aa951c624615ee9f7c69f85f2531f2b9f67d678b4e67627f1ca122e7be22f311c8a42241e0cc514ce7bbc WHIRLPOOL e9c52160fe158dc5a8f0c173d69893c4701bfc9488035a53a22cf1bf516e9c3d433015bb46048240b7aa7518eb26f71aafd1b56550193a0dcc998ec89ca9175a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG28IUACgkQknrdDGLu8JDEcQD+M0v9k3WpD05yhP4FH0Se9qvX
-PNHu1Iza2MR1GCiP7K4A/R9kpaGBDd/HhXEjDawDYDeBSYazdEom3zZdubCGww5J
-=7dGl
+iF4EAREIAAYFAlHqi9IACgkQknrdDGLu8JB5dgEAmjfu6oVCIBTcULI3bxSeJXtG
+ppiMQZPHey9EpXM/+iUA/RTPbACAtIgLdJBaf3f7FarED+jQxpjcZWKOL/wS+qjr
+=24Zr
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mosh/mosh-1.2.4.ebuild b/net-misc/mosh/mosh-1.2.4.ebuild
index 12bcb26513ca..a3c756e07c59 100644
--- a/net-misc/mosh/mosh-1.2.4.ebuild
+++ b/net-misc/mosh/mosh-1.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.4.ebuild,v 1.4 2013/05/20 12:42:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.4.ebuild,v 1.5 2013/07/20 13:08:23 xmw Exp $
 
 EAPI=4
 
-inherit autotools vcs-snapshot
+inherit autotools bash-completion-r1 vcs-snapshot
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
@@ -13,7 +13,7 @@ SRC_URI="http://mosh.mit.edu/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc x86 ~arm-linux ~x86-linux"
-IUSE="bash-completion +client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -32,7 +32,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable bash-completion completion) \
+		--disable-completion \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \
@@ -53,9 +53,6 @@ src_install() {
 		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
 	done
 
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		doins "${ED}"/etc/bash_completion.d/mosh
-		rm -rf "${ED}"/etc/bash_completion.d
-	fi
+	# bug 477384
+	dobashcomp conf/bash_completion.d/mosh
 }
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index e5fb6220dc9c..ae06a7a3292b 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.13 2013/03/13 19:19:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.14 2013/07/20 13:08:23 xmw Exp $
 
-EAPI=4
-EGIT_REPO_URI="https://github.com/keithw/mosh.git"
+EAPI=5
 
-inherit autotools git-2
+inherit autotools bash-completion-r1 git-2
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
+EGIT_REPO_URI="https://github.com/keithw/mosh.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="bash-completion +client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -33,7 +33,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable bash-completion completion) \
+		--disable-completion \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \
@@ -54,9 +54,6 @@ src_install() {
 		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
 	done
 
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		doins "${ED}"/etc/bash_completion.d/mosh
-		rm -rf "${ED}"/etc/bash_completion.d
-	fi
+	# bug 477384
+	dobashcomp conf/bash_completion.d/mosh
 }