commit:     11e8eacf3a970b8bc343b08eafa987b602abd6cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 15:43:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 15:48:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=11e8eacf

app-office/calligra: Drop IUSE=jpeg2k

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/calligra/calligra-2.9.11-r1.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index ef0d5a3c..31813b17 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # note: files that need to be checked for dependencies etc:
@@ -12,7 +12,7 @@ KDE_HANDBOOK="optional"
 KDE_LINGUAS_LIVE_OVERRIDE="true"
 OPENGL_REQUIRED="optional"
 WEBKIT_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
+inherit check-reqs kde4-base
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="https://calligra.org/";
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="amd64 x86"
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
-+gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
++gsf gsl import-filter +jpeg +lcms mysql openexr +pdf +pim
 postgres spacenav sybase test tiff +threads +truetype +xml"
 
 # Don't use Active, it's broken on desktops.
@@ -70,7 +70,6 @@ RDEPEND="
                media-libs/libvisio
        )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/openjpeg:0 )
        lcms? (
                media-libs/lcms:2
                x11-libs/libX11
@@ -109,7 +108,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
        x11-misc/shared-mime-info
 "
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-2.9:4"
 
 # bug 394273
 RESTRICT=test
@@ -174,7 +173,7 @@ src_configure() {
                -DWITH_LibWpg=$(usex import-filter)
                -DWITH_LibWps=$(usex import-filter)
                -DWITH_JPEG=$(usex jpeg)
-               -DWITH_OpenJPEG=$(usex jpeg2k)
+               -DWITH_OpenJPEG=OFF
                -DWITH_Kdcraw=OFF
                -DWITH_LCMS2=$(usex lcms)
                -DWITH_MySQL=$(usex mysql)

Reply via email to