app-text/texlive-core: Fix dependencies on X libraries.

For the time being, keep the dependency on libXmu (linked against
by xpdfopen).

Closes: https://bugs.gentoo.org/649152
Package-Manager: Portage-2.3.27, Repoman-2.3.9

diff --git a/app-text/texlive-core/texlive-core-2015-r1.ebuild b/app-text/texlive-core/texlive-core-2015-r1.ebuild
index 8c72c8131fdfd27d8b76c8e6c2ea6e5f7e8a6815..47aad70342f72703a3ad8c46068836cca8e83ad7 100644 (file)
--- a/app-text/texlive-core/texlive-core-2015-r1.ebuild
+++ b/app-text/texlive-core/texlive-core-2015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -74,10 +74,8 @@ IUSE="cjk X doc source tk +luajittex xetex"
 TEXMF_PATH=/usr/share/texmf-dist
 
 MODULAR_X_DEPEND="X? (
+                               x11-libs/libX11
                                x11-libs/libXmu
-                               x11-libs/libXp
-                               x11-libs/libXpm
-                               x11-libs/libXaw
        )"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}

diff --git a/app-text/texlive-core/texlive-core-2016-r5.ebuild b/app-text/texlive-core/texlive-core-2016-r5.ebuild
index 968bc1ce9d0dc53d1c3319d855d5d13d880a3fbf..bba5cd9051135b8cb8d5322900129a1f18b18795 100644 (file)
--- a/app-text/texlive-core/texlive-core-2016-r5.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -80,10 +80,8 @@ IUSE="cjk X doc source tk +luajittex xetex"
 TEXMF_PATH=/usr/share/texmf-dist
 
 MODULAR_X_DEPEND="X? (
+                               x11-libs/libX11
                                x11-libs/libXmu
-                               x11-libs/libXp
-                               x11-libs/libXpm
-                               x11-libs/libXaw
        )"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}

diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
index 1b5dcd1fa8512821969e85b01920729c2724e246..b16827b3d88b32b96d5139b3351441a271f87cb2 100644 (file)
--- a/app-text/texlive-core/texlive-core-2016-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -80,10 +80,8 @@ IUSE="cjk X doc source tk +luajittex xetex"
 TEXMF_PATH=/usr/share/texmf-dist
 
 MODULAR_X_DEPEND="X? (
+                               x11-libs/libX11
                                x11-libs/libXmu
-                               x11-libs/libXp
-                               x11-libs/libXpm
-                               x11-libs/libXaw
        )"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}

diff --git a/app-text/texlive-core/texlive-core-2017-r2.ebuild b/app-text/texlive-core/texlive-core-2017-r2.ebuild
index ff44aa3df6cec773fed42d2fa2f9e1d88d152d28..c9ceadb3c5b946ff337b0f7e44ab6a6e4142616f 100644 (file)
--- a/app-text/texlive-core/texlive-core-2017-r2.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -80,10 +80,8 @@ IUSE="cjk X doc source tk +luajittex xetex"
 TEXMF_PATH=/usr/share/texmf-dist
 
 MODULAR_X_DEPEND="X? (
+                               x11-libs/libX11
                                x11-libs/libXmu
-                               x11-libs/libXp
-                               x11-libs/libXpm
-                               x11-libs/libXaw
        )"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}

diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index 47ea8a2715fe7b1e51fa8ab1cd728729165d1e24..a7e745fa176e2297d2618b5bf8adf0af843a0e41 100644 (file)
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -80,10 +80,8 @@ IUSE="cjk X doc source tk +luajittex xetex"
 TEXMF_PATH=/usr/share/texmf-dist
 
 MODULAR_X_DEPEND="X? (
+                               x11-libs/libX11
                                x11-libs/libXmu
-                               x11-libs/libXp
-                               x11-libs/libXpm
-                               x11-libs/libXaw
        )"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}