--- /root/netpbm-10.36.0.ebuild	2006-11-09 09:56:36.000000000 +0200
+++ netpbm-10.36.0.ebuild	2006-11-09 10:14:58.000000000 +0200
@@ -13,7 +13,7 @@
 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="svga jbig jpeg jpeg2k tiff png xml zlib rle"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	jpeg2k? ( media-libs/jasper )
@@ -22,8 +22,8 @@
 	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
@@ -45,8 +45,8 @@
 	use $1 && echo -l${2:-$1} || echo NONE
 }
 
-netpbm_jasper() {
-	use !jpeg2k && echo NONE
+netpbm_hdr_config() {
+	use !${1} && echo NONE
 }
 
 src_unpack() {
@@ -82,14 +82,14 @@
 	ZLIB = $(netpbm_config zlib z)
 	LINUXSVGALIB = $(netpbm_config svga vga)
 	XML2_LIBS = $(netpbm_config xml xml2)
+	URTLIB = $(netpbm_config rle)
 
 	# Use system versions instead of bundled
 	JBIGLIB = -ljbig
-	JBIGHDR_DIR =
+	JBIGHDR_DIR = $(netpbm_hdr_config jbig)
 	JASPERLIB = -ljasper
-	JASPERHDR_DIR = $(netpbm_jasper)
-	URTLIB = -lrle
-	URTHDR_DIR =
+	JASPERHDR_DIR = $(netpbm_hdr_config jpeg2k)
+	URTHDR_DIR = 
 	EOF
 }