Bump to 4.2.1 from the gnome overlay. Now uses gsettings instead of gconf.

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

3 files changed, 63 insertions, 7 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 0c0b7b92b2dc..e869bff83120 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.238 2011/09/09 17:02:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.239 2011/10/31 07:11:53 tetromino Exp $
+
+*gtkhtml-4.2.1 (31 Oct 2011)
+
+  31 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtkhtml-4.2.1.ebuild:
+  Bump to 4.2.1 from the gnome overlay. Now uses gsettings instead of gconf.
 
 *gtkhtml-4.0.2 (09 Sep 2011)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index e53207bdce1d..aae56061a7dd 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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.0.1.tar.bz2 1189620 RMD160 666dd51a1c7a544c9ec9f90d6c4eaa894560fafe SHA1 24680181128791a7f8db56dceaf0c5c15de8b3f9 SHA256 13fd845ce2ebc837fd4771d2dd0c103bde20faad9f77f6c7a62ff7d8099557ff
 DIST gtkhtml-4.0.2.tar.xz 1060856 RMD160 e8ac543fdb2d9467d1db6c6e6712b348a57b9244 SHA1 57b1a13e00c091f5e76cd21e1d02f9b0530f8968 SHA256 9f40db52c869dce891bbe8faa9e14209750e22e73790de96837460d6d51f827a
+DIST gtkhtml-4.2.1.tar.xz 1078996 RMD160 ffe866a5268c86df5f1c1812b11432718732d223 SHA1 0fd6510311df121c353ad4506052dee0285332fa SHA256 e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558
 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.0.1.ebuild 1314 RMD160 d61a3963e97031bbb9ec90131ae14f77d6b5293d SHA1 b84e5d37828f6445b779a89484cfd7f05ab93e3e SHA256 07db827bee48249f3155498668cf7d0cddfbddecc5c1d7c9bee70e2d6bbf1fda
 EBUILD gtkhtml-4.0.2.ebuild 1311 RMD160 fb44155cae66ded30f507fbaa99667d31fc1bf33 SHA1 80d95122e983d2dc6b9cce3e6e4339babe884ea3 SHA256 92eb0bd23e59ce2addd31bd7da3801b4f76e7210d31ef5f3655f68728816e9de
-MISC ChangeLog 33903 RMD160 eedc0b7d278bde6ec52544d9e0bbc2c78be1d9ac SHA1 90aed06115ca4ead0f6b4aeffe4c852ee1066197 SHA256 5b2c18142edd89d8f44acf10f4607d13c62f066e8fa935e65e539a280aa8322a
+EBUILD gtkhtml-4.2.1.ebuild 1351 RMD160 80392a044abe3785afebf3b9b5ef8f4e43c7312e SHA1 caa32bd832883daf15950ad8856579ff04975e5a SHA256 197a16df64176abc018de7a4bf2980870bdd54c2269e9202bc18c163bba24a17
+MISC ChangeLog 34099 RMD160 925607f3d35dc0dcca2e573c65444cf6566126ae SHA1 4e54993f56a18265ae32a3761360bea48d3a07f5 SHA256 fbf1cedcb2a33d431a9d49e268cc490359c62c2ea21649a880e237a40577c81d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5qRr0ACgkQCaWpQKGI+9TZCQCdGPn0rz5GcRQ1V4ZR4Y60EViV
-SREAnRY+vW110U8cP7hy6kec+STiT7mP
-=iV6S
+iF4EAREIAAYFAk6uSj4ACgkQdjK8w9WeBnA/SgD/RIxspDRRHVezxwQtFTLIPv3Q
+m0gl6eVjuFD1rhLzOoAA/i2KQWx2NbHbEIcAEhfrp7RETFgIri6pWZwzb7l61wid
+=nDwI
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild
new file mode 100644
index 000000000000..ad8a1d24ca11
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild,v 1.1 2011/10/31 07:11:53 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
+		--disable-deprecated-warning-flags"
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+}
+
+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
+}