Version bump, fixes gtk+-3.4 and glib-2.32 compatibility (bug #412351, thanks to Emmanuel Appiah et al.)

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

2 files changed, 62 insertions, 1 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 784bfeb7bd7d..31c86a388095 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.249 2012/04/19 20:36:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.250 2012/04/20 04:40:20 tetromino Exp $
+
+*gtkhtml-4.4.1 (20 Apr 2012)
+
+  20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtkhtml-4.4.1.ebuild:
+  Version bump, fixes gtk+-3.4 and glib-2.32 compatibility (bug #412351, thanks
+  to Emmanuel Appiah et al.)
 
   19 Apr 2012; Brent Baude <ranger@gentoo.org> gtkhtml-4.2.3.ebuild:
   Marking gtkhtml-4.2.3 ppc64 stable for bug 410611
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.4.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.4.1.ebuild
new file mode 100644
index 000000000000..1c5a676de658
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.1.ebuild,v 1.1 2012/04/20 04:40:20 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND=">=x11-libs/gtk+-3.0.2:3
+	>=x11-libs/cairo-1.10
+	x11-libs/pango
+	>=x11-themes/gnome-icon-theme-2.22.0
+	>=app-text/enchant-1.1.7
+	gnome-base/gsettings-desktop-schemas
+	>=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"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="${G2CONF}
+		--disable-static"
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Regenerate marshallers for <glib-2.31 compatibility
+	rm -v components/editor/gtkhtml-spell-marshal.{c,h} \
+		components/editor/gtkhtml-editor-marshal.{c,h} || die
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	elog "The gtkhtml-editor-test utility is now called gtkhtml-editor-test-${SLOT}"
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}