Version bump, drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 17 insertions, 33 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index aeacdb53879f..03123abe98e0 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.293 2014/07/23 15:18:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.294 2014/10/02 11:45:36 pacho Exp $
+
+*gtkhtml-4.8.4 (02 Oct 2014)
+
+  02 Oct 2014; Pacho Ramos <pacho@gentoo.org> +gtkhtml-4.8.4.ebuild,
+  -gtkhtml-4.6.6.ebuild:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gtkhtml-4.8.3.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 29fd3308c5f4..a273eb125924 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -3,27 +3,17 @@ Hash: SHA256
 
 AUX gtkhtml-3.32.2-g_thread_init.patch 669 SHA256 a633ca81745ff46e0b9aaa8c6748014779d64bb38f8ca4d290f6e6046dcce115 SHA512 9462abc3c0b3d3c7edfde95af27334bb0be5bcdd78c59e0e33b53bd5dfaa4bce1227d380c87b71956c544463fe5d4c4be1d32b2e71224215e8609be5be93d735 WHIRLPOOL 3f102b287b684078d5b2a9ea2d4d12e881157346a6d648581c30d8330a91149de74051fa4755fefe96637d123add41157b8979b2253ffac25bac5305975ccaba
 DIST gtkhtml-3.32.2.tar.bz2 1217025 SHA256 8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f SHA512 a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5 WHIRLPOOL e6563edfd31a430853533dbdc3a07101e919c672b3ce79f6cf94167067c615e60b5677712cfa5672767895f099cc548efe821d1b1515e1f84c5ddd19a5f9a73f
-DIST gtkhtml-4.6.6.tar.xz 1060284 SHA256 145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd SHA512 1980d147fd1bba30bb5711af88a6b5135d42dfdb8efbd40f6a3ee2b3af20d7a17d1c0bdf9988d8f1a6981ecc8690fd168ed713b051a67b95fa219ec0d548490d WHIRLPOOL c82d4c1c5e2e92847d8059b5868d2096467b0b18bcfe1928bae5a472c27b833a23523ca549a84fbe5eab1b59a09416411b85a06db643fbeb6e4973f7dae47a4f
 DIST gtkhtml-4.8.3.tar.xz 1049224 SHA256 e72a6e9b180217aefb1d9dbd8a2fd41f00419cd1f268e1a7e1e2aef2b54a8341 SHA512 175e86974a3b9499d20166a11a1b30c680dd1b55baae32f3595153994daf42c628685cbc2db683354d8476b2c78b36490e929bebe3c8b2aa8248e40c2188b4da WHIRLPOOL d3cb784e63770c7292457105f28dcb0c66960775c60c11dbf106130a69fae5a1f1abdfd4ac7fbbfcb688954401cd903ad321633ea9fa43eca3657b39c9b7e8db
+DIST gtkhtml-4.8.4.tar.xz 1049712 SHA256 00363771f5c5fef28ec90bcd643d9375d61efa6c88e770e874c3b64d3cf3b25d SHA512 f7bb5ba73722809d7388fc98a19beb5cf0df01e8be8ce0b46c4c7bd4e0c64fb672f2318ffcf3094994ba094f77574669836156200f5f2ae6bf4869ce38abdb86 WHIRLPOOL 0b688681630ce9ab7c50c6d224d449ebf86a7ba598babb917b04c646b4bf81741268bfb97991345d4b4c64b20d0753fdf846af4475a7e4b3b32b57a25e9548c9
 EBUILD gtkhtml-3.32.2.ebuild 1558 SHA256 9ae4640bc5f92399fcf828250bdc2c634bb6dd5512524a9da44e3288dd9ea74b SHA512 575c1c92d70a9f7d1d085322d34f9f67f8de591f1e06aa2bfd6dcd07a945e9d6481e8b192b89d9f90840a1ecdb2ec6d4b5644cf39d405df2a06907fdde3c58e6 WHIRLPOOL 0a45f575f85b3552a70cefa959062b576cb6fc4909fbed5b58db3d3a9de4296a38eb0ee125d6f1d814bab589b417da5829e5464c80a35e864fd97562af4f3d60
-EBUILD gtkhtml-4.6.6.ebuild 1390 SHA256 4b8f05c9465783c0864cf76d6fbe16929f7d7befa7e329819352cc990d1f91ae SHA512 92b5922d52f2cf3a7717b85f0aa4c6950d963394fe0779952c8224170343fb63448f0b3e662b1e37482e4ea85b6c6801b67128a4f393ad947445d037c8b4450f WHIRLPOOL 668e79f061a5f64e44b52efb28f7195d26de3e100b5bad459b9da31e58292bd03481cd4324f19f4c3d7d6b4c7c2a3a7cdc648b5fb614bb2a755afba676250529
 EBUILD gtkhtml-4.8.3.ebuild 1104 SHA256 56154fc23d3de726585585ca3c02c89afb4a4ece9b91a5bdf6d2388c16ec5399 SHA512 b18d5c2e8869d97028f7b11360b476a16edffbdb6b0ec25bd5d57bb9255cc881f3c9b9455c32fd1b591a699f35fcaf26448dccf7c1368e407e97be453982872d WHIRLPOOL ca3f98b521593da1e6565ac3fd9233147b97b86c0d0b84cbb119f2e8b06275a9d60e3cd834413a0991479ea9d54eac565b28af5e4c4dbed6b9d603731fce99cc
