media-libs/netpbm: [QA] Remove media-libs/jasper dep

Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 9beba62062d6700235eed9920aa359a55a5d20c7..82fe3af25620e9d9f4dc8282850949ea752e63fa 100644 (file)
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
        png? ( >=media-libs/libpng-1.4:0 )
        rle? ( media-libs/urt )
        svga? ( media-libs/svgalib )
@@ -81,7 +80,7 @@ src_prepare() {
        del=(
                pnmtofiasco fiascotopnm # We always disable fiasco
                $(usex jbig '' 'jbigtopnm pnmtojbig')
-               $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+               jpeg2ktopam pamtojpeg2k # jasper has been removed
                $(usex rle '' 'pnmtorle rletopnm')
                $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
        )
@@ -148,7 +147,7 @@ src_configure() {
        XML2_LIBS = $(netpbm_config xml xml2)
        JBIGLIB = $(netpbm_config jbig)
        JBIGHDR_DIR =
-       JASPERLIB = $(netpbm_config jpeg2k jasper)
+       JASPERLIB = NONE
        JASPERHDR_DIR =
        URTLIB = $(netpbm_config rle)
        URTHDR_DIR =

diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index d43ef5f78bfc14ddab4b5c8ba7ec44c03fb5dca2..97a05287f2093ec20bb7c4d36efd0410602a2b38 100644 (file)
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
        png? ( >=media-libs/libpng-1.4:0 )
        rle? ( media-libs/urt )
        svga? ( media-libs/svgalib )
@@ -74,7 +73,7 @@ src_prepare() {
                pnmtofiasco fiascotopnm # We always disable fiasco
                $(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
                $(usex jbig '' 'jbigtopnm pnmtojbig')
-               $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+               jpeg2ktopam pamtojpeg2k # jasper has been removed
                $(usex rle '' 'pnmtorle rletopnm')
                $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
        )
@@ -141,7 +140,7 @@ src_configure() {
        XML2_LIBS = $(netpbm_config xml xml2)
        JBIGLIB = $(netpbm_config jbig)
        JBIGHDR_DIR =
-       JASPERLIB = $(netpbm_config jpeg2k jasper)
+       JASPERLIB = NONE
        JASPERHDR_DIR =
        URTLIB = $(netpbm_config rle)
        URTHDR_DIR =

diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index af7d4100ce2d91151b4574f1d9a8aea399c37e3a..10dd2b062d5d999654cb4f8b00d98bf1dd52f4c7 100644 (file)
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
        png? ( >=media-libs/libpng-1.4:0 )
        postscript? ( app-text/ghostscript-gpl )
        rle? ( media-libs/urt )
@@ -137,7 +136,7 @@ src_configure() {
        XML2_LIBS = $(netpbm_config xml xml2)
        JBIGLIB = $(netpbm_config jbig)
        JBIGHDR_DIR =
-       JASPERLIB = $(netpbm_config jpeg2k jasper)
+       JASPERLIB = NONE
        JASPERHDR_DIR =
        URTLIB = $(netpbm_config rle)
        URTHDR_DIR =