New version 'n cleanup

8 files changed, 7 insertions, 90 deletions

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 748186aaef10..d14a5b7829eb 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,18 +1,12 @@
-MD5 446537ae2a9d23db2e31f0ab68646dec eog-2.4.0.ebuild 1056
+MD5 fc374ff1a3b32032a2211f02b0d7bfea eog-2.4.0.ebuild 977
 MD5 4992397a3fd3ede5df1a32443b348888 eog-2.2.1.ebuild 964
 MD5 71a6c1fcecf95d90c484fe9dd1df726e eog-0.6-r4.ebuild 1187
-MD5 c16be85c1617b2ab52e72d63221d82b0 eog-1.0.4.ebuild 1015
 MD5 f09f948eec785567b8c3ff78ac796533 eog-2.2.0.ebuild 913
-MD5 446537ae2a9d23db2e31f0ab68646dec eog-2.3.90.ebuild 1056
-MD5 792865719cda3de647a191adbed7c3b2 eog-1.0.3.ebuild 1072
-MD5 c4f80f4946fc472d5cabe770f24b8c5d ChangeLog 4644
+MD5 84350c10c4b47b2852b6ce6ca79c006a ChangeLog 4755
 MD5 8dedf0c598fce0be937a040d088d2c67 eog-2.2.2.ebuild 965
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 df49c6aa6aae55e947388f38dcf0d6fa files/digest-eog-1.0.3 62
-MD5 09951347d08fc8b5eab8405771a959ad files/digest-eog-1.0.4 62
 MD5 3588e1c18ba9376d9061078d9e9e0e1b files/digest-eog-2.2.0 62
 MD5 b3034328add36cac69c5431bc454bed4 files/digest-eog-2.2.1 62
 MD5 078bf6de0b825ccca79dcd09e43c4230 files/digest-eog-2.2.2 62
 MD5 41a7979701c834c2af2d1c29e7a8a05d files/digest-eog-2.4.0 62
 MD5 5f786f0751774fc1e127d27e4f0c31e9 files/digest-eog-0.6-r4 59
-MD5 ed345da0e379e2cb9e1e0a483e8d7a9f files/digest-eog-2.3.90 63
diff --git a/media-gfx/eog/eog-1.0.3.ebuild b/media-gfx/eog/eog-1.0.3.ebuild
deleted file mode 100644
index 1acc3e4f8a01..000000000000
--- a/media-gfx/eog/eog-1.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-1.0.3.ebuild,v 1.7 2003/02/13 12:31:40 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc  ppc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=x11-libs/gtk+-2.0.6
-	>=dev-libs/libxml2-2.4.24
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/bonobo-activation-1.0.3
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/libgnomeprint-1.116.0
-	>=gnome-base/librsvg-2.0.1
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2.1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS ChangeLog COPYING README* INSTALL NEWS HACKING  DEPENDS THANKS  TODO"
-
diff --git a/media-gfx/eog/eog-1.0.4.ebuild b/media-gfx/eog/eog-1.0.4.ebuild
deleted file mode 100644
index a56cd6872870..000000000000
--- a/media-gfx/eog/eog-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-1.0.4.ebuild,v 1.5 2003/02/13 12:31:44 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=x11-libs/gtk+-2.0.6
-	>=dev-libs/libxml2-2.4.24
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/bonobo-activation-1.0.3
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/libgnomeprint-1.116.0
-	>=gnome-base/librsvg-2.0.1
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2.1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS ChangeLog COPYING README* INSTALL NEWS HACKING  DEPENDS THANKS  TODO"
-
diff --git a/media-gfx/eog/eog-2.3.90.ebuild b/media-gfx/eog/eog-2.4.0.ebuild
index 01f052bf5281..0062688cfb2f 100644
--- a/media-gfx/eog/eog-2.3.90.ebuild
+++ b/media-gfx/eog/eog-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.3.90.ebuild,v 1.2 2003/09/08 05:09:18 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.4.0.ebuild,v 1.1 2003/09/10 13:34:41 foser Exp $
 
 inherit gnome2
 
@@ -15,6 +15,7 @@ KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 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
@@ -22,7 +23,6 @@ RDEPEND=">=x11-libs/gtk+-2.2.1
 	>=gnome-base/libbonoboui-2.3.3
 
 	>=gnome-base/libglade-2.0.1
-	>=gnome-base/librsvg-2.3
 	>=gnome-base/eel-2.2
 	>=media-libs/libart_lgpl-2.2
 
@@ -31,12 +31,8 @@ RDEPEND=">=x11-libs/gtk+-2.2.1
 		media-libs/jpeg )"
 
 DEPEND="${RDEPEND}
-	dev-libs/popt
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
-
-use jpeg \
-	&& G2CONF="${G2CONF} --with-libjpeg" \
-	|| G2CONF="${G2CONF} --without-libjpeg"
+G2CONF="${G2CONF} $(use_with jpeg libjpeg)"
 
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS HACKING DEPENDS THANKS  TODO"
diff --git a/media-gfx/eog/files/digest-eog-1.0.3 b/media-gfx/eog/files/digest-eog-1.0.3
deleted file mode 100644
index a9b6833b6d0f..000000000000
--- a/media-gfx/eog/files/digest-eog-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2495ca6d8061b5a74ebf02c5d8e0d27 eog-1.0.3.tar.bz2 360579
diff --git a/media-gfx/eog/files/digest-eog-1.0.4 b/media-gfx/eog/files/digest-eog-1.0.4
deleted file mode 100644
index eacd989304b6..000000000000
--- a/media-gfx/eog/files/digest-eog-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f60d5ad2cb208cc18ee8b97868ed925e eog-1.0.4.tar.bz2 373136
diff --git a/media-gfx/eog/files/digest-eog-2.3.90 b/media-gfx/eog/files/digest-eog-2.3.90
deleted file mode 100644
index d9721d33766e..000000000000
--- a/media-gfx/eog/files/digest-eog-2.3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f94fd9076b8df094526ffef1e80c0a3 eog-2.3.90.tar.bz2 687219
diff --git a/media-gfx/eog/files/digest-eog-2.4.0 b/media-gfx/eog/files/digest-eog-2.4.0
new file mode 100644
index 000000000000..654188274534
--- /dev/null
+++ b/media-gfx/eog/files/digest-eog-2.4.0
@@ -0,0 +1 @@
+MD5 daebc6c3dbce24e72141437568a2618d eog-2.4.0.tar.bz2 690213