-MISC ChangeLog 41029 SHA256 06699f5f97f56d6d4a201aaa7609afc96dbe26d1e44925ebf97971c900145470 SHA512 c1334ad72223c632b9f11b2ece83e081cd9536fbfb31fc4ec76296c87a63b38ab3b0a420ff612f258fb0eba83c0db360a54955d4dd566da557a378606db89d18 WHIRLPOOL 974d5c0b2234e35ed704ca401de3fd8c93076f1df74dcb8fcfc1e65b2a5964ae32f4d27972e9537079a307f022a743b4e743d36d7f6d6bda03191d39b0d00025
+EBUILD gtkhtml-4.8.4.ebuild 1108 SHA256 abdce9734c53665b716a8b87ae7e68cd600f08d52fdf58e78e140ed46255eed6 SHA512 d758e311b5653c1c9d295fb9c4e9de48cb384960fd65c2513e547b3b09387f92b1a53516dfa3fd265ccb5a6157e31e72cd490434c7b618a376cac7389a68ecb9 WHIRLPOOL 4d7e175ff512f5eb9fc0551ac35d6b4b8cc3aef3395f91e7675653cf65a08b356a022c282333a90581bf5898222170b7781a757630a5e676adb599ff5cc49727
+MISC ChangeLog 41181 SHA256 85e574a48c464cb9ecaea35e9ef47443ad4c6ea519028ecadb8feb11ef246f47 SHA512 cc08dfc20f206afa20868dbb476058a27cbae172b9b6c7857d40197a0a8b91e17a38387ece7586e7824fafed1e41a9039a741035c53f3bec495814c001658e4a WHIRLPOOL cddd934d8a8a359ac8bf8d09239b94681ba6a6baf4d4af279bc3b4d702f5fe8aaa79cc5461eae7c5bb5049f886e040435482bf9747f61672b949cfbffb97773b
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9JAAAoJELp701BxlEWfbygP/3kQgkIjVJZTYvNEeqrxbVZM
-Isb4R8szil0jXdYb2Kxr1hQ2UcaPwyrD9ARz7e3KBo0dvLBzaJT77C/vSe+Nzayn
-8MgMJ1gcbjQtUakAreejpanX3S5JlJ6/+8GB/cXANFT/+dVqKdZONP7SARYKialg
-fNw+z9aSTv87F6d2NbPvV/0lNF27i82btT7ed4YTHBuUPdYZIAJCfdL3XffWso4N
-ibAzMD9MQxWKLTJjZRgYigAdhTDd6R6HjM+yopQovb3l8oTY/eMvHZQnLXFsXhsS
-3gzYxIrik1oWWd3DlCm+tnM+e7wKZgPQ4+vnUxOGJPqUQt1WazxN5cYN4fljW36M
-L0XpIOj9GkYt1HA9Eo9gNPfNYdxAA5OL+3slA2J9yZ5AtUIR2kmRJtiYJZaOGVBq
-RAkWk1pyQI1VQZJfcQEVNVlkVoL/lI2URYyyt41xlfOV+QzHqlT9sTrA4oywmHoO
-ex66xWGA1Y8zdRBcFmCQUoFmb43w7zBogQvIPbmpxgehrJTsjz0Ggi1himUDMu0J
-U4icyK9+XY39fMK+646HsPePJIw3mPhp4FxdnXcSZxQSVi4v7gqCKaAK9wcv+ggz
-xAnQFyT9NgEV/ejkRMvTwuYqQSBqynQqpmdQ3DATeAlaLIC9pnuilUgpCyqZzdmS
-VSeZbMy/X9DMi8oEhdt+
-=FZpq
+iEYEAREIAAYFAlQtOuEACgkQCaWpQKGI+9T/RwCfd+Oh7Tm/y5hq3TSz2Wt+H80A
+eykAn0eHtMuLIlTeFggWCCmhaResOzj8
+=eZ0F
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.6.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild
index d1fb9905cc98..16b62a980311 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.6.6.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.6.6.ebuild,v 1.5 2014/02/22 22:00:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild,v 1.1 2014/10/02 11:45:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,19 +8,18 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="http://projects.gnome.org/evolution/"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
 
 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/gtk+-3.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
@@ -33,17 +32,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Reason?
-	ELTCONF="--reverse-deps"
-
-	# 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_configure() {
 	gnome2_src_configure --disable-static
 }