Compile against newer libpng

5 files changed, 19 insertions, 56 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 5b27a08685bb..67c116343234 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/eog
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.3 2002/04/11 01:23:49 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.4 2002/04/12 23:26:13 seemant Exp $
+
+*eog-0.6-r4 (12 Apr 2002)
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> eog-0.6-r4.ebuild :
+
+  Compile against newer libpng
 
 *eog-0.6-r3
   11 Apr 2002; Spider <spider@gentoo.org eog-0.6-r3.ebuild:
diff --git a/media-gfx/eog/eog-0.6-r1.ebuild b/media-gfx/eog/eog-0.6-r1.ebuild
deleted file mode 100644
index 06a86a525417..000000000000
--- a/media-gfx/eog/eog-0.6-r1.ebuild
+++ /dev/null
@@ -1,45 +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>
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
-
-RDEPEND="virtual/glibc
-        >=gnome-base/gconf-1.0.4-r2
-        >=gnome-base/bonobo-1.0.9-r1"
-
-DEPEND="${RDEPEND}
-	virtual/glibc
-	nls? ( sys-devel/gettext )
-        >=dev-util/intltool-0.11"
-
-
-src_compile() {
-
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    ${myconf} || die
-	
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} 						\
-	     GCONG_CONFIG_SOURCE=xml=${D}/etc/gconf/gconf.xml.defaults 	\
-	     install || die
-
-	dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README 	\
-	      TODO MAINTAINERS
-}
-
diff --git a/media-gfx/eog/eog-0.6-r2.ebuild b/media-gfx/eog/eog-0.6-r4.ebuild
index 6210ff3f0f1e..83d336b11f4b 100644
--- a/media-gfx/eog/eog-0.6-r2.ebuild
+++ b/media-gfx/eog/eog-0.6-r4.ebuild
@@ -1,7 +1,7 @@
 # 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-gfx/eog/eog-0.6-r2.ebuild,v 1.1 2002/02/19 21:20:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.1 2002/04/12 23:26:13 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Eye of GNOME"
@@ -10,21 +10,25 @@ HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
 RDEPEND="virtual/glibc
 	>=gnome-base/gconf-1.0.4-r2
-	>=gnome-base/bonobo-1.0.9-r1"
+	>=gnome-base/bonobo-1.0.9-r1
+	>=gnome-base/gnome-print-0.25i
+	>=gnome-base/libglade-0.17
+	>=gnome-base/oaf-0.6.2
+	>=media-libs/gdk-pixbuf-0.16.0
+	jpeg? ( media-libs/jpeg )
+	png? ( 	media-libs/libpng 
+			sys-libs/zlib )"
 
 DEPEND="${RDEPEND}
-	virtual/glibc
-	nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11"
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )"
 
 
 src_compile() {
 
 	local myconf
 
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
+	use nls || myconf="--disable-nls"
 
 	./configure --host=${CHOST} \
 		--prefix=/usr \
@@ -46,4 +50,3 @@ src_install() {
 	dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README \
 		TODO MAINTAINERS
 }
-
diff --git a/media-gfx/eog/files/digest-eog-0.6-r2 b/media-gfx/eog/files/digest-eog-0.6-r2
deleted file mode 100644
index 941eb438c206..000000000000
--- a/media-gfx/eog/files/digest-eog-0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e843959ff17f847e27a3219ac6cafcc7 eog-0.6.tar.gz 425084
diff --git a/media-gfx/eog/files/digest-eog-0.6-r1 b/media-gfx/eog/files/digest-eog-0.6-r4
index 941eb438c206..941eb438c206 100644
--- a/media-gfx/eog/files/digest-eog-0.6-r1
+++ b/media-gfx/eog/files/digest-eog-0.6-r4