Version bump for gnome-3.6. Update homepage, description, license. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 54 insertions, 88 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 817f061c2506..dffeb3ffac5b 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,14 @@
 # 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.266 2012/10/28 15:53:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.267 2012/12/17 11:58:19 tetromino Exp $
+
+*gtkhtml-4.6.1 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtkhtml-2.11.1.ebuild, gtkhtml-3.32.2.ebuild, -gtkhtml-4.2.2.ebuild,
+  -gtkhtml-4.2.3.ebuild, gtkhtml-4.4.3.ebuild, gtkhtml-4.4.4.ebuild,
+  +gtkhtml-4.6.1.ebuild:
+  Version bump for gnome-3.6. Update homepage, description, license. Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gtkhtml-4.4.3.ebuild:
   alpha/ia64/sh/sparc stable wrt #427544
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 9c6390ceafd4..0918852b1b9f 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX gtkhtml-3.32.2-g_thread_init.patch 669 SHA256 a633ca81745ff46e0b9aaa8c6748014779d64bb38f8ca4d290f6e6046dcce115 SHA512 9462abc3c0b3d3c7edfde95af27334bb0be5bcdd78c59e0e33b53bd5dfaa4bce1227d380c87b71956c544463fe5d4c4be1d32b2e71224215e8609be5be93d735 WHIRLPOOL 3f102b287b684078d5b2a9ea2d4d12e881157346a6d648581c30d8330a91149de74051fa4755fefe96637d123add41157b8979b2253ffac25bac5305975ccaba
 AUX libgtkhtml-2.2.0-alpha.patch 652 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1 SHA512 e813d77294adcad0adca261d0bfed8315bcc563573a6a975d10f50f9972097a932e0f6eca285a4c6d28e1ef86fe09eacec0b6bda9a28073642debed234046f09 WHIRLPOOL 56fcba164b9f87b0db035da796acf7cd8f8a57a92ea3776c4fa30cb046a75ab8a0209a9e4bdbd620f7f9828b92f595b4962c1cd3461df061002b01a235efbf8a
 DIST gtkhtml-3.32.2.tar.bz2 1217025 SHA256 8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f SHA512 a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5 WHIRLPOOL e6563edfd31a430853533dbdc3a07101e919c672b3ce79f6cf94167067c615e60b5677712cfa5672767895f099cc548efe821d1b1515e1f84c5ddd19a5f9a73f
-DIST gtkhtml-4.2.2.tar.xz 1067944 SHA256 e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c SHA512 23668312fa5eef7e8540cde9aaa29e5d65145212f6cb74939810c51ccc427d9e19a3c9cf99b83c059f55eb6a7218a4be4321c4418f273877201f1367b6341c06 WHIRLPOOL 2da103a919e6527dfb614334bb6b95716e739e9a3a3c5875630f8948a2bc554d6b7c5d606a70e9b6e5e3f7ef513857bcad08eb2d4db1a353acd67ad5bf7bdaa6
-DIST gtkhtml-4.2.3.tar.xz 1079148 SHA256 e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1 SHA512 aeeaa33c0a625811d6be5c0bc885efdb3fe56dff4f2938491de07241aadef04e91fddc52c51f851f2357e5d70c847aadb92da07bbc8f5b8e6a00eb2991a442d4 WHIRLPOOL af2d2473a5f5b2abd85e53dcbf4711d6e7a9ababfbcd3e60bfc22506253a3abbee93cae41c9c8e3ee159f171634d8b9badf0768cc37e1501e034af35d4a717ae
 DIST gtkhtml-4.4.3.tar.xz 1038092 SHA256 da1f593dafcb202dbed0e99bc14ef20bfd5c54ec0d966912feeb7ba7864418aa SHA512 1ae179f3339247afbfa1f5fc5bf2e75d287141d3e04761282a4a961e6580f4243db33e8c5a50ae2c56cd27253eae48a05fc6db46ec7e118950ead4475ec46052 WHIRLPOOL c2ee5d84e7bdd46523f1411edba1ea095ac5376ee96e32b712b8a6ed72f26b9ebd4635227881148c5ef24004dea3c21251556e133a2201ab64bc645d62a9b6dd
 DIST gtkhtml-4.4.4.tar.xz 1038460 SHA256 737536d03c05d70e30f9b7aa45b4b810f7255dad2a9f0d4e16936a2e4852c7c9 SHA512 00ff8b886c47f51d63737338b9d06ec603a544a491129e46aed0711e9c181409aa8e0057c7dcbeb015c3c6c032d2b9eb34177b2f8997235ffc41ceb5ddf35ddf WHIRLPOOL 65d38adc67b9361df73ecdbcd6b060d638b5d027c894b7e0597914e44b57c2cd8cf327a31d6b584443e470561909c086d15c1cfe933586eae076cc7060ab6ab6
