From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 14 Jul 2018 07:38:42 +0000 (+0200)
Subject: app-office/libreoffice: Fix DEPENDs
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a77b6e583fcadcba8e3c72eb6af444b645f7c03;p=gentoo.git

app-office/libreoffice: Fix DEPENDs

Package-Manager: Portage-2.3.42, Repoman-2.3.9
---

diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 383dfdd8a991..f1a8586df015 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -210,8 +213,6 @@ fi
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index c8aabf7c9052..c3904450efc7 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -210,8 +213,6 @@ fi
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index e887936e67f0..d3b626eef826 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -210,8 +213,6 @@ fi
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c578ddf3023d..556bbaf02b12 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	>=dev-libs/liborcus-0.13.3
 	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	net-nds/openldap
 	sci-mathematics/lpsolve
+	sys-libs/zlib:=
 	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
@@ -210,8 +213,6 @@ fi
 #        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	sys-devel/gettext
 	sys-devel/ucpp
-	sys-libs/zlib
 	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt