Fix bashcomp installation for bash-completon-1 users, bug 521166.

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

3 files changed, 13 insertions, 13 deletions

diff --git a/dev-python/pygments/ChangeLog b/dev-python/pygments/ChangeLog
index b6610f6a727f..fa2385d87f44 100644
--- a/dev-python/pygments/ChangeLog
+++ b/dev-python/pygments/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygments
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.127 2014/10/07 08:09:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/ChangeLog,v 1.128 2014/10/07 15:15:51 floppym Exp $
+
+  07 Oct 2014; Mike Gilbert <floppym@gentoo.org>
+  pygments-1.6_p20140324-r1.ebuild:
+  Fix bashcomp installation for bash-completon-1 users, bug 521166.
 
 *pygments-1.6_p20140324-r1 (07 Oct 2014)
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 0c2247de4d15..b7bb21aae375 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -11,14 +11,14 @@ EBUILD pygments-1.5-r1.ebuild 1427 SHA256 b5244859c8eba53dc44ee6524826c8eb411aaa
 EBUILD pygments-1.5.ebuild 1225 SHA256 1d7da7355c1455ed56d03658775458fdb48f961c6d8763601e6004ea6962a023 SHA512 d79ea595d7cb799e3c1308c495f366527160f28209e92af3e96f302a827224ab45261c492c4dc07b739d14fc7483e192b140c5770a3b7d86e661066d015d3c6b WHIRLPOOL 2f31f7bdf571133db5b71f155de2f77cf05f295520dcf63110da7dcaf2e58f025f9236e4b50baab20e34b5af7aacde2cb5acd052d5569fac94c2b6f13d16e3b2
 EBUILD pygments-1.6-r1.ebuild 1531 SHA256 b3b147a92a7ea454ed5a3d78b90f576ab411938c7dd80f6a8d55b978642a5746 SHA512 024c7168487a246105c19df540ffea0de5c4c0f1e16c853627ab5e6e842b4e4837e3607b316183c7c60c7160a52388aaca80ed68708fdb353cd9e11965e7a4ec WHIRLPOOL f862da8e70c73ba1dba78343706cd70a4bbeb824eae1da055578c5b573cba4a0dcadcd13cdc5a015be6a13fe8b89b5af216f68fdb9682f1b9593348be171d3b7
 EBUILD pygments-1.6.ebuild 1453 SHA256 3c4c2025679027cd6549b34469cb134f311d081535ea6105e202c84ca599a359 SHA512 827dc3b1c634091204125236f3c787b85e53599322d482dd322a09517f530798a6a0d0c1679c417e72458f9235ec5500ac9b7cf54e1b69405f1868ca1e09b345 WHIRLPOOL b4685d63ca72e3c5f9245237a185c2a95557ccdb681315c93914d64fda339aaefca4a5864929380a0d15d9ca03d7250f6ca9d17c27359556d3af4aea15b8f468
-EBUILD pygments-1.6_p20140324-r1.ebuild 2101 SHA256 1ce66bb315d7e474d58b9aa89bfd6d9081f6a5a50b5de9165e02be35b4d6ce4a SHA512 02e058cc973ba4d1c34d8544d2b13693f28bcdb1a08a4517a56e3e7a36c5e21949fba308f8155b339d5dff7df60843f56f0b13ed34046c17c0930a447bd51207 WHIRLPOOL a0c9c425cbb53dd448eeea23a136da6c147ce5e6b13b3ddf21f2f2a1bb0fd0f990746651afd7cdcef90fb72c1c7c5e046583db66cfe4671595e340d7ad57e124
+EBUILD pygments-1.6_p20140324-r1.ebuild 1982 SHA256 ee620f774f0f5b67ada9e0bfde2a4a82925356d8866440eab13de35c2103d040 SHA512 aec57451b2523ace7375bb45a09f2636a95dde849cf03fb1bb7b3a845f9ddfbe816ab45a01a147ce70e57c8b8a22fc48a72d07942e22b7419327b8dfb5e1056e WHIRLPOOL 1136822a60a276759b382d0b2175e2b41a8582e479c547e955229ed28355126ef17e3f35b3c53dd2febaa260d978f6166b6863277f5053e7eccf9b0a8bbe4e5f
 EBUILD pygments-1.6_p20140324.ebuild 1969 SHA256 672a6c9fdb67e5ce0d6ee6dde69bb37508854971e799a20d7657d24faed7fa34 SHA512 85a549a806ec90080f22a58a33cef89a1fbeccdcc10b7ac21d2e5fe325c5aa5c530ae9265b81d1497a53db605954132e2b94f0408dd2731f8e71f3f81d2911e4 WHIRLPOOL a13f783380cfc06656ffa4d5d195697e49817d3738dbd6f3bf68f751d3de47e8a242abcc82daed3c324fe17f596cd2676234092b467e0521e508efd26487260e
