Install the bash completion file to the correct location using bash-completion-r1. Remove USE=bash-completion since the file needs to be installed unconditionally.

Package-Manager: portage-2.2.11_p165/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 29 insertions, 16 deletions

diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index 4bb2959d59c3..6a27997c1b8e 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/drbd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.132 2014/07/30 19:39:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.133 2014/08/28 16:55:33 mgorny Exp $
+
+  28 Aug 2014; Michał Górny <mgorny@gentoo.org> drbd-8.4.3.ebuild:
+  Install the bash completion file to the correct location using bash-
+  completion-r1. Remove USE=bash-completion since the file needs to be installed
+  unconditionally.
 
   30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> drbd-8.3.13.ebuild:,
   Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index 65a9badeba8c..98553e3ebc08 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -26,17 +26,25 @@ EBUILD drbd-8.3.8.1-r1.ebuild 2167 SHA256 1330e081f3d54a949ea7e6827dd55c9ed7c361
 EBUILD drbd-8.3.8.1.ebuild 2077 SHA256 0df38c540790269dd245ab02738b1f1a47f712fb90868f35f693d105773ac7d5 SHA512 98741167599d130c0996b953e4dc1c623fe71f1e0c263a403ded67c982ddc93ba7f357466578845a5b5a023e897fe65d81273c8cf91370e40dc5fe1a803331be WHIRLPOOL db4a04c282c4d8dc14725f501c7dfbf67af4dcff8f4b558e262e5d2bbd41a353c6d5ccb0fbbe785796d43cc9f0b97e470892aee72c5f6c28dcd9dac20a9138e1
 EBUILD drbd-8.4.0.ebuild 2213 SHA256 28f96788c6150a204f6c2c976a92d3a5fc5e7aba54d2abbbe0773aa79736aa09 SHA512 0085f4fd4d920b0efe8728ad3726850e29a1b9a5ec7ef06a68d252b7a6870170814841192a1ead072bafada04952f90c841aa39c1fbe2d258f7beb3b7b80cf06 WHIRLPOOL 97b7d9e4a1800628668198c3a739999bb47345813f796fd41869731fa95345385980779222bcf6f78f705d71048fee3b74b0f04f93c1fa89bf4fe3668820bc0e
 EBUILD drbd-8.4.2.ebuild 2295 SHA256 721c476a5814f775cd9925bbbc038a32c7e4ff30a409d7c32258d5907e761644 SHA512 842acdf83778a4f1662fc4afc8b584a8717fc9f4bbd6d9d5a30af860d9a8f869dcb231cf3cca4d1c96cbc2662777225259860548f1e43a6727cf334a39a1a8e8 WHIRLPOOL 9a4c9c0f3cea0a8bc87b2609293b91e05d0b8377725559c327c557bbba869914325c72ffcd1a2c908f408d2a6b8db5b286607e7c6a51a66afef57a1fe702e507
-EBUILD drbd-8.4.3.ebuild 2318 SHA256 562e0f55aa40bc4c047c048195fdc3154dbf06d41e89ab66a6a47337848d6e32 SHA512 8f9f74c0289caa064eaa2103b6c872d7b54a2e21aa6bd895af6da42a62c77eff2d4f6e87fd29f343916edcba983332182ebc231831b2a35ff08186807157df71 WHIRLPOOL 98a4a5652bc6ab61f510dd265664dd7853dd1e6fd23e6b79c0858165a4b1ff7bf4eff006a0d7ee8ae612f3adaa18fe0bbe9c2de32a9e43355c1f4ce046a979c6
-MISC ChangeLog 20996 SHA256 872f705431dd222a3a701212ff3cf0ca894601b813ebc5bd91aa18b4940c076b SHA512 e7eeded96fb9d2ff0e88651a156de1919ac8e26a3f7f495e578f9d2998799ad4c0768fd58d9d66230b6a07a3d6816234fe00b4ec9f58634f7256e3d56c59c2cf WHIRLPOOL 4588b3a6b72eb4706f4545c518ac00f0849ebe387321e263e32e1de34217db3812796de79f4fffa5d466268791a83d404ef06a362348926f75b8e11414889ca8
+EBUILD drbd-8.4.3.ebuild 2316 SHA256 9d1500bc23fefc67ab19015f1d6f9140afa00aaaf2a37d5edb37529963bf3b67 SHA512 ab01f6ee63bd4880ceecc7a3d5a3e9b3228aba02427bf88e28c2484f331bb190f9c0d82eb3a40cdc3a54cabbbbf6f372a811e5580a96999f2776b4fccb8603b1 WHIRLPOOL 4c7806c73db2e243a148089f29ffa482cc4174cf3fe329a774a005cf3f0ad3b19c1ffd632f1b0468e58255167aab334c3256f04de7d322d6fa4ed4021be345ed
+MISC ChangeLog 21234 SHA256 3f2c75d92319ec381d61c1ef1b5cbb0dcac17f57b8d0d4442be3e61191bd2aa0 SHA512 2d3b00b2c8809bea569ab6378ed6d1497c7d9cf1ae93b513562ad68110e3b02ed27eae7c7e88d8e18c4d9fb138663e540f46789c637eb64cb7fb09c35b5e94ab WHIRLPOOL 2426c187b24b3bff7e68993c5f70c83d22e9a7ac8a2507b8d7ec83a965f67390d730c19c77ab0b7700327055c3f5a415d9aa89aa03aa6a59342a114be590e2ef
 MISC metadata.xml 584 SHA256 9586a46ccbdb8b05fbba236d92cfd1144c1a9cf0900b52cda0e34a55e57f512d SHA512 415c5c3564723b61e7e30c849a3bde17e36c85eede46b2baa8b0f34d0c024f7dae9e9b89942c8de84c1c454e3152d809c5d2d45d31378ae299287dabb9806e02 WHIRLPOOL c23f13e1a4bc663bedc07fdd0f63cd63d589fb355aba6d5d1102b6924fffa363dee3ce39b8b27189f3adc1bfaded75ae3d6bfda223f020bf813047f4e6d6991b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT2UoDAAoJEEdUh39IaPFNkGMH+QEJE+GsPSf3flufBlPVxvQz
