diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-08-28 11:36:56 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-08-28 11:36:56 +0000 |
| commit | 8e9b851da15eb8dfa396f756eb7e714623ec3b4a (patch) | |
| tree | a22f500c3a83a3b90fd9aa61098d82734c8afeb5 /dev-lang | |
| parent | Rebase failing patch wrt bug #520952. (diff) | |
| download | gentoo-2-8e9b851da15eb8dfa396f756eb7e714623ec3b4a.tar.gz gentoo-2-8e9b851da15eb8dfa396f756eb7e714623ec3b4a.tar.bz2 gentoo-2-8e9b851da15eb8dfa396f756eb7e714623ec3b4a.zip | |
Remove USE=bash-completion, install the completion file unconditionally following the Council decision.
(Portage version: 2.2.11_p165/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/R/R-3.1.1.ebuild | 8 |
2 files changed, 9 insertions, 5 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/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 |