new release & bugfix patch

9 files changed, 86 insertions, 63 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index d224c287360c..2ddd52cd8636 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/eog
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.75 2004/11/12 03:12:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.76 2004/11/12 17:24:18 foser Exp $
+
+*eog-2.8.1 (12 nov 2004)
+
+  12 Nov 2004; foser <foser@gentoo.org> eog-2.8.1.ebuild :
+  New release
+
+  12 Nov 2004; foser <foser@gentoo.org> eog-2.8.0.ebuild :
+  Add patch to fix building with USE=-jpeg, reported on irc by geoman
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> eog-2.8.0.ebuild:
   Stable on sparc
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index f566a87342b8..f625f1192a4b 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,16 +1,19 @@
-MD5 eccd07ea83b65c221dfe0f29be38ee58 ChangeLog 8153
-MD5 bc036c5a072ba31b5bb6ead1d4e81b88 eog-0.6-r4.ebuild 1195
+MD5 add5b8abc7e32acb2fbf40296a2ea89f eog-2.8.0.ebuild 1053
 MD5 47edb7933c5e46f8b4ce1378d59962f5 eog-2.4.0.ebuild 994
-MD5 f3fceea8d58c7d4ee9aaa14255a11039 eog-2.4.1.ebuild 995
-MD5 086d3091d5e47bcde23c25307682a8b5 eog-2.6.0.ebuild 1059
 MD5 0af0c44eb0b78a0f85b3560361153a4d eog-2.6.1.ebuild 1182
+MD5 bc036c5a072ba31b5bb6ead1d4e81b88 eog-0.6-r4.ebuild 1195
+MD5 086d3091d5e47bcde23c25307682a8b5 eog-2.6.0.ebuild 1059
+MD5 5408b215bde52ea28eadc47c74ab4a6d eog-2.8.1.ebuild 1094
+MD5 f3fceea8d58c7d4ee9aaa14255a11039 eog-2.4.1.ebuild 995
+MD5 08167ddc33127133a07d0cf7cead5534 ChangeLog 8383
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 813af1e95a66f7067e061e2cb0976144 eog-2.8.0.ebuild 960
-MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
+MD5 ccb7573c48cc8ef504557fdcda5b2707 files/eog-2.8.0-jpeg_build.patch 1210
+MD5 f4785b67530bea551199881bc37d55d5 files/eog-0.6-version_locale_dirs.patch 828
 MD5 41a7979701c834c2af2d1c29e7a8a05d files/digest-eog-2.4.0 62
 MD5 e5e78d211c65b9819d1c4b6a8d8db042 files/digest-eog-2.4.1 62
 MD5 e4ce8f392d4068d662dccbe689f0a15b files/digest-eog-2.6.0 62
 MD5 33ac43d9bde575c401a8e0d7b5c262f1 files/digest-eog-2.6.1 62
-MD5 f4785b67530bea551199881bc37d55d5 files/eog-0.6-version_locale_dirs.patch 828
 MD5 180f0c1f7a0fe0c11a69f72afff884ee files/digest-eog-2.8.0 62
+MD5 b952acadaddc99ab2145ca54ba64b6b2 files/digest-eog-2.8.1 62
+MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
 MD5 41e5e4c0309cd1ceec58bee66659ffbb files/eog-2.6.1-libexif-0.6.patch 912
diff --git a/media-gfx/eog/eog-2.4.0.ebuild b/media-gfx/eog/eog-2.4.0.ebuild
deleted file mode 100644
index 85fe64bf8bc2..000000000000
--- a/media-gfx/eog/eog-2.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.4.0.ebuild,v 1.11 2004/06/24 22:35:54 agriffis Exp $
-
-inherit gnome2
-
-IUSE="jpeg"
-
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-
-RDEPEND=">=x11-libs/gtk+-2.2.1
-	>=gnome-base/gconf-2.2
-	dev-libs/popt
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomecanvas-2
-
-	>=gnome-base/libbonoboui-2.3.3
-
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/eel-2.2
-	>=media-libs/libart_lgpl-2.2
-
-	>=gnome-base/libgnomeprintui-2.2.1.1
-	jpeg? ( >=media-libs/libexif-0.5.10
-		media-libs/jpeg )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} $(use_with jpeg libjpeg)"
-
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
diff --git a/media-gfx/eog/eog-2.8.0.ebuild b/media-gfx/eog/eog-2.8.0.ebuild
index 87849ec755e3..4cb92fb0855d 100644
--- a/media-gfx/eog/eog-2.8.0.ebuild
+++ b/media-gfx/eog/eog-2.8.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.8.0.ebuild,v 1.4 2004/11/12 03:12:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.8.0.ebuild,v 1.5 2004/11/12 17:24:18 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Eye Of Gnome, an image viewer"
 HOMEPAGE="http://www.gnome.org/"
