From 06e4e312aa483c15985e66c3a2fc3193500b0647 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 17 Jul 2012 16:15:24 +0000 Subject: sci-visualization/gri: Add fix for perl-5.16, #415485 (Portage version: 2.2.0_alpha118/cvs/Linux x86_64) --- sci-visualization/gri/ChangeLog | 8 ++++++-- .../gri/files/gri-2.12.23-perl-5.16.patch | 23 ++++++++++++++++++++++ sci-visualization/gri/gri-2.12.23.ebuild | 11 +++++++---- sci-visualization/gri/metadata.xml | 2 +- 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch (limited to 'sci-visualization/gri') diff --git a/sci-visualization/gri/ChangeLog b/sci-visualization/gri/ChangeLog index 0441255ae0dc..c7d1bde8bdf4 100644 --- a/sci-visualization/gri/ChangeLog +++ b/sci-visualization/gri/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/gri -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.9 2011/08/12 16:29:57 bicatali Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.10 2012/07/17 16:15:24 jlec Exp $ + + 17 Jul 2012; Justin Lecher gri-2.12.23.ebuild, + +files/gri-2.12.23-perl-5.16.patch, metadata.xml: + Add fix for perl-5.16, #415485 12 Aug 2011; Sébastien Fabbro gri-2.12.23.ebuild: Trick maintainer-more QA warn, add some die functions, run mv only if there diff --git a/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch b/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch new file mode 100644 index 000000000000..14c89978ce7c --- /dev/null +++ b/sci-visualization/gri/files/gri-2.12.23-perl-5.16.patch @@ -0,0 +1,23 @@ + doc/texinfo2HTML | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/texinfo2HTML b/doc/texinfo2HTML +index 39bed0e..43d3fe6 100755 +--- a/doc/texinfo2HTML ++++ b/doc/texinfo2HTML +@@ -54,12 +54,12 @@ BUGS: + the end is here} and more blah + will not get the \@code{} item converted correctly. + "; +-require "ctime.pl"; +-require "getopts.pl"; ++use POSIX qw(strftime ctime); ++use Getopt::Std; + + $debug = 0; + +-die if !&Getopts('h'); ++die if !getopts('h'); + $print_help = 0; + $print_help = $opt_h if $opt_h; + if ($print_help) { diff --git a/sci-visualization/gri/gri-2.12.23.ebuild b/sci-visualization/gri/gri-2.12.23.ebuild index 3c619bcfea45..22988bc5c7c7 100644 --- a/sci-visualization/gri/gri-2.12.23.ebuild +++ b/sci-visualization/gri/gri-2.12.23.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.4 2011/08/12 20:42:47 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.5 2012/07/17 16:15:24 jlec Exp $ EAPI=4 @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc emacs examples" -DEPEND=">=sci-libs/netcdf-4 +DEPEND=" + >=sci-libs/netcdf-4 virtual/latex-base || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) app-text/ghostscript-gpl @@ -25,7 +26,9 @@ RDEPEND="${DEPEND}" SITEFILE="50gri-gentoo.el" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.12.18-postscript.patch + epatch \ + "${FILESDIR}"/${PN}-2.12.18-postscript.patch \ + "${FILESDIR}"/${P}-perl-5.16.patch # Makefile.am contains a call to the missing script that triggers gentoo qa sed -i -e 's|${SHELL} ../missing --run tex|tex|g' \ doc/Makefile.in || die diff --git a/sci-visualization/gri/metadata.xml b/sci-visualization/gri/metadata.xml index b229aec85b8f..d369d068ffb8 100644 --- a/sci-visualization/gri/metadata.xml +++ b/sci-visualization/gri/metadata.xml @@ -1,5 +1,5 @@ -sci + sci -- cgit v1.2.3-65-gdbad