+DIST gtkhtml-4.6.1.tar.xz 1040140 SHA256 36670a268f3fd437ddb8c4e7f127d6fb0c09a6fe23a431bede0fc3213c75db98 SHA512 028e1dc98fafda1605b6c772d5ed9ecc4ca8ef681f62b02e4f993811740fda204301725303ee65bc54c083d20cf70eb738d7cf383e59a0ad93245b9f7595a926 WHIRLPOOL 36b91b8c39df23e37686c1b659d66cef53a9c4eddd5d0e3c239ac9e8ab49e6a8dad80b7616fece4ff7c53c40edf87c17a477cbdb9ad17ef68832c8b65e323845
 DIST libgtkhtml-2.11.1.tar.bz2 597923 SHA256 3ca77a0d0f15e94fb654097c2f78cf928194d4c4bf64ff7b2ba408d29c924a57 SHA512 8eb887ba2430b3c18eb585569fc2f60645ba767b3d246b582404de53e4113db8e625b085de06d8433df77162e0b28ca83ed996e2ad7a16c7a80a0c9eee3b9fa7 WHIRLPOOL e18c6988dcfc3cc2defd5a2fffac7ec4dd4a68694fa959fa798ed4fe8947f70bdc537e148f571a93bff24d42d7ed0fb8816ffb0dab5585a74b0c6ec0b1a987a2
