New version 2.6.0.1, as requested in bug #68201. Marked 2.4.2 x86, and removed older versions

10 files changed, 30 insertions, 116 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 4d509dd40f7c..16f513260fdb 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.36 2004/09/02 23:52:11 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.37 2004/11/20 02:02:39 obz Exp $
+
+*gthumb-2.4.1 (20 Nov 2004)
+
+  20 Nov 2004; Mike Gardiner <obz@gentoo.org> -gthumb-2.2.0.ebuild,
+  -gthumb-2.4.0.ebuild, -gthumb-2.4.1.ebuild, gthumb-2.4.2.ebuild,
+  +gthumb-2.6.0.1.ebuild:
+  New version 2.6.0.1, as requested in bug #68201. Marked 2.4.2 x86, and
+  removed older versions
 
 *gthumb-2.4.2 (03 Sep 2004)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 1240f0f97389..9e85f975d39c 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,14 +1,10 @@
-MD5 7915acb93e86e8e0cb610dfdea43607d ChangeLog 4857
+MD5 e792855c893d1445d9f1cf1da1f03198 ChangeLog 5143
 MD5 05b5f15b4f7a36109e23d2aa94a2659c gthumb-0.13.ebuild 927
-MD5 f53841cb1de823c9975895df92c3e944 gthumb-2.2.0.ebuild 1336
 MD5 a50a02d7f9db8943bb5590a0ebae309d gthumb-2.2.1.ebuild 1355
-MD5 d73d661825abf66da31d668db91d08df gthumb-2.4.0.ebuild 1113
-MD5 d447b8e0a06ab4d04489354dd01b6b29 gthumb-2.4.1.ebuild 1111
-MD5 f9880e8069fcd416d7f6938695c175cb gthumb-2.4.2.ebuild 1106
+MD5 817076bf38c527b4e45fc33401212907 gthumb-2.4.2.ebuild 1106
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 ab194fa8f0ac3f4d56b16fb2d884e193 gthumb-2.6.0.1.ebuild 1133
 MD5 6552832e528ea12ac21ec464c103fc2f files/digest-gthumb-0.13 63
-MD5 86d5d66d8c44372a7b7b714df44fd2b0 files/digest-gthumb-2.2.0 66
 MD5 5a89428bf41c5a2b145050b35fc6a957 files/digest-gthumb-2.2.1 66
-MD5 909f84b7b5d5f56989fe47b9d45dd1e2 files/digest-gthumb-2.4.0 66
-MD5 a1448be758639310d9919582760e1ca0 files/digest-gthumb-2.4.1 66
 MD5 f4224ee6699609a1b5c45e32f6589a89 files/digest-gthumb-2.4.2 66
+MD5 314c6396de9d98ce29ca2da8565b0661 files/digest-gthumb-2.6.0.1 68
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.2.0 b/media-gfx/gthumb/files/digest-gthumb-2.2.0
deleted file mode 100644
index 028eee2f96db..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8292dc34f5152c4462c4e6b88184e6eb gthumb-2.2.0.tar.bz2 1413992
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.4.0 b/media-gfx/gthumb/files/digest-gthumb-2.4.0
deleted file mode 100644
index 96a391bbab7e..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ee34f4112df0917379c160a498bf59e gthumb-2.4.0.tar.bz2 1868832
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.4.1 b/media-gfx/gthumb/files/digest-gthumb-2.4.1
deleted file mode 100644
index 5738d87633f2..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c08de20e8c513c6011987ee4f3cd6200 gthumb-2.4.1.tar.bz2 1871133
diff --git a/media-gfx/gthumb/files/digest-gthumb-2.6.0.1 b/media-gfx/gthumb/files/digest-gthumb-2.6.0.1
new file mode 100644
index 000000000000..b68d1d29ddeb
--- /dev/null
+++ b/media-gfx/gthumb/files/digest-gthumb-2.6.0.1
@@ -0,0 +1 @@
+MD5 95033385f82c4e68355a933236f552ed gthumb-2.6.0.1.tar.bz2 2022419
diff --git a/media-gfx/gthumb/gthumb-2.2.0.ebuild b/media-gfx/gthumb/gthumb-2.2.0.ebuild
deleted file mode 100644
index ae75cdf1ba3d..000000000000
--- a/media-gfx/gthumb/gthumb-2.2.0.ebuild
+++ /dev/null
@@ -1,50 +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/gthumb/gthumb-2.2.0.ebuild,v 1.4 2004/06/24 22:41:30 agriffis Exp $
-
-inherit gnome2
-
-IUSE="jpeg tiff png"
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libbonobo-2.3.3
-	>=gnome-base/libbonoboui-2.3.3
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.21"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-
-MAKEOPTS="-j2"
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Due to a mistake in slotting this package it may be that gthumb-2.0.1"
-	einfo "is shown to be installed alongside this release."
-	einfo "To fix this issue 'emerge -C =gthumb-2.0*' as root, this should"
-	einfo "have no influence on your current installed gthumb."
-
-}
diff --git a/media-gfx/gthumb/gthumb-2.4.1.ebuild b/media-gfx/gthumb/gthumb-2.4.1.ebuild
deleted file mode 100644
index 2cc321b8356c..000000000000
--- a/media-gfx/gthumb/gthumb-2.4.1.ebuild
+++ /dev/null
@@ -1,40 +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/gthumb/gthumb-2.4.1.ebuild,v 1.1 2004/07/31 04:37:43 spider Exp $
-
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
-
-IUSE="jpeg tiff png gphoto2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-# FIXME : configure switches, no autodetection
-
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libbonobo-2.3.3
-	>=gnome-base/libbonoboui-2.3.3
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg
-		>=media-libs/libexif-0.5.12 )
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
diff --git a/media-gfx/gthumb/gthumb-2.4.2.ebuild b/media-gfx/gthumb/gthumb-2.4.2.ebuild
index 8ea1a54af87d..f7b01b1cb1e4 100644
--- a/media-gfx/gthumb/gthumb-2.4.2.ebuild
+++ b/media-gfx/gthumb/gthumb-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.4.2.ebuild,v 1.2 2004/10/30 21:15:45 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.4.2.ebuild,v 1.3 2004/11/20 02:02:39 obz Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 
 IUSE="jpeg tiff png gphoto2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc amd64"
+KEYWORDS="x86 ~ppc amd64"
 
 # FIXME : configure switches, no autodetection
 
diff --git a/media-gfx/gthumb/gthumb-2.4.0.ebuild b/media-gfx/gthumb/gthumb-2.6.0.1.ebuild
index 8a759e4ea8ea..cd5c2cde912e 100644
--- a/media-gfx/gthumb/gthumb-2.4.0.ebuild
+++ b/media-gfx/gthumb/gthumb-2.6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.4.0.ebuild,v 1.2 2004/06/24 22:41:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.6.0.1.ebuild,v 1.1 2004/11/20 02:02:39 obz Exp $
 
 inherit gnome2
 
@@ -14,18 +14,19 @@ KEYWORDS="~x86 ~ppc ~amd64"
 
 # FIXME : configure switches, no autodetection
 
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2
+RDEPEND=">=dev-libs/glib-2.4
+	>=x11-libs/gtk+-2.4
 	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libbonobo-2.3.3
-	>=gnome-base/libbonoboui-2.3.3
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomecanvas-2.6
+	>=gnome-base/gnome-vfs-2.6
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.6
+	>=gnome-base/libbonobo-2.6
+	>=gnome-base/libbonoboui-2.6
+	>=gnome-base/gconf-2.6
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	jpeg? ( media-libs/jpeg
@@ -38,3 +39,4 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29"
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+