sci-mathematics/octave: Adapt deps for texlive 2017, bug #621240

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 0a66c65436ca010a2ed2b5c746e53c7de2fbf75f..191446ebdfc0428456f4c8bd52fcd000b064977a 100644 (file)
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        doc? (
                virtual/latex-base
-               dev-texlive/texlive-genericrecommended
+               || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
                sys-apps/texinfo )
        dev-util/gperf
        virtual/pkgconfig"

diff --git a/sci-mathematics/octave/octave-3.8.2-r3.ebuild b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
index 2269f831a09408f490d9ed9caae134e528979091..9ae07cee479357955908de944e5632537b3340dd 100644 (file)
--- a/sci-mathematics/octave/octave-3.8.2-r3.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
        java? ( >=virtual/jdk-1.6.0 )
        doc? (
                virtual/latex-base
-               dev-texlive/texlive-genericrecommended
+               || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
                dev-texlive/texlive-metapost
                sys-apps/texinfo )
        dev-util/gperf

diff --git a/sci-mathematics/octave/octave-4.2.0-r4.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
index a52aea882a3338054ee8a5c90d5a00a023a78ae6..2bbb86439b6ce639bdd13326a11b37bddbb20dd8 100644 (file)
--- a/sci-mathematics/octave/octave-4.2.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
        doc? (
                virtual/latex-base
                dev-texlive/texlive-fontsrecommended
-               dev-texlive/texlive-genericrecommended
+               || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
                dev-texlive/texlive-metapost
        )
        sys-apps/texinfo

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
index 66548146ebad1a3b3f44f3cf49d108e7dd583e6f..00a2d44ce48e6b9485d06cc66765602dff893fcf 100644 (file)
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
        doc? (
                virtual/latex-base
                dev-texlive/texlive-fontsrecommended
-               dev-texlive/texlive-genericrecommended
+               || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )
                dev-texlive/texlive-metapost
        )
        sys-apps/texinfo