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

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 79 insertions, 2 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/Manifest b/gnome-extra/gtkhtml/Manifest
index 1190cbe46c23..4dba009b6074 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgtkhtml-2.2.0-alpha.patch 652 RMD160 db8f1127f1539bc3b44f65d918ae7657a3175000 SHA1 5df0cd9a732ce5ca4f6b3c46ce1b5954b9aa01b3 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1
 DIST gtkhtml-3.32.2.tar.bz2 1217025 RMD160 b71afbd07c658c2ec6ac285cc428ac1943d39e46 SHA1 db8a943ddeec0b86766e671e8f8c427706dbcdd4 SHA256 8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f
 DIST gtkhtml-4.2.2.tar.xz 1067944 RMD160 e055486e62d9ac71bc6e0729949fc58c1ef9b5fc SHA1 697e7be20813513df987d6d9903009ba015e48a0 SHA256 e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c
 DIST gtkhtml-4.2.3.tar.xz 1079148 RMD160 4a0d7f1a60de8abbc9bcea20d3a1cb230105bd11 SHA1 55e37295e9cf19d8af2a04fddbce8a4783a0649f SHA256 e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1
+DIST gtkhtml-4.4.1.tar.xz 1082224 RMD160 61d6043f114d5dfcdc527ab06894e53b4a64299e SHA1 ffc2ccaef921d945114c193e09cf4709027c40b5 SHA256 2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236
 DIST libgtkhtml-2.11.1.tar.bz2 597923 RMD160 4f3a65b616c0fbfaaa487d11c8749718708deb2a SHA1 1325c1540091b89cc03d99a1e594285d2e846e50 SHA256 3ca77a0d0f15e94fb654097c2f78cf928194d4c4bf64ff7b2ba408d29c924a57
 EBUILD gtkhtml-2.11.1.ebuild 1219 RMD160 b57300c564564287ec317221d66c04ca7e182af9 SHA1 c2f73768620c82259c3ee0f5015123cd4ef3ef59 SHA256 09cd19b5179692dc5e1d85124481a2851f389dda85808073912996820eaccf5e
 EBUILD gtkhtml-3.32.2.ebuild 1390 RMD160 995995cb09f0c828865ddd53508344a98581d7db SHA1 0b67fa0a0fbc1f654aaf33d6b6fe2f29b0d321b8 SHA256 1074862959db26ce03464c9969b0f23c18a7e3ba8a2ea1a2c4acf22528d8a9c6
 EBUILD gtkhtml-4.2.2.ebuild 1340 RMD160 d618b96e478506d2df6eba904d46beccaf1423c0 SHA1 45c2a11565efa956fa0488d113042a039e451e80 SHA256 f60b57741980cf01aad5d021b50a5bab9bc219cbf86ea25c3ff0d25927649feb
 EBUILD gtkhtml-4.2.3.ebuild 1309 RMD160 a792ef8318647d1710900a960cc95c7407acbc15 SHA1 6232eaa4f28ec6aae52794fdbcf252681d477969 SHA256 c11380c19409854ca97f9971e159f339636f1e58c7fa820fb565c1da6d802a71
-MISC ChangeLog 35338 RMD160 572aea32b6d2dcab451211df8d5b76c283ed17b0 SHA1 54ca3f8d52d20f4d63ded858a98e661cad787ff2 SHA256 24169402b190515fdea15ab1f86d6f21674cf05b6f7577e8da287b82a71ad8ee
+EBUILD gtkhtml-4.4.1.ebuild 1519 RMD160 e17fd56c8fc84d723940121dbafaa4a7e8b37d65 SHA1 6e62169071eccfc4b4080ea64293b85ad3ae39bb SHA256 5d24b95be2fbf6628e1268697e2915781b227b18062ed93ab24ce12ea0714d94
+MISC ChangeLog 35565 RMD160 8571a7d6be90e2eaed5b59846d5ede419f771bd1 SHA1 43d2469000c5be38978ce5cf3342ec3f04326555 SHA256 5a66b47a046444dc69d3e5102ca3908afc33067207ef4c83a93f173a999dc6e1
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPkOi5AAoJEJ0WA1zPCt1hC+sH/R/Xo7dwhGKJ5WFmqFgxiqhc
+uXfb5bo8tQwrONeNzbhg8Ns4lv73Cq77NciwmVM31HT0knqCht7XS76EuXgnFyDu
+HHt8JNhrCmoixFFPmv+XQXDittsuR5o0M/lg9eLg6EKUxTtPbY0/PBKY58l7AQ6w
+Y/5K9ccofb31MGAPmj66PFUHMF1wb2WgU5Ava5BYnvoePd2zIFjTWnz65WhXHiae
+Oq/nAgaN3V+AgF0G5lOiCcoDbcLUK4mwy0yw3AseO4FuiucrvxiKqZpX8VKq+oIp
+nBWP1MZPCmuV23UlXMXUErQX7fI6PeP/PduomLKAPN1jLrLuyndfYka0cEKa1FE=
+=fz+N
+-----END PGP SIGNATURE-----
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
+}