commit:     3c7af84b0249e361487b7dfe866543dd76b83880
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 12:59:42 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 13:00:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7af84b

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

 app-text/texlive-core/texlive-core-2015-r1.ebuild | 6 ++----
 app-text/texlive-core/texlive-core-2016-r5.ebuild | 6 ++----
 app-text/texlive-core/texlive-core-2016-r6.ebuild | 4 +---
 app-text/texlive-core/texlive-core-2017-r2.ebuild | 6 ++----
 app-text/texlive-core/texlive-core-2017-r3.ebuild | 4 +---
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app-text/texlive-core/texlive-core-2015-r1.ebuild 
b/app-text/texlive-core/texlive-core-2015-r1.ebuild
index 8c72c8131fd..47aad70342f 100644
--- 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 968bc1ce9d0..bba5cd90511 100644
--- 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 1b5dcd1fa85..b16827b3d88 100644
--- 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 ff44aa3df6c..c9ceadb3c5b 100644
--- 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 47ea8a2715f..a7e745fa176 100644
--- 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}

Reply via email to