Cleanup previous commit and make jbig/urt optional via USE=jbig/rle #154535.

Package-Manager: portage-2.1.2_rc1-r5

3 files changed, 27 insertions, 26 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index ee36a65efa99..198491dad249 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.134 2006/11/07 20:39:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.135 2006/11/09 08:41:10 vapier Exp $
+
+  09 Nov 2006; Mike Frysinger <vapier@gentoo.org> netpbm-10.36.0.ebuild:
+  Cleanup previous commit and make jbig/urt optional via USE=jbig/rle #154535.
 
   07 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> ChangeLog:
   Added the jpeg2k use flag to make the media-libs/jasper dependency optional.
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 77edee8df6ae..0673577dc3dc 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -47,14 +47,14 @@ EBUILD netpbm-10.34.ebuild 3207 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5
 MD5 bf474a5af02f5038b9fc6688242ac5fa netpbm-10.34.ebuild 3207
 RMD160 c02448c9092821ea29ecb8c045a7906dccf547c5 netpbm-10.34.ebuild 3207
 SHA256 202b73c0274774c0f69f03d2f4015001c71e942b1f3edcea8bde5bde16f8af9a netpbm-10.34.ebuild 3207
-EBUILD netpbm-10.36.0.ebuild 3195 RMD160 b916022a2a3c1bfebcd2e428e29584c04ea6a78e SHA1 de10a89c4f66a77f258f1536e2f87e401bbae9ed SHA256 25f30737249bdfef09c098341af71a5adc2521eea64801deb80b4639215ead93
-MD5 628a7dfc582790bc20ba7925f15e778c netpbm-10.36.0.ebuild 3195
-RMD160 b916022a2a3c1bfebcd2e428e29584c04ea6a78e netpbm-10.36.0.ebuild 3195
-SHA256 25f30737249bdfef09c098341af71a5adc2521eea64801deb80b4639215ead93 netpbm-10.36.0.ebuild 3195
-MISC ChangeLog 19228 RMD160 634f0177ac1a93eb7d1b4729ca66d97ae895a40a SHA1 832b0974e858f1c390374a835393459fe508db62 SHA256 d6e535aa72fd64dd56c7bf195a777e9174461b32cb8e5119b38a9ff9d79171d4
-MD5 6756aaf804e31739ec6e2956c175b9e5 ChangeLog 19228
-RMD160 634f0177ac1a93eb7d1b4729ca66d97ae895a40a ChangeLog 19228
-SHA256 d6e535aa72fd64dd56c7bf195a777e9174461b32cb8e5119b38a9ff9d79171d4 ChangeLog 19228
+EBUILD netpbm-10.36.0.ebuild 3218 RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644c SHA1 aa75d4035f7fc2ce881a5265c27b7c6bf1c138a4 SHA256 728d5b4e14a55530c87e19427d76c3b57cee56300461b45aa8ffc195370a6785
+MD5 b87e62654219acbec592fe5464aca988 netpbm-10.36.0.ebuild 3218
+RMD160 ccf9085f621c589ab329eafb1aef6be1ae38644c netpbm-10.36.0.ebuild 3218
+SHA256 728d5b4e14a55530c87e19427d76c3b57cee56300461b45aa8ffc195370a6785 netpbm-10.36.0.ebuild 3218
+MISC ChangeLog 19377 RMD160 953dbf6416c693c3fc2c2fff0e6a801f5fb882e2 SHA1 38aa949e90cc40b3ae605b6ef8baaf17ea71c17b SHA256 c78c10b3e414eb435acb561d8ca367e46f05897988f0f8bece9f3862ada4ef1d
+MD5 f4f26d5c0daa4b67719b16c7478f5244 ChangeLog 19377
+RMD160 953dbf6416c693c3fc2c2fff0e6a801f5fb882e2 ChangeLog 19377
+SHA256 c78c10b3e414eb435acb561d8ca367e46f05897988f0f8bece9f3862ada4ef1d ChangeLog 19377
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -74,7 +74,7 @@ SHA256 602a4f958a7818b28e7d08cc5cfffea28512524b89fb499233aaedff9bc9af86 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUO81cxLzpIGCsLQRAl9AAJ948pNBAmUf2gIoXaAnj2jttylokgCgmSzc
-Uw4kULa7o1nlwcDe+/svN+s=
-=x0SB
+iD8DBQFFUunZamhnQswr0vIRAtnSAJkBs2b+sZwT0XkW3MMwVHMROVeDyQCZAbVB
+pwVMFu68i6RWuwLZkB6uYRs=
+=XMv+
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.36.0.ebuild b/media-libs/netpbm/netpbm-10.36.0.ebuild
index 0582cc7cec18..883cfc6c751e 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.3 2006/11/07 20:39:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.36.0.ebuild,v 1.4 2006/11/09 08:41:10 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -13,7 +13,7 @@ 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 jpeg2k tiff png xml zlib"
+IUSE="jbig jpeg jpeg2k png rle svga tiff xml zlib"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	jpeg2k? ( media-libs/jasper )
@@ -22,8 +22,8 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	xml? ( dev-libs/libxml2 )
 	zlib? ( sys-libs/zlib )
 	svga? ( media-libs/svgalib )
-	media-libs/jbigkit
-	media-libs/urt"
+	jbig? ( media-libs/jbigkit )
+	rle? ( media-libs/urt )"
 
 netpbm_libtype() {
 	case ${CHOST} in
@@ -42,11 +42,11 @@ netpbm_ldshlib() {
 	esac
 }
 netpbm_config() {
-	use $1 && echo -l${2:-$1} || echo NONE
-}
-
-netpbm_jasper() {
-	use !jpeg2k && echo NONE
+	if use $1 ; then
+		[[ $2 != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
 }
 
 src_unpack() {
@@ -82,13 +82,11 @@ src_unpack() {
 	ZLIB = $(netpbm_config zlib z)
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
-
-	# Use system versions instead of bundled
 	JBIGLIB = -ljbig
-	JBIGHDR_DIR =
+	JBIGHDR_DIR = $(netpbm_config jbig "!")
 	JASPERLIB = -ljasper
-	JASPERHDR_DIR = $(netpbm_jasper)
-	URTLIB = -lrle
+	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
+	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
 	EOF
 }