-XjHBO+fW9ZCPiqo6vPzlGFnrXfKanQ2KmNHJkaXJqVNycu59mtFIcYY49rScHjsR
-dLRmkV4+TE5T1UtxHyhdq2ZgoaDnRsf5TVHVAu01m7M9inCsH/bz9I4859Bj9k06
-TmnEKtw+3zMQUgzxMuZj/it3YJBAcXd+pm6i9lfDgPQzY5LSsBH6YLubTKkoMEyM
-ZNzRRURstUj8CJ4QIGNg071+jsaGrr3x0Tc/yq2Fq/XSmGOAB2mp0Vm3R5j6bc0k
-0x1sBD6YvJ5quGYc7z1w6kpFnck8GSCWWkR4oT/eDiy7fExN8BbxLJyCLidOLiE=
-=fXtX
+iQJ8BAEBCABmBQJT/18GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBAAP/j6h+R6f6uGqm+rjnlavKZ0X
+Tc5UK6t0uX2Bdqvw1xecPUEOXyDpMgkRLiYytVp3qrvOyTiqZDVKaviaTUNH/yjV
+wF3X65oZSTyAD973hbl3GfI2EZKozBGPFVG8d6m4CDcbGmHMvllYEaZSoo7E4x6u
+BLImXMtigmQyVvvUg6IYIZzQJW+VVim6Ag5D9f3s9NITLNPUofVoFxzi0pLjPGR4
+qbRlMETKr6r0oWepZz5L4IQqLRYS16VlGOF501ASanLK7gRTW7TUoOqIvxGKHtdV
+WB8yb4mD6Y7JCbd19VzYdKIbjta6YiwosxgNU6CLKZ7J4QqbJbcmBm6wz6SXaXzd
+1f/gBN05jR8R9SrRtwcc5wCmiSPMlccO70CE42deoLtLZyyOSU/vhwrsUkEFI88r
+D3DfhfklawrWLj41WrEZZcVUI0uPtElJgf085t7WLnbVV4sX+9L7fjB/xElFPbV2
+re3Rc7+j0rJsveCiWbo4df3wAszYQpHOwXUcVyIQKsc+y3777MsWA5WqiZKxaY2D
+lEBN5stjimNhKykMEG8kWGvVEHxjXoHkCY5t1smNI/e0Z9VC8+5CXCfDJ0xPsC1b
+V9GumxVfXslEzFY3e+HnryWsybfleeJKoEX7aAwiOhYUd/0dQIonr+xbcfjpDHIg
+InRZJ5vbz8dygJ3n4Qy2
+=2Xme
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/drbd/drbd-8.4.3.ebuild b/sys-cluster/drbd/drbd-8.4.3.ebuild
index 28596981ced6..95b630ac4ea7 100644
--- a/sys-cluster/drbd/drbd-8.4.3.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.5 2014/07/30 19:34:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.6 2014/08/28 16:55:33 mgorny Exp $
 
 EAPI=4
 
-inherit eutils multilib versionator udev
+inherit bash-completion-r1 eutils multilib versionator udev
 
 LICENSE="GPL-2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P
 HOMEPAGE="http://www.drbd.org"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
+IUSE="heartbeat pacemaker +udev xen"
 SLOT="0"
 
 src_prepare() {
@@ -27,8 +27,8 @@ src_prepare() {
 	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
 		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
 		-i user/{,legacy/}Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
+	# correct install paths (really correct this time)
+	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
 		scripts/Makefile.in || die
 	# don't participate in user survey bug 360483
 	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
@@ -45,7 +45,7 @@ src_configure() {
 		$(use_with xen) \
 		$(use_with pacemaker) \
 		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
+		--with-bashcompletion \
 		--with-distro=gentoo
 }