app-emulation/lxc: Fix for old bash-completion, #527520

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

3 files changed, 23 insertions, 20 deletions

diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 8b6ef51f6677..30105f9b983d 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.52 2014/10/30 08:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.53 2014/11/09 15:28:25 jlec Exp $
+
+  09 Nov 2014; Justin Lecher <jlec@gentoo.org> lxc-1.0.6-r1.ebuild:
+  Fix for old bash-completion, #527520
 
 *lxc-1.0.6-r1 (30 Oct 2014)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 53e4449b7e9d..17e288f7c651 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -8,26 +8,26 @@ AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c
 DIST lxc-1.0.4.tar.gz 548741 SHA256 bcb04752fddc581030727be179a9f65715e11b0a04bf9bb119adb1b2d117bd9a SHA512 ec30e01e2dab393a74b50279981a9bb0e93da2ed2c82b33e218cd1146df20b5443a75ace623c30b6c9718f8a23e4a447484bf316c9155324fe931741d2ed9f06 WHIRLPOOL 2ae27940884bb645674410ff223f80e63b90cda7a4fdf189133ebab91621c0fc95ddb24e439f08ffbf93a3056e32dcc88cdc04ac75d9c4ad8a4779c177845074
 DIST lxc-1.0.6.tar.gz 561249 SHA256 2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c SHA512 fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1 WHIRLPOOL 9e77453fbe31523a2e8f39cfaba6f09fef68d00b54549167a0cde56c00934f827f5b4190b9fb64242f36782a9fcda63e6796c35fd47420870c2cee7b9bc0a1c8
 EBUILD lxc-1.0.4.ebuild 5597 SHA256 c7f4007dae5414e8d8acdc8927df0f2f090ca9bbcba8ef8f7044d6df0e4da43e SHA512 994812de2c433e2996f0149da1c156947ccaa50699852f4af655d74bd9bac93a743a782e42a603ee192ebc66c52432e687413831896d0d2e7286d5ac1b75e33f WHIRLPOOL c9d7200d4493fa341d15fbe83fd76b6fc277a0d4d334739586a28f2dbe897864c431423bdb2a189ef6e2866ac120808781151c8b36f986bdf8049053a139eec1
-EBUILD lxc-1.0.6-r1.ebuild 5832 SHA256 c8cbece3e453763df32d2f7c4c321f03cc5e4c24a70ebe236eee5f20b5de6ac1 SHA512 4a01c8a9814ac9401d1811ad187e91f54b08a409ebae6f9b0d5f1a5254483c5f684cf17c325768f4f24ca693bf5decfba217354ce18541700e9c8ef58819f9a8 WHIRLPOOL 869d88c292b633b79231ee4157a77384b0162c73b8b82636aa47b18105cf888cd06b6c15ef81d5c418cdf80ddb0c7494f1715eaf4a52db53b73aa8f8b258bd5c
+EBUILD lxc-1.0.6-r1.ebuild 5858 SHA256 b4bc37f2d005858c71dc02110ac99d048f5193bb4c1d2da7b9f858c36ed01452 SHA512 3821d69cf02f91e08075b029ede033f994f397b958932ce6ce13e588da92e68e15757184ae3b176d003fa190d8bdfc5e926b3333376a300aa5d5b789e581f4cd WHIRLPOOL 9bebff48adca2da4fef6b24e8f24acacd50064ae45c812b6d68faa7832da5f6ddda90552de57ab439de2bc2113f266b257f1312eb63b4b5667b9e4dc0ef0c8c9
 EBUILD lxc-1.0.6.ebuild 5517 SHA256 342383c71c61bb2d5dc14b179d0f8570f3707a654be9ea3b5bba946b44c2b183 SHA512 a8314c49a5f2df5ede9ffa6882fb84350ec15fed18cf82f4b63d513e309ba9267adf5a0a068c37c83ae2cfcbfa6fba2b4e8083b59c441fb852938498a5fafebd WHIRLPOOL ac1bdfeb650ad33cad3d3b7b3257f24e409bbcaed15900ef27fd4ee7fb4e836a56314fb09f1d52c45dcd3014c89f54ca65bc46c53a0e829b9900e43a49098377
-MISC ChangeLog 11530 SHA256 a9c05104a45f371397a52936799e8075f13d3062239cc194567c0bd198dd6736 SHA512 3d4eb6a5ebf8d73a28bd68fe295d14a4fd8d89d266ead5695256a5f202934b01808ef612636c19355b157415769572fb90134ddf2f5be73ed41b3289b84a2da3 WHIRLPOOL 52058f10193becd984a31ab36fdc0aaadf123876fb1b2ddedbbebbfd1f2336d1fb02ce23352e1de36571ddfe7bb840e956b9a14ed48e3762603e1aed404a2e5c
+MISC ChangeLog 11638 SHA256 24a65998c95c2417628ee41055a9279381b1f1d1ec7336af49ed947e32ae7eac SHA512 4e53c57d0c1770444794b4289deeabc5c5a07217003645357a31728fc765ba83fa9b8c5b656fce48aa6299d68d5027faa1dd9742a749b7348ca2f2fd56adb721 WHIRLPOOL 9f92f78a9e1215b72e1bc6a5670a93992b45a0d9cf646701896762f7a6963647fc17a875302b976b61b774a519bc69ea1a7f2be19ba0e3c01bb649f2d2bb61ca
 MISC metadata.xml 494 SHA256 82db4b5e8580454962bfd6c341660f4b5b2d244311152978f8ff107dcf3c55d2 SHA512 cb0cdedcafedb433898bf9cde51736a6728db69d689ca0cc324487cf1f35356e710062bb8072a94909139bfa1cace529d81cc6a8b4ae4cba6e6f99fde0ac53a7 WHIRLPOOL a1aacd0211fb2a31522c7a0ab2f1259870b4cbcc8ba099ec35188bf24e55fc4f4cf3eb76dd67360037b0a038b3d80f1c7c45fb6a081f6bf424780573f1178a1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUUfvRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUX4gcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirx5EP/i7gvbXYlai2HkEjyRtQjwYY
