clean out & clean up

Package-Manager: portage-2.0.51.19

10 files changed, 19 insertions, 264 deletions

diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 007546123f1b..ce343d8f3994 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,44 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b8553abb72b97f7ad8017b89b2b69632 libgtkhtml-2.4.0.ebuild 836
-MD5 98da75c588779566337471ea8e1dbb82 libgtkhtml-3.6.1.ebuild 1107
-MD5 664e39dd93549de2c4eef4574c3497d5 ChangeLog 15435
-MD5 694c7e4709dbd86ba9218cfa6036b499 libgtkhtml-3.2.3.ebuild 1196
-MD5 0b5667b6e8a680f3446112c2dd0c4b85 libgtkhtml-3.0.10-r1.ebuild 1332
-MD5 0c37e3ffa931ead9868867fe88b9499f libgtkhtml-3.0.10.ebuild 1199
+MD5 8eb7d73f7ddc4b82bf6f9a25dab630d4 libgtkhtml-2.6.0.ebuild 933
+MD5 53a8015d215013a71f90ad5389229eb8 libgtkhtml-3.2.5.ebuild 1185
 MD5 5b295166b6ea6acaf33c471fb15b3717 libgtkhtml-3.6.0.ebuild 1107
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4412eea3538c99bfb62745bdf47850ae libgtkhtml-2.6.2.ebuild 947
-MD5 4e12417cd487cc2755a296a5e679ccf3 libgtkhtml-2.6.1.ebuild 935
+MD5 0b5667b6e8a680f3446112c2dd0c4b85 libgtkhtml-3.0.10-r1.ebuild 1332
 MD5 358f703a115fc7f2c81746edbef5d1df libgtkhtml-3.2.4.ebuild 1181
-MD5 53a8015d215013a71f90ad5389229eb8 libgtkhtml-3.2.5.ebuild 1185
-MD5 cef56458cfff6875b7b8c92ffd6f6228 libgtkhtml-2.4.1.ebuild 847
-MD5 8eb7d73f7ddc4b82bf6f9a25dab630d4 libgtkhtml-2.6.0.ebuild 933
-MD5 450305579827e7439e0ecf31f9b6955e libgtkhtml-2.6.3.ebuild 945
-MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 4e12417cd487cc2755a296a5e679ccf3 libgtkhtml-2.6.1.ebuild 935
+MD5 98da75c588779566337471ea8e1dbb82 libgtkhtml-3.6.1.ebuild 1107
+MD5 2143c3a27dcdfb81ed15ec8d93b1816b libgtkhtml-2.6.3.ebuild 945
+MD5 664e39dd93549de2c4eef4574c3497d5 ChangeLog 15435
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 0c37e3ffa931ead9868867fe88b9499f libgtkhtml-3.0.10.ebuild 1199
 MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
-MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
-MD5 8ad22906ca369e77ef84242fd95d1900 files/digest-libgtkhtml-3.2.5 67
 MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
-MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
+MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
 MD5 b954bf799749526cc35e4d73e5ebbaba files/libgtkhtml-3.2-i18n.patch 1411
-MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
-MD5 1fefab12ccd22babef0f9cf0178a8dec files/digest-libgtkhtml-3.6.1 67
+MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
 MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
-MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
-MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
+MD5 9b8c5022b2135422ff58e52a18662863 files/digest-libgtkhtml-2.6.3 69
+MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-libgtkhtml-3.2.4 67
+MD5 8ad22906ca369e77ef84242fd95d1900 files/digest-libgtkhtml-3.2.5 67
 MD5 162b47fd756ffe48091b4775dd7ea57a files/digest-libgtkhtml-3.6.0 67
-MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
+MD5 1fefab12ccd22babef0f9cf0178a8dec files/digest-libgtkhtml-3.6.1 67
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
 MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
-MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-libgtkhtml-3.2.4 67
-MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
-MD5 9b8c5022b2135422ff58e52a18662863 files/digest-libgtkhtml-2.6.3 69
-MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcKngKf2g/qXtneoRAmWhAKC+mBraNT+Gv+PrFi0oNAysFkutRQCguy6P
-/I5w9+8N1fo0GlcdHV5JH2Y=
-=OP8w
------END PGP SIGNATURE-----
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.0 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.0
deleted file mode 100644
index e753805a189e..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee2aba8198ebde0c33fe43bc61c20834 libgtkhtml-2.4.0.tar.bz2 408813
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.1
deleted file mode 100644
index 311fc6fb9146..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31f9476871517a82aafad3cdda43ac1e libgtkhtml-2.4.1.tar.bz2 408563
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3
deleted file mode 100644
index 187d02bb9553..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe7aa0259a4cd7c99280c076711f8f80 gtkhtml-3.2.3.tar.bz2 1304520
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch
deleted file mode 100644
index d26d17010560..000000000000
--- a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.8-alpha.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtkhtml-3.0.8/src/htmlengine.c	2003-06-26 08:36:41.000000000 -0400
-+++ gtkhtml-3.0.8-new/src/htmlengine.c	2003-08-20 09:41:19.000000000 -0400
-@@ -3213,7 +3213,7 @@
- }
- 
- 
--guint
-+GType
- html_engine_get_type (void)
- {
- 	static GType html_engine_type = 0;
---- gtkhtml-3.0.8/src/htmlengine.h	2003-05-19 08:50:26.000000000 -0400
-+++ gtkhtml-3.0.8-new/src/htmlengine.h	2003-08-20 09:39:35.000000000 -0400
-@@ -292,7 +292,7 @@
- 
- 
- /* Object construction.  */
--guint       html_engine_get_type      (void);
-+GType       html_engine_get_type      (void);
- HTMLEngine *html_engine_new           (GtkWidget *);
- void        html_engine_realize       (HTMLEngine *engine,
- 				       GdkWindow  *window);
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch
deleted file mode 100644
index 0484bd8a2441..000000000000
--- a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.9-gtk-2.4.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -uNr gtkhtml-3.0.9.orig/a11y/Makefile.am gtkhtml-3.0.9/a11y/Makefile.am
---- gtkhtml-3.0.9.orig/a11y/Makefile.am	2004-04-28 02:00:18.000000000 +0000
-+++ gtkhtml-3.0.9/a11y/Makefile.am	2004-04-28 02:00:42.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS)
- 
--CFLAGS += $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
-+CFLAGS += $(GAIL_CFLAGS)
- 
- lib_LTLIBRARIES = libgtkhtml-a11y-3.0.la
- 
-diff -uNr gtkhtml-3.0.9.orig/a11y/Makefile.in gtkhtml-3.0.9/a11y/Makefile.in
---- gtkhtml-3.0.9.orig/a11y/Makefile.in	2004-04-28 02:00:18.000000000 +0000
-+++ gtkhtml-3.0.9/a11y/Makefile.in	2004-04-28 02:00:58.000000000 +0000
-@@ -50,7 +50,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- 
--CFLAGS = @CFLAGS@ $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
-+CFLAGS = @CFLAGS@ $(GAIL_CFLAGS)
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
-diff -uNr gtkhtml-3.0.9.orig/components/html-editor/Makefile.am gtkhtml-3.0.9/components/html-editor/Makefile.am
---- gtkhtml-3.0.9.orig/components/html-editor/Makefile.am	2004-04-28 02:00:18.000000000 +0000
-+++ gtkhtml-3.0.9/components/html-editor/Makefile.am	2004-04-28 02:01:25.000000000 +0000
-@@ -16,15 +16,10 @@
-         -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
- 	-DGLADE_DATADIR=\"$(gladedir)\"			\
--	-DGTK_DISABLE_DEPRECATED=1 			\
--	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
--	-DGNOME_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
- 	-DDATADIR=\""$(datadir)"\"			\
- 	-DLIBDIR=\""$(datadir)"\"			\
--	-DBONOBO_DISABLE_DEPRECATED=1
- 
- # CORBA stuff
- IDLS = Editor.idl
-diff -uNr gtkhtml-3.0.9.orig/components/html-editor/Makefile.in gtkhtml-3.0.9/components/html-editor/Makefile.in
---- gtkhtml-3.0.9.orig/components/html-editor/Makefile.in	2004-04-28 02:00:18.000000000 +0000
-+++ gtkhtml-3.0.9/components/html-editor/Makefile.in	2004-04-28 02:01:40.000000000 +0000
-@@ -198,15 +198,10 @@
-         -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
-         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
- 	-DGLADE_DATADIR=\"$(gladedir)\"			\
--	-DGTK_DISABLE_DEPRECATED=1 			\
--	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
--	-DGNOME_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
- 	-DDATADIR=\""$(datadir)"\"			\
- 	-DLIBDIR=\""$(datadir)"\"			\
--	-DBONOBO_DISABLE_DEPRECATED=1
- 
- 
- # CORBA stuff
-diff -uNr gtkhtml-3.0.9.orig/src/Makefile.am gtkhtml-3.0.9/src/Makefile.am
---- gtkhtml-3.0.9.orig/src/Makefile.am	2004-04-28 02:00:17.000000000 +0000
-+++ gtkhtml-3.0.9/src/Makefile.am	2004-04-28 02:01:54.000000000 +0000
-@@ -12,10 +12,6 @@
- 
- AM_CFLAGS = 								\
- 	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\"	\
--	-DGTK_DISABLE_DEPRECATED=1					\
--	-DGDK_DISABLE_DEPRECATED=1					\
--	-DG_DISABLE_DEPRECATED=1					\
--	-DGNOME_DISABLE_DEPRECATED=1
- 
- lib_LTLIBRARIES = libgtkhtml-3.0.la
- 
-diff -uNr gtkhtml-3.0.9.orig/src/Makefile.in gtkhtml-3.0.9/src/Makefile.in
---- gtkhtml-3.0.9.orig/src/Makefile.in	2004-04-28 02:00:17.000000000 +0000
-+++ gtkhtml-3.0.9/src/Makefile.in	2004-04-28 02:02:06.000000000 +0000
-@@ -193,10 +193,6 @@
- 
- AM_CFLAGS = \
- 	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\"	\
--	-DGTK_DISABLE_DEPRECATED=1					\
--	-DGDK_DISABLE_DEPRECATED=1					\
--	-DG_DISABLE_DEPRECATED=1					\
--	-DGNOME_DISABLE_DEPRECATED=1
- 
- 
- lib_LTLIBRARIES = libgtkhtml-3.0.la
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.4.0.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.4.0.ebuild
deleted file mode 100644
index 3c711014fcc8..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.4.0.ebuild,v 1.12 2005/01/08 23:23:45 slarti Exp $
-
-inherit eutils gnome2
-
-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 ia64"
-IUSE=""
-
-# 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.3"
-
-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}/${PN}-2.2.0-alpha.patch || die
-	fi
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.4.1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.4.1.ebuild
deleted file mode 100644
index a1b486ca8603..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.4.1.ebuild,v 1.10 2005/01/08 23:23:45 slarti Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="LGPL-2.1 GPL-2"
-
-IUSE=""
-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.3"
-
-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}/${PN}-2.2.0-alpha.patch || die
-	fi
-}
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild
index 16d3121b4dbd..10e903f8d1d3 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild,v 1.1 2005/02/17 06:33:41 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.6.3.ebuild,v 1.2 2005/04/28 16:03:08 foser Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ LICENSE="LGPL-2.1 GPL-2"
 
 IUSE="accessibility"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ppc64 ~arm"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ppc64 ~arm"
 
 # FIXME : seems only testapps need gnomevfs
 
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
deleted file mode 100644
index e46b075d7ec6..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.11 2005/03/18 15:15:51 dsd Exp $
-
-inherit gnome2 eutils versionator
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-MY_MAJ_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64 ~mips arm"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-extra/gal-2.2.3
-	>=net-libs/libsoup-2.2.1
-	>=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-themes/gnome-icon-theme-1.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/gail-1
-	!=gnome-extra/libgtkhtml-3.1*"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	>=dev-util/pkgconfig-0.12.0"
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-ELTCONF="--reverse-deps"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
-}
-