Add slot limitation to gtk+, missing DEPEND on xproto and use gnome2 phases where needed.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

3 files changed, 12 insertions, 63 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 4762e46344c6..ebbd66283949 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.222 2010/10/12 17:58:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.223 2010/10/12 20:56:33 eva Exp $
+
+  12 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtkhtml-3.26.3.ebuild, gtkhtml-3.32.0.ebuild:
+  Add slot limitation to gtk+, missing DEPEND on xproto and use gnome2
+  phases where needed.
 
 *gtkhtml-3.32.0 (12 Oct 2010)
 
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.26.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.26.3.ebuild
deleted file mode 100644
index 8950df959d84..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.26.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.26.3.ebuild,v 1.12 2010/07/20 02:20:21 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-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 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="glade"
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.14
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	net-libs/libsoup:2.4
-	glade? ( dev-util/glade:3 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-bonobo-editor
-		$(use_with glade glade-catalog)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix deprecated API disabling in used glib library - this is not future-proof, bug 210657
-	sed -i -e '/G_DISABLE_DEPRECATED/d' \
-		"${S}/gtkhtml/Makefile.am" "${S}/gtkhtml/Makefile.in" \
-		"${S}/components/html-editor/Makefile.am" \
-		"${S}/components/html-editor/Makefile.in" \
-		|| die "sed 1 failed"
-
-	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" || die "sed 2 failed"
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild
index 201e36fc6c51..f529d6e3dedc 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild,v 1.1 2010/10/12 17:58:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild,v 1.2 2010/10/12 20:56:33 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ SLOT="3.14"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.20
+RDEPEND=">=x11-libs/gtk+-2.20:2
 	>=x11-themes/gnome-icon-theme-2.22.0
 	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
@@ -23,6 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.20
 	>=app-text/iso-codes-0.49
 	>=net-libs/libsoup-2.26.0:2.4"
 DEPEND="${RDEPEND}
+	x11-proto/xproto
 	sys-devel/gettext
 	>=dev-util/intltool-0.40.0
 	>=dev-util/pkgconfig-0.9"
@@ -36,15 +37,17 @@ pkg_setup() {
 }
 
 pkg_preinst() {
+	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0
 }
 
 pkg_postinst() {
+	gnome2_pkg_postinst
 	preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0
 }
 
 src_install() {
 	gnome2_src_install
 	# Remove .la files since old will be removed anyway while updating
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
 }