diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2006-11-07 20:39:54 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2006-11-07 20:39:54 +0000 |
| commit | 922e6b226fcba2fdbb89a730da48d0e95b47079b (patch) | |
| tree | b3b5232125327928d9bb774ebcfa00844e1e0117 /media-libs/netpbm | |
| parent | Marked stable on x86. (diff) | |
| download | gentoo-2-922e6b226fcba2fdbb89a730da48d0e95b47079b.tar.gz gentoo-2-922e6b226fcba2fdbb89a730da48d0e95b47079b.tar.bz2 gentoo-2-922e6b226fcba2fdbb89a730da48d0e95b47079b.zip | |
Added the jpeg2k use flag to make the media-libs/jasper dependency optional. Fixes bug #154353.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'media-libs/netpbm')
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/netpbm/metadata.xml | 5 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.36.0.ebuild | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 6e3b02e59ec5..ee36a65efa99 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.133 2006/10/31 10:15:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.134 2006/11/07 20:39:54 betelgeuse Exp $ + + 07 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> ChangeLog: + Added the jpeg2k use flag to make the media-libs/jasper dependency optional. + Fixes bug #154353. *netpbm-10.26.33 (31 Oct 2006) diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml index c90d8d48bd03..e770d1bc9a96 100644 --- a/media-libs/netpbm/metadata.xml +++ b/media-libs/netpbm/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>media-gfx</herd> -<maintainer> -<email>graphics@gentoo.org</email> -</maintainer> +<herd>graphics</herd> </pkgmetadata> diff --git a/media-libs/netpbm/netpbm-10.36.0.ebuild b/media-libs/netpbm/netpbm-10.36.0.ebuild index a4abaa5a1c7c..0582cc7cec18 100644 --- a/media-libs/netpbm/netpbm-10.36.0.ebuild +++ b/media-libs/netpbm/netpbm-10.36.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.36.0.ebuild,v 1.2 2006/10/22 09:14:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.36.0.ebuild,v 1.3 2006/11/07 20:39:54 betelgeuse Exp $ inherit flag-o-matic toolchain-funcs eutils multilib @@ -13,16 +13,16 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="svga jpeg tiff png xml zlib" +IUSE="svga jpeg jpeg2k tiff png xml zlib" DEPEND="jpeg? ( >=media-libs/jpeg-6b ) + jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.5 ) png? ( >=media-libs/libpng-1.2.1 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) svga? ( media-libs/svgalib ) media-libs/jbigkit - media-libs/jasper media-libs/urt" netpbm_libtype() { @@ -45,6 +45,10 @@ netpbm_config() { use $1 && echo -l${2:-$1} || echo NONE } +netpbm_jasper() { + use !jpeg2k && echo NONE +} + src_unpack() { unpack ${A} cd "${S}" @@ -83,7 +87,7 @@ src_unpack() { JBIGLIB = -ljbig JBIGHDR_DIR = JASPERLIB = -ljasper - JASPERHDR_DIR = + JASPERHDR_DIR = $(netpbm_jasper) URTLIB = -lrle URTHDR_DIR = EOF |