Fixed #473102 - depend on <texinfo-5.0 again

(Portage version: 2.2.0_alpha185/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

3 files changed, 10 insertions, 239 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 5b1d0221e3b8..adf34c95f469 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.105 2013/06/05 15:53:53 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.106 2013/07/01 11:49:43 grozin Exp $
+
+*maxima-5.30.0-r2 (01 Jul 2013)
+
+  01 Jul 2013; Andrey Grozin <grozin@gentoo.org> -maxima-5.30.0-r1.ebuild,
+  +maxima-5.30.0-r2.ebuild, -files/texinfo51.patch:
+  Fixed #473102 - depend on <texinfo-5.0 again
 
 *maxima-5.30.0-r1 (05 Jun 2013)
 
diff --git a/sci-mathematics/maxima/files/texinfo51.patch b/sci-mathematics/maxima/files/texinfo51.patch
deleted file mode 100644
index ef3dcb4ff5fe..000000000000
--- a/sci-mathematics/maxima/files/texinfo51.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-commit 79bae2da8dc19bbd3355112bb9abb64c4c48ecb2
-Author: Julien Puydt <julien.puydt@laposte.net>
-Date:   Fri May 17 19:39:48 2013 +0200
-
-    Patch fixing the compilation with texinfo 5
-
-diff --git a/Bugs.texi b/Bugs.texi
-index 0d1bf5e..3032459 100644
---- a/doc/info/Bugs.texi
-+++ b/doc/info/Bugs.texi
-@@ -17,7 +17,7 @@ answer, but are marked as known bugs.
- 
- @code{run_testsuite} takes the following optional keyword arguments
- 
--@table @var
-+@table  @code
- @item display_all
- Display all tests.  Normally, the tests are not displayed, unless the test
- fails.  (Defaults to @code{false}).
-diff --git a/Integration.texi b/Integration.texi
-index a5443b5..09b39a7 100644
---- a/doc/info/Integration.texi
-+++ b/doc/info/Integration.texi
-@@ -1000,7 +1000,7 @@ achieved.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1092,7 +1092,7 @@ operator, a Maxima lambda expression, or a general Maxima expression.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1200,7 +1200,7 @@ One of the limits of integration must be infinity.  If not, then
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1297,7 +1297,7 @@ operator, a Maxima lambda expression, or a general Maxima expression.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1414,7 +1414,7 @@ operator, a Maxima lambda expression, or a general Maxima expression.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsabs
- Desired absolute error of approximation.  Default is 1d-10.
- @item limit
-@@ -1551,7 +1551,7 @@ operator, a Maxima lambda expression, or a general Maxima expression.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1684,7 +1684,7 @@ operator, a Maxima lambda expression, or a general Maxima expression.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-@@ -1788,7 +1788,7 @@ the integrand is singular or discontinous.
- The keyword arguments are optional and may be specified in any order.
- They all take the form @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item epsrel
- Desired relative error of approximation.  Default is 1d-8.
- @item epsabs
-diff --git a/Numerical.texi b/Numerical.texi
-index 6ce826a..a788ac6 100644
---- a/doc/info/Numerical.texi
-+++ b/doc/info/Numerical.texi
-@@ -422,7 +422,7 @@ The accuracy of @code{find_root} is governed by @code{abserr} and
- @code{find_root}.  These keyword arguments take the form
- @code{key=val}.  The keyword arguments are
- 
--@table @var
-+@table @code
- @item abserr
- Desired absolute error of function value at root.  Default is
- @code{find_root_abs}.
-diff --git a/category-macros.texi b/category-macros.texi
-index f8984ae..c7cf8ab 100644
---- a/doc/info/category-macros.texi
-+++ b/doc/info/category-macros.texi
-@@ -25,32 +25,38 @@
- 
- @c Macros for cross references
- 
--@macro mref {nodename}
- @ifhtml
-+@macro mref {nodename}
- @code{@ref{\nodename\}}
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mref {nodename}
- @code{\nodename\}
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
--@macro mxref {nodename, text}
- @ifhtml
-+@macro mxref {nodename, text}
- @code{@ref{\nodename\, \text\}}
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mxref {nodename, text}
- @code{\text\}
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
--@macro mrefdot {nodename}
- @ifhtml
-+@macro mrefdot {nodename}
- @code{@ref{\nodename\}}.
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mrefdot {nodename}
- @code{\nodename\}.
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
- @macro mxrefdot {nodename, text}
- @ifhtml
-@@ -61,30 +67,36 @@
- @end ifnothtml
- @end macro
- 
--@macro mrefcomma {nodename}
- @ifhtml
-+@macro mrefcomma {nodename}
- @code{@ref{\nodename\}},
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mrefcomma {nodename}
- @code{\nodename\},
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
--@macro mxrefcomma {nodename, text}
- @ifhtml
-+@macro mxrefcomma {nodename, text}
- @code{@ref{\nodename\, \text\}},
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mxrefcomma {nodename, text}
- @code{\text\},
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
--@macro mrefparen {nodename}
- @ifhtml
-+@macro mrefparen {nodename}
- @code{@ref{\nodename\}})
-+@end macro
- @end ifhtml
- @ifnothtml
-+@macro mrefparen {nodename}
- @code{\nodename\})
--@end ifnothtml
- @end macro
-+@end ifnothtml
- 
-diff --git a/lapack.texi b/lapack.texi
-index 01ddeeb..8702ade 100644
---- a/doc/info/lapack.texi
-+++ b/doc/info/lapack.texi
-@@ -417,7 +417,7 @@ specifed by optional keyword arguments: The keyword arguments are
- optional and may be specified in any order.  They all take the form
- @code{key=val}.  The keyword arguments are:
- 
--@table @var
-+@table @code
- @item C
- The matrix @var{C} that should be added.  The default is @code{false},
- which means no matrix is added.
-diff --git a/zeilberger.texi b/zeilberger.texi
-index 7caf72b..ad36fb6 100644
---- a/doc/info/zeilberger.texi
-+++ b/doc/info/zeilberger.texi
-@@ -21,7 +21,7 @@ summation.
- @category{Sums and products} @category{Share packages} @category{Package zeilberger}
- @closecatbox
- 
--@subsubsection The indefinite summation problem
-+@subsection The indefinite summation problem
- 
- @code{zeilberger} implements Gosper's algorithm for indefinite hypergeometric summation.
- Given a hypergeometric term @math{F_k} in @math{k} we want to find its hypergeometric
-@@ -34,7 +34,7 @@ $$F_k = f_{k+1} - f_k.$$
- @math{F_k = f_(k+1) - f_k}.
- @end ifnottex
- 
--@subsubsection The definite summation problem
-+@subsection The definite summation problem
- 
- @code{zeilberger} implements Zeilberger's algorithm for definite hypergeometric summation.
- Given a proper hypergeometric term (in @math{n} and @math{k})
diff --git a/sci-mathematics/maxima/maxima-5.30.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.30.0-r2.ebuild
index 5bfc45d48dcb..dd556e171f91 100644
--- a/sci-mathematics/maxima/maxima-5.30.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.30.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.30.0-r1.ebuild,v 1.1 2013/06/05 15:53:53 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.30.0-r2.ebuild,v 1.1 2013/07/01 11:49:43 grozin Exp $
 
 EAPI=5
 
@@ -75,7 +75,7 @@ RDEPEND="${RDEPEND}
 	${DEF_DEP}"
 
 DEPEND="${RDEPEND}
-	sys-apps/texinfo"
+	<sys-apps/texinfo-5.0"
 
 TEXMF="${EPREFIX}"/usr/share/texmf-site
 
@@ -94,7 +94,7 @@ pkg_setup() {
 
 src_prepare() {
 	local n PATCHES v
-	PATCHES=( imaxima-0 rmaxima-0 wish-0 xdg-utils-0 texinfo51 )
+	PATCHES=( imaxima-0 rmaxima-0 wish-0 xdg-utils-0 )
 
 	n=${#PATCHES[*]}
 	for ((n--; n >= 0; n--)); do