New version 'n cleanup

8 files changed, 42 insertions, 102 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 43a7d44a1ab4..71704d6b335d 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.26 2003/05/07 11:17:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.27 2003/05/13 18:26:27 foser Exp $
+
+*libgtkhtml-2.2.4 (13 May 2003)
+
+  13 May 2003; foser <foser@gentoo.org> libgkthtml-2.2.4.ebuild :
+  New version, minor ebuild fixes 
 
 *libgtkhtml-3.0.3 (07 May 2003)
 
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4
new file mode 100644
index 000000000000..b4e8e6302e87
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-2.2.4
@@ -0,0 +1 @@
+MD5 26443c4027470c4510d221af30a2c3f6 libgtkhtml-2.2.4.tar.bz2 338182
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.1
deleted file mode 100644
index a5eca55265ad..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21fb6a29a56f306edd040da5f0f4261e gtkhtml-3.0.1.tar.bz2 988095
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.2 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.2
deleted file mode 100644
index acfac7c7183e..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19a935df3749d54ec845894d9c080975 gtkhtml-3.0.2.tar.bz2 1001821
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild
index e24b7296ef5a..85395a92476e 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.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/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild,v 1.1 2003/04/17 16:24:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-2.2.3.ebuild,v 1.2 2003/05/13 18:26:27 foser Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="x86 ~ppc ~alpha ~sparc"
 
 RDEPEND=">=x11-libs/gtk+-2.1
 	>=dev-libs/libxml2-2.4.16
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild
new file mode 100644
index 000000000000..69f3187f1d73
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-2.2.4.ebuild
@@ -0,0 +1,33 @@
+# 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.4.ebuild,v 1.1 2003/05/13 18:26:27 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"
+
+# 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"
+
+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-3.0.1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.1.ebuild
deleted file mode 100644
index 6dba030d2d7d..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.1.ebuild
+++ /dev/null
@@ -1,41 +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-3.0.1.ebuild,v 1.1 2003/03/21 16:21:03 liquidx Exp $
-
-inherit gnome2
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomeprint-2.2
-    >=gnome-base/libgnomeprintui-2.2.1
-    >=gnome-base/libbonoboui-2.0
-    >=gnome-base/bonobo-activation-2.0
-    >=gnome-base/libbonobo-2.0
-    >=gnome-extra/gal-1.99.2
-    >=gnome-base/ORBit2-2.5.6
-    >=net-libs/libsoup-1.99.12
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/gnome-vfs-2.1
-    >=gnome-base/gail-1.1"
- 
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-SCROLLKEEPER_UPDATE="0"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.2.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.2.ebuild
deleted file mode 100644
index 73a189e106a6..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.0.2.ebuild
+++ /dev/null
@@ -1,56 +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-3.0.2.ebuild,v 1.1 2003/04/21 14:48:08 liquidx Exp $
-
-inherit gnome2
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-base/libgnomeui-2.2
-	>=gnome-base/libgnomeprint-2.2
-    >=gnome-base/libgnomeprintui-2.2.1
-    >=gnome-base/libbonoboui-2.0
-    >=gnome-base/bonobo-activation-2.0
-    >=gnome-base/libbonobo-2.0
-    >=gnome-extra/gal-1.99.3
-    >=gnome-base/ORBit2-2.5.6
-    >=net-libs/libsoup-1.99.17
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/gnome-vfs-2.1
-    >=gnome-base/gail-1.1"
- 
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-SCROLLKEEPER_UPDATE="0"
-
-# HACK HACK HACK !!!
-# libtool's lameness causes libgtkhtml to link to the older installed version
-# rather than the one in its own source tree. normally, elibtoolize 
-# --reverse-deps solves this, but in this case, it screws up when linking
-# src/gtest.c
-#
-# so, i've decided to re-create libgtkhtml-3.0.so.0 symlinks. if anyone
-# knows a better solution, please let me know. - <liquidx@gentoo.org>
-
-src_install() {
-	gnome2_src_install
-	dosym /usr/lib/libgtkhtml-a11y-3.0.so.1 /usr/lib/libgtkhtml-a11y-3.0.so.0
-	dosym /usr/lib/libgtkhtml-3.0.so.1 /usr/lib/libgtkhtml-3.0.so.0	
-}