-EBUILD gtkhtml-2.11.1.ebuild 1207 SHA256 5e36241bc19411be1c5ccb755706e2041c196c5e8afefe78bdcf7531c2d51b4d SHA512 216b8efcb75683d893af50049061ade6fc0c90f4997311b83712dac0d41cee5540d22641f5c185246fc2c0f183cad544e7fa760f667cd647863ad885ae04082b WHIRLPOOL 07ece6c700aac9349895e7a635f8dafdd8cef3d155d8e1c9dd6421dd16fc04ff8c3bf96b2222462bdc2d14902465962c126ee40d3dfb648a14ad3b98147a3593
-EBUILD gtkhtml-3.32.2.ebuild 1535 SHA256 4c7e15a1364897e70ed12ede6c4ced91a9ebee50743cf289ba71242f58b189e5 SHA512 bb60640873592c1bb2a3d7e701ceda4455f8e1cee7c1ea63d65ed6fda9ed3769dadaadf69d95674e316ab4021ed9eb0d5e918cad746b2ee72b36784e60084ca6 WHIRLPOOL 5a692b13162b61a2191cec04adafecca3064b9b2190fc5670bc341879b26bfca5ed051541adb77b795811ca235e8d77aa34b368628d01f9037faa166baa81eb0
-EBUILD gtkhtml-4.2.2.ebuild 1332 SHA256 029cb995a84f457096daabe24300331805b17a5752fa366fc41dcd131d39be35 SHA512 a2ada7a1dc51b77a3870cc084aaa555d7751679b3e8efc9008c00defe3398b7397360900f3dee749ee361499d5640e1f419553ad8fa2b4dc50ee574f1499bf7f WHIRLPOOL 1c6e5dd46bff29dd338efa71a4234b437bbe9ccab4f066413e9beb27e802bc6b23d60b4318e4d1b03463f7d762ac4481b0bf0bb69a481c4ab8fabc09042454ab
-EBUILD gtkhtml-4.2.3.ebuild 1296 SHA256 0d57e74494413cf3f523d53709984306b7198ccff6cb4ef9be0d96ffa00e4a02 SHA512 bc143226e6ddbff58b138ea0a0ebf593d38d93d043864be8a318f7cf80764bcfdf7fff9ebeea964d4e05189bd41e226810890f9f58d4cc97531f06cd7d751093 WHIRLPOOL 7634e33bb8468579ce99c9c91c692095f371fffc2ddf8b7b161bd3b06b3c4adcbd308fd20709c3fd40769003418814fd5948bd04fdfca5eb0a7ec37dce048b7d
-EBUILD gtkhtml-4.4.3.ebuild 1501 SHA256 fff308bee3c0df180a2f46847a67455c5a07c446974c1405d84db69dc8201686 SHA512 078f9515ccb8e5db3d043ab95fc27382d7702c14f9036d6af8a36869e909964a66f123213674b8bc3c00e880ea0abd2236108a8bc0a9459d81d6fd0a4cadbd89 WHIRLPOOL bbde8286e294538dc952d87ef57c84b0860729e35a57137a685a15dfe96cd8a13f5dd2532bd641be6d87fae9a04d34bd2a00ce2945470f59e409fe70c71042cd
-EBUILD gtkhtml-4.4.4.ebuild 1510 SHA256 fb4a53e48383e170476b210d57326a9491d45db4362b49bc7e0b572233559ab5 SHA512 a7de968f2004ee757879af0afec00c2f6a453d8f1aa43acf3aea591a6bb8205bc27fa085c146649c01eebb04b78a3084e67f14804307bc5d36db505f3f3b8a63 WHIRLPOOL 88d0d878e0a9b1829c5429ec706895fe057c4ef6b5101f3f07768b1a2881d73831647654d45212d5e99c5a1f7533a0a874636860d35677e98cd6c4d1c5e680ec
-MISC ChangeLog 37517 SHA256 43610cded7b09ece9c2059c3c86d4294914ec037ce62a18636a31dc79efadc63 SHA512 41f7c551fd4be1edbeacf2283d883501a40581231600c1a03330b6af58b6989c03332416f6d8c10d5d0745c64ca17e425e2d7f727841e58f6b67f69cd3cb538d WHIRLPOOL 36e3c657530f4801dfba4917eb2d7fe0dc9ee02f57cda658e3eecdf951dbc82c7c1df239bd42c188f9383d5c88e2e14fd08f2c2ee77050554db46db5d08f3074
+EBUILD gtkhtml-2.11.1.ebuild 1240 SHA256 d66a20c2848328e36e9f9f64702f1f6bb76ae4e8931b159e139a4a7057a94d92 SHA512 09cd7c3247fa5bbce8d2239dbae1829a69b6453dcbc4958d381f4584367579e3384dc32adaa13c22ca31459e9e68fcef5bf6d3c6addc173c68095f83050d84c6 WHIRLPOOL dbda386220ddacf403f4ccf79cbb66aeb4d4c8d7adcd1f355f4d015be7c6c2bd9859a144955946cc4a9c84a869f3b5ff3a90825c27c2fe38ce0cf2ab3b9fcc03
+EBUILD gtkhtml-3.32.2.ebuild 1558 SHA256 9ae4640bc5f92399fcf828250bdc2c634bb6dd5512524a9da44e3288dd9ea74b SHA512 575c1c92d70a9f7d1d085322d34f9f67f8de591f1e06aa2bfd6dcd07a945e9d6481e8b192b89d9f90840a1ecdb2ec6d4b5644cf39d405df2a06907fdde3c58e6 WHIRLPOOL 0a45f575f85b3552a70cefa959062b576cb6fc4909fbed5b58db3d3a9de4296a38eb0ee125d6f1d814bab589b417da5829e5464c80a35e864fd97562af4f3d60
+EBUILD gtkhtml-4.4.3.ebuild 1520 SHA256 b729e76a33d30a89aafc0bb6ca238625fa858fe8607d48bc938f652ce005a105 SHA512 de7c053fee674c5c83cee8a5d62a02af92362199952fdf9589ae7d4871511121f9659f14b44043739b30fb92bcdfbe3ca81361a0e9fd3b086de6dc9f8920116c WHIRLPOOL 42f5007350a8aacb9c0df079668666a404482d4a55ca4b775ebad1fc79f3bace786f37e038eea3ed431268b54ef0f434119c454022cbe49092a4f0756567aeb5
+EBUILD gtkhtml-4.4.4.ebuild 1528 SHA256 f7b21fa9e018f2cb368da9932bd05577586d6bf0eb9919c40459446afc4f4a39 SHA512 edf2200ea6669e87d0db5552f2b46db049ea38c817c4456fb46a624e96ec6341e077e164f3a8dac504606d60530fcff8404d3dcf0e815bbe80fbb3535d1a7a9a WHIRLPOOL bfd7dd749101d26db5b04c4252687bfbaac95a1d18d3a10e83f1731885b411fedb3c702765ee87673a46b85ec070ace9e1b724fc5d13a8f97b8fa0fce3d7d1c5
+EBUILD gtkhtml-4.6.1.ebuild 1462 SHA256 38235d7ccc4b7f36018410c9383e0f43f357ed686ef9fea214155793363bf037 SHA512 c0e388265f81914697ad31045a65d41ec71604c5723e8321045fc1a489c4e819acc8e8e6f547380b6ebdc5944f123e21087e78245c85174080dabef575ac0db6 WHIRLPOOL f2dae4d1c0369defb4055e9d7083a0b11243009d435a19b0aa612a65ac25358ffe35a14c4244087c2a6ac08f7476308be2067a7df18d64a9feac9e5f846ce122
+MISC ChangeLog 37853 SHA256 b93c6fb213f1b718cb9f2c1e196dc7a4d3c8cae49c267bea85c446cacf2d8c07 SHA512 53b2661851bc8b900a2d007dc32ce25ab14f6fdf79b80a35c4dff77fb8a251d5a84bc2fbae20b9cc2014516a95c61e7cec15e1d61203227aa3137fbf9c885a26 WHIRLPOOL cad6976adf4b1adca9136061b478230e2af45b8de098192f7cec170a0e64556cc47e486b0bb09c418c02e3ea107f3ce7415e43504c686555538928fce71a5b25
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNVRQACgkQuQc30/atMkCeUQCeNb8dSdX4LXOTk8WTAqQTyiPk
-gNoAn0YWKGI3kd/nqUitJ2/eQ+jpe6Sz
-=g3DR
+iQEcBAEBCAAGBQJQzwjdAAoJEJ0WA1zPCt1hCLEH/ijgUF67MHIsgXb6T+ThUG/o
+Th7YcZkbcTIGrJ2oVsWx6TtNGHUiHN+iO3DNXdGwlLASp334pZDdK0Zu6Q1MxDQl
++SyZ67TekZHCdK42OMWtPytLmgbJZWkZp8HONuKMTBFXhHryKi7zGmyCnyQx9TFc
+UsYKvTMI4TQ3h7/NsMJLYIQMujB9nWJAKH/gjurq1uBI7V6QxqfIK5yJPJCs82lc
+z0hppGGNEmVrQGaBaAzGCopetKhUVQe9RECOQ4XnV2mXTLtOKmiJGPab5ioZEqz6
+atMilb+MWOwG5+pVflCo04y82e9FDABNVVnYj2PyV2bjH5exIxL5Ikb9TXeq2Wg=
+=ZiaY
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
index 4d3b62f80286..54bff56ecbbc 100644
--- a/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.11.1.ebuild,v 1.15 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-2.11.1.ebuild,v 1.16 2012/12/17 11:58:19 tetromino Exp $
 
 EAPI="1"
 