@@ -32,3 +32,13 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} $(use_with jpeg libjpeg) $(use_with jpeg libexif)"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-jpeg_build.patch
+
+}
+
diff --git a/media-gfx/eog/eog-2.6.0.ebuild b/media-gfx/eog/eog-2.8.1.ebuild
index 2bd1ac9f44a9..d531d6a5b7e1 100644
--- a/media-gfx/eog/eog-2.6.0.ebuild
+++ b/media-gfx/eog/eog-2.8.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.6.0.ebuild,v 1.9 2004/07/04 18:50:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.8.1.ebuild,v 1.1 2004/11/12 17:24:18 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Eye Of Gnome, an image viewer"
 HOMEPAGE="http://www.gnome.org/"
@@ -10,20 +10,17 @@ LICENSE="GPL-2"
 
 SLOT="1"
 IUSE="jpeg"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 
 RDEPEND=">=x11-libs/gtk+-2.4
-	>=gnome-base/gconf-2.5.90
+	>=gnome-base/gconf-2.6
 	dev-libs/popt
-	>=gnome-base/gnome-vfs-2.5.91
-	>=gnome-base/libgnomeui-2.5.92
-	>=gnome-base/libgnomecanvas-2.5.92
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.5.4
-	>=gnome-base/libglade-2.3.6
+	>=gnome-base/gnome-vfs-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomecanvas-2.6
+	>=gnome-base/libglade-2.4
 	>=media-libs/libart_lgpl-2.3.16
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/eel-2.5.90
+	>=gnome-base/eel-2.6
 	jpeg? ( >=media-libs/libexif-0.5.12
 		media-libs/jpeg )"
 
@@ -35,3 +32,13 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} $(use_with jpeg libjpeg) $(use_with jpeg libexif)"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# build fix without jpeg support
+	epatch ${FILESDIR}/${PN}-2.8.0-jpeg_build.patch
+
+}
diff --git a/media-gfx/eog/files/digest-eog-2.4.0 b/media-gfx/eog/files/digest-eog-2.4.0
deleted file mode 100644
index 654188274534..000000000000
--- a/media-gfx/eog/files/digest-eog-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 daebc6c3dbce24e72141437568a2618d eog-2.4.0.tar.bz2 690213
diff --git a/media-gfx/eog/files/digest-eog-2.6.0 b/media-gfx/eog/files/digest-eog-2.6.0
deleted file mode 100644
index 70befb61228e..000000000000
--- a/media-gfx/eog/files/digest-eog-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7570aa11e8bfbf707b3cc6c3774e11af eog-2.6.0.tar.bz2 809205
diff --git a/media-gfx/eog/files/digest-eog-2.8.1 b/media-gfx/eog/files/digest-eog-2.8.1
new file mode 100644
index 000000000000..b773e0acdc35
--- /dev/null
+++ b/media-gfx/eog/files/digest-eog-2.8.1
@@ -0,0 +1 @@
+MD5 2bad4006f3ccf15b0153d7b9facbc961 eog-2.8.1.tar.bz2 834279
diff --git a/media-gfx/eog/files/eog-2.8.0-jpeg_build.patch b/media-gfx/eog/files/eog-2.8.0-jpeg_build.patch
new file mode 100644
index 000000000000..80cad2b98c26
--- /dev/null
+++ b/media-gfx/eog/files/eog-2.8.0-jpeg_build.patch
@@ -0,0 +1,35 @@
+diff -uNr eog-2.8.0/libeog/eog-image.c eog-2.8.0.patched/libeog/eog-image.c
+--- eog-2.8.0/libeog/eog-image.c	2004-09-12 19:42:51.000000000 +0200
++++ eog-2.8.0.patched/libeog/eog-image.c	2004-11-12 17:50:10.316509248 +0100
+@@ -1409,13 +1409,15 @@
+ 			     _("Temporary file creation failed."));
+ 		return FALSE;
+ 	}
+-	
++
++#if HAVE_JPEG
+ 	/* determine kind of saving */
+ 	if ((g_ascii_strcasecmp (source->format, EOG_FILE_FORMAT_JPEG) == 0) && 
+ 	    source->exists && source->modified) 
+ 	{
+ 		success = eog_image_jpeg_save_file (img, tmpfile, source, NULL, error);
+ 	}
++#endif
+ 
+ 	if (!success && (*error == NULL)) {
+ 		success = gdk_pixbuf_save (priv->image, tmpfile, source->format, error, NULL);
+@@ -1541,11 +1543,14 @@
+ 		success = eog_image_copy_file (source, target, error);
+ 		direct_copy = success;
+ 	}
++
++#if HAVE_JPEG
+ 	else if ((g_ascii_strcasecmp (source->format, EOG_FILE_FORMAT_JPEG) == 0 && source->exists) ||
+ 		 (g_ascii_strcasecmp (target->format, EOG_FILE_FORMAT_JPEG) == 0))
+ 	{
+ 		success = eog_image_jpeg_save_file (img, tmpfile, source, target, error);
+ 	}
++#endif
+ 
+ 	if (!success && (*error == NULL)) {
+ 		success = gdk_pixbuf_save (priv->image, tmpfile, target->format, error, NULL);