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 383dfdd8a991a4eb44edbfce0b35f0275545224d..f1a8586df015d40224e38fee8f409dfb36f97ae2 100644 (file)
--- 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 c8aabf7c905289eacccd0d0e283a4fa4a9215b69..c3904450efc7700c07a8084b64e2f97b4b28865a 100644 (file)
--- 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 e887936e67f010c98133eb6c25595b67321a377e..d3b626eef826db449904ce79457cde08d11168e1 100644 (file)
--- 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 c578ddf3023df28757c77f9a30c0371bfaf71432..556bbaf02b12247c232eb15b4741de4967b8492f 100644 (file)
--- 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