Changing depend and configure script

4 files changed, 52 insertions, 16 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 75043274948e..6dbec443f4e9 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.38 2004/01/14 18:13:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.39 2004/01/27 20:09:16 mholzer Exp $
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> netpbm-10.11.14.ebuild,
+  netpbm-10.11.15.ebuild:
+  Changing depend and configure script
 
 *netpbm-10.11.15 (14 Jan 2004)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 9ae506f312d8..6d70c9fabe79 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,16 +1,14 @@
-MD5 f4032f5863dc85aedfae75c141bdcb2f ChangeLog 5962
-MD5 f6dfd4e3a22bb1cb929ce94dd72e2d87 netpbm-10.11.15.ebuild 1702
-MD5 c8e4166c7bb790a9b5cdb439fc0fb8b9 netpbm-10.11.14.ebuild 1701
+MD5 d095eeffc99d8c24bae31ec3f1c9ac91 ChangeLog 6102
+MD5 e90a1f14a0d2d9161d009ace72b716d3 netpbm-10.11.15.ebuild 2082
+MD5 9da072be2c2d09ac6fcf8d21791451a9 netpbm-10.11.14.ebuild 2081
 MD5 22e8f9ccaff0f3cc18a059b054d1a2e7 netpbm-10.11.5-r3.ebuild 1621
 MD5 3231ed5592124d02215bdb0223ff0d13 netpbm-9.12-r4.ebuild 1523
-MD5 9202056bb3b1f6829689e857fd4cbc56 netpbm-10.18.6.ebuild 1885
 MD5 9d9feb6855fc25f586e5300172d12518 netpbm-10.19.ebuild 1702
 MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
 MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
 MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
 MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
 MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
-MD5 4c93198f3b382c938e2dfe5f5fe3464d files/digest-netpbm-10.18.6 64
 MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
 MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
 MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
diff --git a/media-libs/netpbm/netpbm-10.11.14.ebuild b/media-libs/netpbm/netpbm-10.11.14.ebuild
index 654a45f5df95..753cfca53669 100644
--- a/media-libs/netpbm/netpbm-10.11.14.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.6 2004/01/14 18:13:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.7 2004/01/27 20:09:16 mholzer Exp $
 
 inherit flag-o-matic
 
@@ -12,12 +12,13 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ia64"
-IUSE="svga"
+IUSE="svga jpeg tiff png zlib"
 RESTRICT="nomirror"
 
-DEPEND=">=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.2.1
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	zlib? ( sys-libs/zlib )
 	svga? ( media-libs/svgalib )"
 
 src_unpack() {
@@ -30,6 +31,22 @@ src_unpack() {
 	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
+	if [ `use jpeg` ] ; then
+	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+	fi
+
+	if [ `use png` ] ; then
+	echo "PNGLIB = libpng.so" >> Makefile.config
+	fi
+
+	if [ `use tiff` ] ; then
+	echo "TIFFLIB = libtiff.so" >> Makefile.config
+	fi
+
+	if [ `use zlib` ] ; then
+	echo "ZLIB = libz.so" >> Makefile.config
+	fi
+
 	# Sparc support ...
 	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
 	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
diff --git a/media-libs/netpbm/netpbm-10.11.15.ebuild b/media-libs/netpbm/netpbm-10.11.15.ebuild
index cd3f6e737078..dcf5f16ca110 100644
--- a/media-libs/netpbm/netpbm-10.11.15.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.15.ebuild,v 1.1 2004/01/14 18:13:21 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.15.ebuild,v 1.2 2004/01/27 20:09:16 mholzer Exp $
 
 inherit flag-o-matic
 
@@ -12,12 +12,13 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ~ia64"
-IUSE="svga"
+IUSE="svga jpeg tiff png zlib"
 RESTRICT="nomirror"
 
-DEPEND=">=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.2.1
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	zlib? ( sys-libs/zlib )
 	svga? ( media-libs/svgalib )"
 
 src_unpack() {
@@ -30,6 +31,22 @@ src_unpack() {
 	echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
 	fi
 
+	if [ `use jpeg` ] ; then
+	echo "JPEGLIB = libjpeg.so" >> Makefile.config
+	fi
+
+	if [ `use png` ] ; then
+	echo "PNGLIB = libpng.so" >> Makefile.config
+	fi
+
+	if [ `use tiff` ] ; then
+	echo "TIFFLIB = libtiff.so" >> Makefile.config
+	fi
+
+	if [ `use zlib` ] ; then
+	echo "ZLIB = libz.so" >> Makefile.config
+	fi
+
 	# Sparc support ...
 	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
 	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"