New version for GNOME-2.22.2. Bug fixes and translation updates. Cleaning up old revisions.

(Portage version: 2.1.5)

4 files changed, 9 insertions, 98 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 5639b1581b02..f0114d8a075d 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.155 2008/04/07 22:56:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.156 2008/05/26 20:58:27 eva Exp $
+
+*gtkhtml-3.18.2 (26 May 2008)
+
+  26 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -gtkhtml-2.6.3.ebuild,
+  -gtkhtml-3.14.3.ebuild, -gtkhtml-3.18.0.ebuild, +gtkhtml-3.18.2.ebuild:
+  New version for GNOME-2.22.2. Bug fixes and translation updates. Cleaning
+  up old revisions.
 
 *gtkhtml-3.18.1 (07 Apr 2008)
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
deleted file mode 100644
index f0f31c4af77a..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.6.3.ebuild,v 1.7 2008/01/09 21:18:52 eva Exp $
-
-inherit eutils gnome2 versionator autotools
-
-MY_P="lib${P}"
-MY_PN="lib${PN}"
-MY_MAJ_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="a Gtk+ based HTML rendering library"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="accessibility test"
-
-# gnome-vfs is only needed to run testgtkhtml (1/3 tests)
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.4.16
-	test? ( >=gnome-base/gnome-vfs-2 )
-	accessibility? ( >=gnome-base/gail-1.3 )"
-
-DEPEND="${RDEPEND}
-	 >=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} $(use_enable accessibility)"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS  README TODO docs/IDEAS"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use alpha; then
-		epatch "${FILESDIR}/${MY_PN}-2.2.0-alpha.patch" || die
-	fi
-
-	# We need a full autoreconf on FreeBSD at least to fix libtool errors.
-	eautoreconf
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
deleted file mode 100644
index 62dd0de354ee..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.14.3.ebuild,v 1.10 2008/03/17 02:13:58 leio Exp $
-EAPI="1"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="static"
-
-RDEPEND=">=gnome-base/gail-1.1
-	>=gnome-base/libgnomeui-2
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	net-libs/libsoup:2.2
-	>=x11-libs/pango-1.15.2
-	>=x11-themes/gnome-icon-theme-1.2"
-
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35.5
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="$(use_enable static) --enable-file-chooser"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
-	sed -i -e '/G_DISABLE_DEPRECATED/d' \
-		"${S}/src/Makefile.am" "${S}/src/Makefile.in" \
-		"${S}/components/html-editor/Makefile.am" "${S}/components/html-editor/Makefile.in"
-
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
-		"${S}/a11y/Makefile.am" "${S}/a11y/Makefile.in"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild
index 880f349ed68e..977edb36ef71 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.18.0.ebuild,v 1.1 2008/03/23 21:59:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.18.2.ebuild,v 1.1 2008/05/26 20:58:27 eva Exp $
 EAPI="1"
 
 inherit gnome2