-9shrfv7H9lOuvoaMn8H6prznDGo6Gor8aPcxOjpeVYIzD2BJLvlRkUZ0GA/vNiXh
-UsMUFdEnYjHkHU/ILgc6uTYJ6zeoKn1+esc34w8wPhVymb+CI73mtQItOVe+N1y4
-FVub/+um0TheIyxHUaQQyD8/1nYim3ajWkTym6YsyXow/UrOn5yLxApF7c5WnK+1
-BIyVb815p59nAefxlb7Gq9CfR7klf7NTPW+t9HnJF1s8Zg74YWLsrBKXDbdFmLEc
-4zp24ZaeWaAXY68bUUBZfHw5Fg0WHWwPF+jwnBU2G0kwLvIq9MnKd4nB3Egj8cdY
-SUYuSSkQdeXPI+7LLFKT4HFtZia1t/rW9RPaFGVER2YQ8/jyBoLf00y0tPBnUO/l
-OTUv5oB5rVIZVjQolCScXp8+kgGQYXBk8hpr8K0r4Lw7ubX8OeiWrLzbzfV9qcPB
-9hcgce7y2O9VnaiAP+tCMcIbuRqyKwh0O9bx3+c+1ag8AfcsJp7OaiqAXhzkAUlS
-ADRMlk7n/NPWfFxV1jALs5sqbnc/gV+zXZTihgso4oxjvuc2VEYeYiZV9k56aFBT
-njl48ctQL58QEHcO315e+954cXsmjNNQ02ezvN6UnscRIIN7EyC7ta+oai1Slzrs
-peDaqBiIGK2mpYU8DOLH
-=rF5i
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirLHoP/3ysxwy27rd0IE7nMyxflM7I
+gT+d6CKDCwWRQEa8+h0NbfCwBxAuncQfVpgFNEn/ngWK7yMmBLyw/diG7w6fgZCe
+NHsWfA1Iq9qjG1VPd2QIBBGdoopsRl9V/tfTwUNTnzhs41IM+LesLUoXqQfHWIxP
+/zBzI+OBe/L52TYGctsC9TMw4zatw5LWGdkiKJ3dgPXFn1F4kNr8v3Abra87aeVf
+whDdAjjmr0WFkR0tdEka7boZ9XWM6t3DirYR+TcsfqyMazUfUX0tBm+8ICqaPhrk
+j7+9oElxH3zIUSMqXVSiuQ/l5b+7JayQmJK7byHhYZ4rY2IR+SWK3jKEvkzRJNVm
+ZrBePZRqmuK2axh05pwzywxdByPYf5mTsiQJIoxErxvJMYuALRAkgtcVypf/uosQ
+8k/irJ1dS9SloWvfZ3BNk84DrZw0A2+bArDbDRcgwWzzdEQVHusxPr9dVhTeuO+U
+a8Tc1yjXbhsNy8WiATKICs2A0v487sQuTpdP6FH17Yilst+Z9Z5TR4zT9D4pcoM+
+ZcixD0mgfEdiRHE6UgbGs2k3k2UHrCSdEuz8PMypkjr8mBQPH13x4RndYCHxG3FQ
+Xx4xLWo/6EWBIuv5RIzAT0TL5+E1WXDoo40nAmjWIMRwAs+r31Fghn2MRpnq1R2D
+Kl4lknm+SSuaz2T7ojPF
+=m2Mc
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/lxc-1.0.6-r1.ebuild b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
index bfbb3283c474..c30a0e831a71 100644
--- a/app-emulation/lxc/lxc-1.0.6-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.1 2014/10/30 08:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.2 2014/11/09 15:28:25 jlec Exp $
 
 EAPI="5"
 
@@ -128,7 +128,7 @@ src_compile() {
 src_install() {
 	default
 
-	mv "${ED}"/$(get_bashcompdir)/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
 	bashcomp_alias ${PN}-start \
 		${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
 
@@ -153,7 +153,7 @@ src_install() {
 	doexe config/init/systemd/${PN}-devsetup
 	# Use that script with the systemd service (Similar to upstream
 	# Makefile.am
-	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service
+	cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
 	sed -i \
 		"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
 		${PN}_at.service \