From: Ulrich Müller <ulm@gentoo.org>
Date: Mon, 2 Apr 2018 12:59:42 +0000 (+0200)
Subject: app-text/texlive-core: Fix dependencies on X libraries.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3c7af84b0249e361487b7dfe866543dd76b83880;p=gentoo.git

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 8c72c8131fdf..47aad70342f7 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 968bc1ce9d0d..bba5cd905113 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 1b5dcd1fa851..b16827b3d88b 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 ff44aa3df6ce..c9ceadb3c5b9 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 47ea8a2715fe..a7e745fa176e 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}