Compile against libpng-1.2.1

7 files changed, 21 insertions, 123 deletions

diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog
index 4ff0dd9b9441..3c21147c6ab3 100644
--- a/media-libs/imlib/ChangeLog
+++ b/media-libs/imlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/imlib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.4 2002/04/03 00:29:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.5 2002/04/12 18:47:27 seemant Exp $
+
+*imlib-1.9.13-r1 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> imlib-1.9.13-r2.ebuild :
+
+  Compile against newest libpng
 
   03 Apr 2002; M.Schlemmer <azarah@gentoo.org> imlib-1.9.13-r1.ebuild :
 
diff --git a/media-libs/imlib/files/digest-imlib-1.9.10-r3 b/media-libs/imlib/files/digest-imlib-1.9.10-r3
deleted file mode 100644
index ad881d7ee3af..000000000000
--- a/media-libs/imlib/files/digest-imlib-1.9.10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47323fff0f9209abd2fc0f738d63424e imlib-1.9.10.tar.gz 717554
diff --git a/media-libs/imlib/files/digest-imlib-1.9.11-r1 b/media-libs/imlib/files/digest-imlib-1.9.11-r1
deleted file mode 100644
index 0b5c8d620da3..000000000000
--- a/media-libs/imlib/files/digest-imlib-1.9.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed50588bb7dbc00b177ba61926e6e0d0 imlib-1.9.11.tar.gz 758757
diff --git a/media-libs/imlib/files/digest-imlib-1.9.13 b/media-libs/imlib/files/digest-imlib-1.9.13-r2
index d40c6d3416e5..d40c6d3416e5 100644
--- a/media-libs/imlib/files/digest-imlib-1.9.13
+++ b/media-libs/imlib/files/digest-imlib-1.9.13-r2
diff --git a/media-libs/imlib/imlib-1.9.10-r3.ebuild b/media-libs/imlib/imlib-1.9.10-r3.ebuild
deleted file mode 100644
index 023b54d0eaf2..000000000000
--- a/media-libs/imlib/imlib-1.9.10-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.10-r3.ebuild,v 1.1 2002/02/14 18:39:38 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="imlib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 http://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-         ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.0.7
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libungif-4.1.0
-	>=sys-libs/zlib-1.1.3-r2
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/x11"
-
-src_compile() {
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/imlib \
-		|| die
-	emake
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc/imlib \
-		install || die
-
-  preplib /usr
-
-  dodoc AUTHORS COPYING* ChangeLog README
-  dodoc NEWS
-  docinto html
-  dodoc doc/*.gif doc/index.html
-}
-
-
-
diff --git a/media-libs/imlib/imlib-1.9.11-r1.ebuild b/media-libs/imlib/imlib-1.9.11-r1.ebuild
deleted file mode 100644
index 812b908b6611..000000000000
--- a/media-libs/imlib/imlib-1.9.11-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.11-r1.ebuild,v 1.1 2001/11/04 23:51:38 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="imlib"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-	 http://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
-         ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.0.7
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libungif-4.1.0
-	>=sys-libs/zlib-1.1.3-r2
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/x11"
-
-
-src_compile() {
-
-	./configure --host=${CHOST}			\
-		--prefix=/usr				\
-		--mandir=/usr/share/man			\
-		--infodir=/usr/share/info		\
-		--sysconfdir=/etc/imlib			\
-		|| die
-	emake
-}
-
-src_install() {
-
-	make prefix=${D}/usr				\
-		mandir=${D}/usr/share/man		\
-		infodir=${D}/usr/share/info		\
-		sysconfdir=${D}/etc/imlib		\
-		install || die
-	
-	preplib /usr
-	
-	dodoc AUTHORS COPYING* ChangeLog README NEWS
-	docinto html
-	dodoc doc/*.gif doc/*.html
-}
-
-
-
diff --git a/media-libs/imlib/imlib-1.9.13.ebuild b/media-libs/imlib/imlib-1.9.13-r2.ebuild
index 9032d047b78b..b0d21dc15a19 100644
--- a/media-libs/imlib/imlib-1.9.13.ebuild
+++ b/media-libs/imlib/imlib-1.9.13-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.13.ebuild,v 1.1 2002/03/17 21:45:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.13-r2.ebuild,v 1.1 2002/04/12 18:47:27 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Imlib is a general Image loading and rendering library."
@@ -10,28 +10,25 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz
 	 ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND="virtual/glibc
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.0.7
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libungif-4.1.0
-	>=sys-libs/zlib-1.1.3-r2
+DEPEND="virtual/x11
 	>=x11-libs/gtk+-1.2.10-r4
-	virtual/x11"
+	>=media-libs/tiff-3.5.5
+	gif? ( >=media-libs/giflib-4.1.0 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b )"
 
 src_compile() {
 	
 	#update libtool to fix "relink" bug
 	libtoolize --copy --force
-	aclocal
 
 	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--sysconfdir=/etc/imlib \
-		|| die
-	emake
+		--sysconfdir=/etc/imlib || die
+		
+	emake || die
 }
 
 src_install() {
@@ -42,11 +39,10 @@ src_install() {
 		sysconfdir=${D}/etc/imlib \
 		install || die
 
-  preplib /usr
+	preplib /usr
 
-  dodoc AUTHORS COPYING* ChangeLog README
-  dodoc NEWS
-  docinto html
-  dodoc doc/*.gif doc/index.html
+	dodoc AUTHORS COPYING* ChangeLog README
+	dodoc NEWS
+	dohtml -r doc
 }