Remove USE=bash-completion, install the completion file unconditionally following the Council decision.

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

3 files changed, 33 insertions, 7 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index e41c13ff2689..633d071bab16 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.237 2014/07/28 17:33:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.238 2014/08/28 11:36:56 mgorny Exp $
+
+  28 Aug 2014; Michał Górny <mgorny@gentoo.org> R-3.1.1.ebuild:
+  Remove USE=bash-completion, install the completion file unconditionally
+  following the Council decision.
 
 *R-3.1.1 (28 Jul 2014)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 7ddceb51ae24..c557a1c5ba4f 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX R-2.11.1-parallel.patch 685 SHA256 5e57374318a3f549fa64c939a45964b941fac1f9b021cdc94ff1d40ff23032c5 SHA512 30491365eee00389f6f09c2093b5b5a568f4567c110cc0cb3332a53d6a7fcd87fe8f46f9f8521cf21bf1f0cfa24f4282a6e22396902f454c43f26542ac22c2a9 WHIRLPOOL 266115362f92a57d7a22d7b8810d12641e44c61b8396a8fd1a7fde2f5655a4990950366fc801d1d621e045a5a0b44d34c982cddb11396e82c019bec386a65f2a
 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed
 AUX R-2.13.1-zlib_header_fix.patch 591 SHA256 e185a2c324796c11cca171da63663a59e45b558e13f01af8c9527bd09ea1028b SHA512 1ada5a3ccb0ff902f7df35d6a42f4e99fee6a1f7b36ece000b9e2fed2b731abf5c3687d22239cd324ff6677bf8edff3415aca57c31beef33c73b98073206136a WHIRLPOOL 989418f4fdd120ca0b163b61e7e0bf56e7b52477b38b310ef281c4637c979b5b483d8b955a0167c719ca96e276798ea647d647080164b13e69d3789410d5d813
@@ -11,6 +14,25 @@ DIST R-3.1.1.tar.gz 28606569 SHA256 ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89b
 EBUILD R-3.0.1.ebuild 6214 SHA256 ad7a1ff3c1257008a3f4c63c354df5f91eaa5a565aa76bde822b4bf3cfec2a41 SHA512 5651bdfd67f6f5934f950f0f757f6e38869d6acec3e37418412e2b4914d662183959f1e558afd3e2e2736f8032b907df98019c451aff1c78614d9ef1c0b36de7 WHIRLPOOL ba95ea815386e23493d9bb72684aefa559f7158ffbf0bdee41dfde12aac747f4e7ffa2dc89225937ee8c2a3c985860858a23de00212beb0c01009f6a7d3cd461
 EBUILD R-3.0.3.ebuild 6189 SHA256 685c3d7d52abdfeace42006fcba96cbd55d1aaa3dce5ebc91f67014b16b6eedb SHA512 5e5e0a4bc514dea838cfb2ddea9ca3b0aafe0ba36d178a4682687db48e50f66df2ae481d68d9fc0a4b1cc7201b57bc993b45e4dd496d99cbe541ad45773f39b9 WHIRLPOOL dac5a7b7a62e019c186dd25f77a182ec05fb292c935920c6fce6d1c316da32e0e82069a303195ddccb341a4ca4f3463b2b7bac21aba42873be76341507055f2b
 EBUILD R-3.1.0.ebuild 6249 SHA256 95585cbc2e6226aee8bc08b5327aa55d40ae4e5cd7162f8d74bd70cf1ec81c5b SHA512 a67b227c4330eb36cd7e64d9e8f68ec98f87593eadf0e809d2a2f1ef0922ab7f101230e8312186017fa38e3366f15eba8cf1e20d5c77757596aedf3388b1616e WHIRLPOOL 658294a82c24e71207864a5cd982fb856aa5e875b273b552c0cd76b2e1b326104bbe695fe6e55e62dc1b3313edbe7fb91a4d5e33a4f36641d5f6c60c5a277247
