[gentoo-commits] proj/gnome:master commit in: gnome-extra/gtkhtml/

[Nirbheek Chauhan]

commit:     19dca1a8c23078a2d98df4d4f406fc5ee2ced032
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 12:18:29 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 12:18:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=19dca1a8

gnome-extra/gtkhtml: 3.91.6 -> 3.91.90, rename gtkhtml-editor-test

* Instead of removing it from SLOT=3.14, just rename it for SLOT=4.0 .
  This reduces one blocker for the user to resolve

---
 gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild          |   41 --------------------
 ...l-3.32.2-r200.ebuild => gtkhtml-3.91.90.ebuild} |   15 +++----
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
deleted file mode 100644
index b88b189..0000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.91.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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-3.32.1.ebuild,v 1.1 2010/11/28 14:43:21 pacho Exp $
-
-EAPI="3"
-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=""
-
-RDEPEND=">=x11-libs/gtk+-2.99.2:3
-	>=x11-libs/cairo-1.10
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=gnome-base/orbit-2
-	>=app-text/enchant-1.1.7
-	gnome-base/gconf:2
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-
-	!!<gnome-extra/gtkhtml-3.32.2-r200:3.14"
-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"
-}

diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
similarity index 79%
rename from gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild
rename to gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
index b82b3fc..aca0d2f 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.2-r200.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.91.90.ebuild
@@ -12,21 +12,19 @@ DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
-SLOT="3.14"
+SLOT="4.0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
+RDEPEND=">=x11-libs/gtk+-3.0:3
+	>=x11-libs/cairo-1.10
 	>=x11-themes/gnome-icon-theme-2.22.0
 	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
 	gnome-base/gconf:2
 	>=app-text/iso-codes-0.49
 	>=net-libs/libsoup-2.26.0:2.4"
-# Depend on the 4.0 slot for the files removed below
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/gtkhtml:4.0"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	x11-proto/xproto
 	sys-devel/gettext
 	>=dev-util/intltool-0.40.0
@@ -43,6 +41,7 @@ pkg_setup() {
 src_install() {
 	gnome2_src_install
 
-	# Don't clash with gtkhtml:4.0
-	rm -vf "${ED}/usr/bin/gtkhtml-editor-test" || die
+	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
 }