gnome 2.6 commit

9 files changed, 22 insertions, 75 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index e91dbcdd3cb4..ad80b8727487 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.63 2004/03/16 23:35:46 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.64 2004/03/21 15:06:24 foser Exp $
+
+*libgtkhtml-2.5.6 (21 Mar 2004)
+
+  21 Mar 2004; foser <foser@gentoo.org> libgtkhtml-2.5.6.ebuild :
+  Gnome 2.6 commit
+  Add accessibility USE
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> libgtkhtml-2.4.1.ebuild:
   Added ~mips keyword.
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index b3f2f0468208..cdcde610b2cd 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,5 +1,6 @@
 MD5 64dbd28b739c22bf398c3fad86677456 libgtkhtml-3.0.9.ebuild 1534
 MD5 be22e9981cd26696daff51a734a2597a libgtkhtml-2.4.1.ebuild 857
+MD5 20643c9119d9bae139688ed42b6f8251 libgtkhtml-2.5.6.ebuild 917
 MD5 6af1138a071453845cfc2dd32638efcd libgtkhtml-3.0.8-r2.ebuild 1453
 MD5 f9c5fdd88edb0464ec95feb6c37be960 libgtkhtml-2.2.4.ebuild 851
 MD5 eaea8363ecb7b61317524187e5eb59d2 libgtkhtml-2.4.0.ebuild 856
@@ -16,6 +17,7 @@ MD5 59cd7ffde71d082b5c68834945dc71cc files/digest-libgtkhtml-2.2.3 69
 MD5 931991370c138ac1ef64cd5df5b57387 files/digest-libgtkhtml-2.2.4 69
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
+MD5 87795f7710e53c2e98455061b2860492 files/digest-libgtkhtml-2.5.6 69
 MD5 50c625f91326bee698360208ee9aa2cc files/digest-libgtkhtml-3.0.7 67
 MD5 9834c23269f27d4366fc45b9e0ecbec4 files/digest-libgtkhtml-3.0.9 67
 MD5 70d6bcd78d5175bb973a7a46c4bae08e files/digest-libgtkhtml-3.0.8-r2 67
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.1
deleted file mode 100644
index a3e7e33853ea..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afce0ccf5dfdb51e11fca830367f85e4 libgtkhtml-2.2.1.tar.bz2 333024
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.3 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.3
deleted file mode 100644
index a4c8e5ece7c2..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00ec0a1350143832f5bcb67a8db829ef libgtkhtml-2.2.3.tar.bz2 335078
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4
deleted file mode 100644
index b4e8e6302e87..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26443c4027470c4510d221af30a2c3f6 libgtkhtml-2.2.4.tar.bz2 338182
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6
new file mode 100644
index 000000000000..661a2d984a98
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.5.6
@@ -0,0 +1 @@
+MD5 19395d3ed0e93a1d48d477645029e56b libgtkhtml-2.5.6.tar.bz2 424521
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.2.1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.2.1.ebuild
deleted file mode 100644
index fb9d412902e0..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.2.1.ebuild
+++ /dev/null
@@ -1,32 +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/libgtkhtml/libgtkhtml-2.2.1.ebuild,v 1.4 2003/07/15 13:08:48 todd Exp $
-
-inherit eutils gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="1"
-LICENSE="LGPL-2.1 GPL-2"
-KEYWORDS="x86 ~ppc alpha sparc"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=dev-libs/libxml2-2.4.16
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gail-1"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/libgtkhtml-2.2.0-alpha.patch || die
-	fi
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild
deleted file mode 100644
index 6352110eafbd..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild
+++ /dev/null
@@ -1,32 +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/libgtkhtml/libgtkhtml-2.2.3.ebuild,v 1.5 2003/07/19 23:27:59 tester Exp $
-
-inherit eutils gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="1"
-LICENSE="LGPL-2.1 GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc hppa amd64"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=dev-libs/libxml2-2.4.16
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gail-1"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/libgtkhtml-2.2.0-alpha.patch || die
-	fi
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild
index ea5a5247e27e..8bd2e25dc889 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild
@@ -1,33 +1,38 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild,v 1.4 2003/09/24 15:06:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.5.6.ebuild,v 1.1 2004/03/21 15:06:24 foser Exp $
 
 inherit eutils gnome2
 
-S=${WORKDIR}/${P}
 DESCRIPTION="a Gtk+ based HTML rendering library"
 HOMEPAGE="http://www.gnome.org/"
-SLOT="1"
 LICENSE="LGPL-2.1 GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~amd64"
+
+IUSE="accessibility"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 
 # FIXME : seems only testapps need gnomevfs
+
 RDEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.4.16
 	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gail-1"
+	accessibility? ( >=gnome-base/gail-1.3 )"
 
 DEPEND="${RDEPEND}
 	 >=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
+G2CONF="${G2CONF} $(use_enable accessibility)"
 
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 	if use alpha; then
 		epatch ${FILESDIR}/${PN}-2.2.0-alpha.patch || die
 	fi
+
 }