-MISC ChangeLog 16070 SHA256 69171096a0de0b2bc2860f8c7476f43a51afa68d67d0e8155b9ff8d9f0fba39f SHA512 097176acc46f47eb29b8ff2725c11522271f27b4127ae32067fadd722245753a7425366eaf8ead22d1b4bde6bd88a48348e7ff1a16c7fd6ea97d3b8e7eaeb305 WHIRLPOOL 2076dbfa401c18ba661ac3225d5a1204c512719472db144eda4060532d1b7ad78da6e5ac8018c375c15ca7612db7741885fcc1404b9f482d05e1f42db3632c0d
+MISC ChangeLog 16224 SHA256 79888489b1379f4d7674d9e8224f7a5b4246bcbed4d6b279355c90a5a58d98e6 SHA512 dccf112443a7f447ef028517b21b5eadf4b93a4279caa23c8d68bf01c6120bda63ffb734f90692456b3048f4c997b1c477cb9bc8aeaad39ffeda5b142bfcf3bf WHIRLPOOL 6ad5c1feca0c9a7d9be0481c504d49538f9ae8f8bc0524695041af0ca9a588d30ff621aa4318c1f7daf3265b1c59d4073b0427a7c78b0a55981f4d3c50a598bc
 MISC metadata.xml 395 SHA256 fa28f657c40a4f24af13aa584d1e103e5d02996a48c135833199c3f62c0d140b SHA512 ab5d25b7e1a8a14097cde99e12c4146c58de8ae581ea8595f497aa085c34437fbc12ff379a26d99bcd43a623152ec84f207cc2abf452f405a0d6209697520401 WHIRLPOOL a83e096d6c89277a1c28e35f595ecf5406f04e30885ba0d0e611f3d9ea36eda5bc175075260e5dabe70d5e2a8b0fb54682234bf9f88c69a13b975cce1838970c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQzn8IACgkQso7CE7gHKw3XigCffem35leMLqwdomz6IqfgachZ
-z2EAoLOfob7R5Nq9XPIOPiOhBnxEDXCd
-=Jm5c
+iF4EAREIAAYFAlQ0A6wACgkQC77qH+pIQ6S3CAD+K6Cv68MW0YOg2u2fYvDDKwSD
+LzTdX1b48jXSf3quaGoBAIJgso/YmiKSU+2iwyMDY3iXa/izOX/M136tPgdyRJQA
+=9vWq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
index b631d9f5f183..090ba1f5d6e4 100644
--- a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
+++ b/dev-python/pygments/pygments-1.6_p20140324-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/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild,v 1.1 2014/10/07 08:09:24 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild,v 1.2 2014/10/07 15:15:51 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -60,9 +60,5 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 
 	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp ${PN}
-	# Bug 521166
-	pushd "${D}"usr/share/bash-completion/completions/ > /dev/null
-	mv ${PN} pygmentize || die
-	popd > /dev/null
+	newbashcomp external/pygments.bashcomp pygmentize
 }