gnome 2.6 commit

8 files changed, 43 insertions, 63 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index c25b41edb024..dde45420a2a2 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.51 2004/03/16 23:39:34 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.52 2004/03/21 14:53:33 foser Exp $
+
+*yelp-2.5.91 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> yelp-2.5.91.ebuild :
+  Gnome 2.6 commit
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> yelp-2.4.2.ebuild:
   Added ~mips keyword.
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 33b913102aab..8926736c989b 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,11 +1,9 @@
-MD5 a13befa0c69be4ed23731ba28ec69653 yelp-2.2.2.ebuild 739
 MD5 4883f2491b85def270c38f614d45341e yelp-2.4.0.ebuild 777
 MD5 ced82bcc752bff2b17660b49694b08f1 yelp-2.4.2.ebuild 871
-MD5 6afb7958609f26243b5dd6a0c0ab4498 yelp-2.2.0.ebuild 748
-MD5 715b75351656014219b42cb60feef435 ChangeLog 5524
+MD5 5f1eef47795db3aea8bb068fff184b06 yelp-2.5.91.ebuild 860
+MD5 d3b5d64046d697265f399e710d8fda96 ChangeLog 5632
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8419eadd0bd13b4b812ed33d93b503dd files/digest-yelp-2.2.0 63
-MD5 ad9ace3f0641b0f9e67be340fe3c2532 files/digest-yelp-2.2.2 63
+MD5 1f1d30b36d33ad43e8d3ffef06cfab5d files/digest-yelp-2.5.91 64
 MD5 d4365ca569e429f34426e755a884809d files/digest-yelp-2.4.0 63
 MD5 5c3187494762706268a83d298ed70ed1 files/digest-yelp-2.4.2 63
 MD5 d3fa3016a8d381dc0bd303a75bc88538 files/yelp-2-speed_fix.patch 14137
diff --git a/gnome-extra/yelp/files/digest-yelp-2.2.0 b/gnome-extra/yelp/files/digest-yelp-2.2.0
deleted file mode 100644
index 18c7493e5a88..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1148afe2578ad50be59a591677946a4c yelp-2.2.0.tar.bz2 489831
diff --git a/gnome-extra/yelp/files/digest-yelp-2.2.2 b/gnome-extra/yelp/files/digest-yelp-2.2.2
deleted file mode 100644
index 76cd7721544c..000000000000
--- a/gnome-extra/yelp/files/digest-yelp-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ee551150aba8f86003bf1c41b32cf9f yelp-2.2.2.tar.bz2 563355
diff --git a/gnome-extra/yelp/files/digest-yelp-2.5.91 b/gnome-extra/yelp/files/digest-yelp-2.5.91
new file mode 100644
index 000000000000..3204bdd4d651
--- /dev/null
+++ b/gnome-extra/yelp/files/digest-yelp-2.5.91
@@ -0,0 +1 @@
+MD5 fc6fd9b1ee77a1f353be528874a25a1b yelp-2.5.91.tar.bz2 575254
diff --git a/gnome-extra/yelp/yelp-2.2.0.ebuild b/gnome-extra/yelp/yelp-2.2.0.ebuild
deleted file mode 100644
index ce061437ed84..000000000000
--- a/gnome-extra/yelp/yelp-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.2.0.ebuild,v 1.14 2003/07/15 13:10:32 todd Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa"
-
-RDEPEND="gnome-base/ORBit2
-	>=dev-libs/glib-2.0.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2.2*
-	>=dev-libs/libxslt-1.0.15
-	>=gnome-base/libglade-2"
-DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.2.2.ebuild b/gnome-extra/yelp/yelp-2.2.2.ebuild
deleted file mode 100644
index 2157a422fe1a..000000000000
--- a/gnome-extra/yelp/yelp-2.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.2.2.ebuild,v 1.5 2003/08/04 21:45:59 gmsoft Exp $
-
-inherit gnome2
-
-DESCRIPTION="Help browser for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha amd64 hppa"
-
-RDEPEND=">=dev-libs/glib-2.0.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2.0.2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=gnome-extra/libgtkhtml-2.2*
-	>=dev-libs/libxslt-1.0.15
-	>=gnome-base/libglade-2"
-
-DEPEND="${RDEPEND}
-	dev-libs/popt
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
diff --git a/gnome-extra/yelp/yelp-2.5.91.ebuild b/gnome-extra/yelp/yelp-2.5.91.ebuild
new file mode 100644
index 000000000000..80091180c246
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.5.91.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.5.91.ebuild,v 1.1 2004/03/21 14:53:33 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+
+RDEPEND=">=x11-libs/gtk+-2.3.1
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnome-2.0.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libbonobo-2
+	=gnome-extra/libgtkhtml-2*
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-base/libglade-2
+	dev-libs/popt
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"