summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-06-22 12:56:09 +0000
committerJustin Lecher <jlec@gentoo.org>2015-06-22 12:56:09 +0000
commit637845a34e2033c78884db3edd8caf1d9dc36155 (patch)
tree8ca352f741d734855b7035ba14156ec2ac07d267 /sci-visualization
parentRevert previous commit until batik:1.7 rdeps are switched to 1.8 SLOT. (diff)
downloadgentoo-2-637845a34e2033c78884db3edd8caf1d9dc36155.tar.gz
gentoo-2-637845a34e2033c78884db3edd8caf1d9dc36155.tar.bz2
gentoo-2-637845a34e2033c78884db3edd8caf1d9dc36155.zip
Backport patch for texinfo5, bug #513566
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/gri/ChangeLog8
-rw-r--r--sci-visualization/gri/files/gri-2.12.23-texinfo5.patch32
-rw-r--r--sci-visualization/gri/gri-2.12.23.ebuild9
3 files changed, 43 insertions, 6 deletions
diff --git a/sci-visualization/gri/ChangeLog b/sci-visualization/gri/ChangeLog
index d8b02a3a9b3e..f922b1016c7e 100644
--- a/sci-visualization/gri/ChangeLog
+++ b/sci-visualization/gri/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/gri
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.12 2013/01/28 08:38:57 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.13 2015/06/22 12:56:09 jlec Exp $
+
+ 22 Jun 2015; Justin Lecher <jlec@gentoo.org>
+ +files/gri-2.12.23-texinfo5.patch, gri-2.12.23.ebuild:
+ Backport patch for texinfo5, bug #513566
28 Jan 2013; Justin Lecher <jlec@gentoo.org> gri-2.12.23.ebuild,
metadata.xml:
diff --git a/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch b/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch
new file mode 100644
index 000000000000..dfc56fc574b3
--- /dev/null
+++ b/sci-visualization/gri/files/gri-2.12.23-texinfo5.patch
@@ -0,0 +1,32 @@
+From 93a40c0b444fb5265b21a344b884b1c7bed49b5a Mon Sep 17 00:00:00 2001
+From: Dan Kelley <kelley.dan@gmail.com>
+Date: Mon, 5 Aug 2013 21:01:46 -0300
+Subject: [PATCH] Bug#718821 fixed
+
+Problem with a subsubsection following a section.
+---
+ doc/gri.texi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/gri.texi b/doc/gri.texi
+index 57c5e76..d16b6ff 100644
+--- a/doc/gri.texi
++++ b/doc/gri.texi
+@@ -18486,7 +18486,7 @@ Versions exist for MSDOS, windows, and Linux operating systems.
+ (Actually, the windows version is just the MSDOS version, which can be
+ run inside an msdos window within windows-95, windows-NT, etc.)
+
+-@subsubsection MSDOS Operating System
++@subsection MSDOS Operating System
+ @cindex compilation under MSDOS
+ @cindex MSDOS compilation
+
+@@ -18543,7 +18543,7 @@ To view the output, use a PostScript viewer such as GSview.
+
+
+
+-@subsubsection LINUX Operating System
++@subsection LINUX Operating System
+ @cindex compilation under Linux
+ @cindex linux compilation
+ @cindex LINUX compilation
diff --git a/sci-visualization/gri/gri-2.12.23.ebuild b/sci-visualization/gri/gri-2.12.23.ebuild
index bec5ae57748c..2eb0d26a5d9f 100644
--- a/sci-visualization/gri/gri-2.12.23.ebuild
+++ b/sci-visualization/gri/gri-2.12.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.7 2013/01/28 08:38:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.8 2015/06/22 12:56:09 jlec Exp $
-EAPI=4
+EAPI=5
inherit eutils elisp-common
@@ -28,7 +28,8 @@ SITEFILE="50gri-gentoo.el"
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-2.12.18-postscript.patch \
- "${FILESDIR}"/${P}-perl-5.16.patch
+ "${FILESDIR}"/${P}-perl-5.16.patch \
+ "${FILESDIR}"/${P}-texinfo5.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