@@ -10,11 +10,11 @@ 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/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2.1 GPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="accessibility test"
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
index 869e715936fc..9e4b3090864f 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
@@ -1,16 +1,16 @@
 # 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-3.32.2.ebuild,v 1.8 2012/10/10 21:48:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild,v 1.9 2012/12/17 11:58:19 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2
 
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="3.14"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.2.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.2.2.ebuild
deleted file mode 100644
index 4e6d70910735..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.2.2.ebuild,v 1.8 2012/05/05 06:25:21 jdhore 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
-	virtual/pkgconfig"
-
-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
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild
index 80a3fa043bdb..27ee53fed564 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.7 2012/10/28 15:53:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.3.ebuild,v 1.8 2012/12/17 11:58:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils
 
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="GPL-2 LGPL-2"
+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=""
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild
index e1e16fb07f5a..5351114c62c8 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.2 2012/10/14 23:22:57 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.4.4.ebuild,v 1.3 2012/12/17 11:58:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2 eutils
 
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="GPL-2 LGPL-2"
+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=""
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.2.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild
index 38d329fee9d5..32f4c7ca4c78 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.2.3.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild
@@ -1,27 +1,27 @@
 # 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.2.3.ebuild,v 1.8 2012/07/15 17:45:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.6.1.ebuild,v 1.1 2012/12/17 11:58:19 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 eutils
+inherit gnome2
 
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="http://projects.gnome.org/evolution/"
 
-LICENSE="GPL-2 LGPL-2"
+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"
+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/cairo-1.10:=
 	x11-libs/pango
 	>=x11-themes/gnome-icon-theme-2.22.0
-	>=app-text/enchant-1.1.7
+	>=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"
@@ -31,11 +31,15 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.0
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_prepare() {
 	ELTCONF="--reverse-deps"
 	G2CONF="${G2CONF}
 		--disable-static"
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+	# 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() {