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

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 40 insertions, 76 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/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() {