diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2012-02-06 21:19:57 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-02-06 21:19:57 +0000 |
commit | 13276bf1e7f9d787a1c343dc364e9c04f915e6c1 (patch) | |
tree | 0e3636d916bca361f507eaeb982e8e86af6f2132 /dev-lang/R | |
parent | dev-libs/libspnav: Fix dependencies (diff) | |
download | gentoo-2-13276bf1e7f9d787a1c343dc364e9c04f915e6c1.tar.gz gentoo-2-13276bf1e7f9d787a1c343dc364e9c04f915e6c1.tar.bz2 gentoo-2-13276bf1e7f9d787a1c343dc364e9c04f915e6c1.zip |
Fixed libtiff syntax in patch (bug #402327), remove bash_completion_post_install (bug #402329)
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/R')
-rw-r--r-- | dev-lang/R/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/R/R-2.14.1.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/R/files/R-2.14.1-tiff.patch | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 7b3e8b9ac0ee..697676736a50 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/R # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.192 2012/01/02 19:47:54 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.193 2012/02/06 21:19:57 bicatali Exp $ + + 06 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild, + files/R-2.14.1-tiff.patch: + Fixed libtiff syntax in patch (bug #402327), remove + bash_completion_post_install (bug #402329) *R-2.14.1 (02 Jan 2012) diff --git a/dev-lang/R/R-2.14.1.ebuild b/dev-lang/R/R-2.14.1.ebuild index b2803fa4a82d..e5b1b68c7941 100644 --- a/dev-lang/R/R-2.14.1.ebuild +++ b/dev-lang/R/R-2.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.1 2012/01/02 19:47:54 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.2 2012/02/06 21:19:57 bicatali Exp $ EAPI=4 @@ -152,5 +152,4 @@ pkg_postinst() { einfo "Re-initializing java paths for ${P}" R CMD javareconf fi - bash-completion-r1_pkg_postinst } diff --git a/dev-lang/R/files/R-2.14.1-tiff.patch b/dev-lang/R/files/R-2.14.1-tiff.patch index dafd935f2042..f815285557f3 100644 --- a/dev-lang/R/files/R-2.14.1-tiff.patch +++ b/dev-lang/R/files/R-2.14.1-tiff.patch @@ -1,4 +1,4 @@ -Add a --with-tiff to avoid broken implicit dependencies +Add a --with-libtiff to avoid broken implicit dependencies Patch by Sebastien Fabbro --- configure.ac.orig 2012-01-02 17:01:24.000000000 +0000 @@ -7,7 +7,7 @@ Patch by Sebastien Fabbro [AS_HELP_STRING([--with-jpeglib],[use jpeglib library (if available) @<:@yes@:>@])], [R_ARG_USE(jpeglib)], [use_jpeglib=yes]) -+AC_ARG_WITH([tiff], ++AC_ARG_WITH([libtiff], +[AS_HELP_STRING([--with-libtiff],[use libtiff library (if available) @<:@yes@:>@])], +[R_ARG_USE(libtiff)], +[use_libtiff=yes]) |