Version bump, drop old

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

4 files changed, 15 insertions, 74 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 7af561955fb3..a7de0891d45f 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.290 2014/06/13 10:42:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.291 2014/07/14 12:14:21 pacho Exp $
+
+*gtkhtml-4.8.3 (14 Jul 2014)
+
+  14 Jul 2014; Pacho Ramos <pacho@gentoo.org> +gtkhtml-4.8.3.ebuild,
+  -gtkhtml-4.8.1.ebuild, -gtkhtml-4.8.2.ebuild:
+  Version bump, drop old
 
 *gtkhtml-4.8.2 (13 Jun 2014)
 
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index d32a1d1af077..4aafbba855d9 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -4,18 +4,16 @@ 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.1.tar.xz 1049208 SHA256 558bf8ec61d9e24cd67301613fc26ab54a495b4b75af5770d1259128aaeefa63 SHA512 8fe55bad55f8320078ac794af8d16bff0815141aef7a68c8bfa8b0f96cd2f619b4c38fa102e46182301f19d7b03f6ab887cbfe33cb650d4c87e8aacb04258ff5 WHIRLPOOL 68aa35efafae5ac3836ab9b7fc0bf2170ec52a8cd0517d0abaa940cc70165dade961099f4ecb2387922424cc01aaedb958c60959a1379724339ed9d2cd78e3ab
-DIST gtkhtml-4.8.2.tar.xz 1049644 SHA256 58d2d6bafd221fdc07982ad0455fd168afc7fb642465d53b66b07328eab32868 SHA512 68e66d5dfd300df14245f4a50d2b30c5266d96df1d1b1658aeeb05c081792b88d73a2b3f25d606e352f80e1bce5bc46b93ba99d9541d1441a96dcc8975e95e82 WHIRLPOOL 17cf1a02f49b53a4dc727403777af6d61f3a34644c53dec317c6d0ceb6ee613f7abd61922301cc6b016fd0e558ead994f49e3b488394edeb63b6a4d90e1d5055
+DIST gtkhtml-4.8.3.tar.xz 1049224 SHA256 e72a6e9b180217aefb1d9dbd8a2fd41f00419cd1f268e1a7e1e2aef2b54a8341 SHA512 175e86974a3b9499d20166a11a1b30c680dd1b55baae32f3595153994daf42c628685cbc2db683354d8476b2c78b36490e929bebe3c8b2aa8248e40c2188b4da WHIRLPOOL d3cb784e63770c7292457105f28dcb0c66960775c60c11dbf106130a69fae5a1f1abdfd4ac7fbbfcb688954401cd903ad321633ea9fa43eca3657b39c9b7e8db
 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.1.ebuild 1352 SHA256 058209d7801e09f55c59f31d2456a097b434a9672981b816ac5da9d59debe6d9 SHA512 47f850c1addf26857d6e094e0cfc886d6251fd6aa096845f0fa4534c89ac03b091c9813a2c47f1707e120603833e4494dcca649fbcbcdb175165389286a85d3f WHIRLPOOL 7fb96a17a430bf3a7acd4d748e72a4e97676ce3b1c8e02507976961cc2c073e5b96af61e5cd7799a0203eba7283a2ec50e35e03e30ac998cadf8fdf517563cf2
-EBUILD gtkhtml-4.8.2.ebuild 1336 SHA256 a0578778dfd728afdf95b3255923cd8269adbfe44cebf4312ad4a6be79863852 SHA512 377f79f1d30d1c63b0a55e5f653e13e15b0c97577852f68aba2c7a8e302f84c48cb18dbd4ed2a491e278d613464909ac5906bcec9c537b167073965f7bf00b7c WHIRLPOOL 97e1bf3e9dcae5202f067a21c8c93ba44b229174d9ff723d875b75e05ec117f22b0461eb2ed97262dcf22e107cf75f62c5e9a52921721feb8e836adc42bc31b7
-MISC ChangeLog 40644 SHA256 d3a677e1f52fa97729a2998f7718ed1a82362535287608e42a2003b4f0368554 SHA512 b465c3daaa91d9ec43ba543b0997285da1a7361bf1a147ee5611f35774c2ed0b78cd3828d574756617b68b19a21b729d11410f6f23f9f0d21d3500803780d02b WHIRLPOOL 17fec38de6b8059a64c506e740656c354d5bb6c8b1e972774ee47d756bd4ebfc27342c636ac1327e497f6a47fbaf6fdf5627045c678c3394a2446c05834bbc54
+EBUILD gtkhtml-4.8.3.ebuild 1108 SHA256 4642a8d0e421083471b65724037cae8e6c9e6f92a9965cba6754328756d07f0c SHA512 23ce8d05eeba95931fce9c669315a16eb78b486bb2c60102df8ba1d058619350c3cc522001c7492c584be97d2c7699d179ec32cf2b87fd953165b82a6c3ebcea WHIRLPOOL 83befe9cd6a66b3c6b9d01e15c899bdfc8fd6231876f66ca84ee0c373f6f6c32d8fe846d343c1b7be582485b8db82cdf02854884b6ec245e67332be3c2b19723
+MISC ChangeLog 40817 SHA256 f17f81f7c5261550ad3f1ae806f1487e9da49de7166a6e6fe762922ae3e925dc SHA512 1c2189e3b9aad2f556d17f542394405a34f7967a7611ff752f5580e71083dff62a7425144c10d67c5c4fe56a6a96e9c1212181c2ebe1b18f9619ff5b9a42ef1b WHIRLPOOL 2d580b07eff51231a68417675df0d7374abfabd6c206fd3ae335049f441c9d8e789ec88f4d850fcb85860dde75063cbec08ec6e5340d1f610470c4d8e49a7e15
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOa1aoACgkQCaWpQKGI+9RygwCeM2vYQKre0cqNir8AFaiEsnCb
-mPkAmwZPdIACsl6OlFKPFfuqEBe6FSK3
-=E4At
+iEYEAREIAAYFAlPDyZ4ACgkQCaWpQKGI+9T2yACfXEOMJOOCDuIeEmTDrQ+9IRDN
+ZscAnjPu1Q+rzB/9JhfqC7FK/G3KPqBq
+=sRXi
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.1.ebuild
deleted file mode 100644
index fceda0e92009..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.8.1.ebuild,v 1.1 2014/05/31 09:53:01 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-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"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/cairo-1.10:=
-	x11-libs/pango
-	>=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
-"
-
-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
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.3.ebuild
index 2aad700f2765..7a29937b84fa 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.8.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.3.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.8.2.ebuild,v 1.1 2014/06/13 10:42:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.8.3.ebuild,v 1.1 2014/07/14 12:14:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -32,14 +32,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Regenerate marshallers for <glib-2.31 compatibility, upstream bug #731611
-	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
 }