-EBUILD R-3.1.1.ebuild 6255 SHA256 4e230768a917d351961e36ecc16293dc9adea4b08a56bd3d08a6d66216297fce SHA512 c4d9a3bfec082e70aa655ce743beffb09473bd46adcab38a5e8a5cc6ac14c5c59654468c36413ab105e1ef41c3a479ab901da6099f936e85e385991b2c3b3237 WHIRLPOOL 71eeb6d78efb6277b75d0bac6673e258ab16563e4b519819b95ad7a047cdd50b84be16f90869d786455a21d3bab49a4d76af6ee46cf6bf3cc829bcff52ae9d9b
-MISC ChangeLog 36170 SHA256 3ecb455f36e82144ba2e58081c76ed6f93adc544ea6dcae98b69b6740f026f41 SHA512 8ab1f752ca6ef4b68db205ade4fe7a5d1fc1f378fcedd3ef7e21cd84f1c3b0de8f09e795782c0bae0e2f18a2696553ef61f5059f792e3ba94614f6225742383c WHIRLPOOL e4f8157f595a68cfc9a25639fdffdaf331a7d20c526db7ef5c09a50ede5b66f7f6905858de9daf79e04411e771c6e76af6a2eee2a8c26b0066ffe811845ad32e
+EBUILD R-3.1.1.ebuild 6194 SHA256 6135d38f4288ce4348763570c112c2ccabbd965bcd330534fe05c694886eaab1 SHA512 e2ec3d3982c4b9cb2b95367abf7e750fd4d5231cd069e75ac7ec65e9b1cab0197d34551147101f9d78522fdec3a21048869caeabd4aaf7a748ef5e96037057cc WHIRLPOOL c6a391241801a448ef1d54be8533d4a656bd6756c689e3752367603c3040311874e121933ff1921596e22c7e22553db5c2f942c77fe64d5099073606ca830177
+MISC ChangeLog 36344 SHA256 edb005fab6f201c44cd1dbc101c5fabf35f8250e7bbd2583e8e36b725c5408da SHA512 49818e59a0e6176f97ae2a8f17e166ad66a7f9d7b31068d7c046ebb35b52515aafd9f03958c51474a714cddbbebd2dfe3bf9af2dd99df89bd2c95804c31c9b03 WHIRLPOOL 7035359f2d6f9b5efbc55f69089a9c884ff9065a7f7ebd158a3aa712772bc4b926abf448b5ac0b9a737564716e04db3a770d9218fe01ab9e1a34dfc9f4573e53
 MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJT/xRZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrVoQAJsuLws1zi4m6HJWpN6q4c1a
+HQsJSgsolMhh5xnhjl9RqC2W7RAK/lALnCXM24zrtgaHNrVyX2ClOhjwF93xfP1G
+j2OtgB4HBYrBa9T190axoEP1AiFyfTFvGKps+DMQ/ricnSCvYFKsk5dh7nvEhTfQ
+aGQ+9BO1RLGeT8mmxHOt0bX+Wo+AhAgHcez66DEnVvZYmlpXLw3tqm+SZ5LoAAkj
++jjRsi5siWa3g2VOZvjHqLapV/K34CkJp4cqTh9RoScoeTDRjqf0BIHT8QR35vUk
+VLLQUkLfy6XqzTTDIxdBJT9c0g+TfpBF6PzlCTveaVW5hGSlJml2yUzDug/qDaNX
+JM+AkoQDeL+qZA904oeyw2/vLrV70U8wwi3ZsTV1t/oB9wccY44B8+IdVcAo+19i
+bT3LVy659qdrWtQTdQjCBFxlOxKh4YGlKtpc0O4BQyPjG++cnH8G03S2JBpyyX3T
+uXMueXeeFujepjKFNdtX9ryicYQVy9CpQUttC7743GwnIr48VS6kg0HY0ajR/tJy
+ROn6UZNL9tayjg4W5KFClkIdtkypCN/pPEOSme7fk6Rm+hFLOUcDkbNIoI9XAZy+
+ZleTSuHQK1GKPFfT5vgXxq7hUNn12oc0ghmkloGseRt+fUG/zl3EhcVbKDQPn0Wa
+fSnHOGKTJ6vocOp2fw+n
+=k1zc
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-3.1.1.ebuild b/dev-lang/R/R-3.1.1.ebuild
index 697724c52485..f5a6091b803b 100644
--- a/dev-lang/R/R-3.1.1.ebuild
+++ b/dev-lang/R/R-3.1.1.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-lang/R/R-3.1.1.ebuild,v 1.1 2014/07/28 17:33:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.1.1.ebuild,v 1.2 2014/08/28 11:36:56 mgorny Exp $
 
 EAPI=5
 
@@ -11,12 +11,12 @@ DESCRIPTION="Language and environment for statistical computing and graphics"
 HOMEPAGE="http://www.r-project.org/"
 SRC_URI="
 	mirror://cran/src/base/R-3/${P}.tar.gz
-	bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
+	http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
+IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
 CDEPEND="
@@ -180,7 +180,7 @@ src_install() {
 		R_HOME=${R_DIR}
 	EOF
 	doenvd 99R
-	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
+	newbashcomp "${WORKDIR}"/${BCP} ${PN}
 	# The buildsystem has a different understanding of install_names than
 	# we require.  Since it builds modules like shared objects (wrong), many
 	# objects (all modules) get an incorrect install_name.  Fixing the build