Version bump, removes deprecation flags. Drop old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 10 insertions, 52 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 446a46f67386..49c1069884ca 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # 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.243 2012/01/18 20:41:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.244 2012/01/20 22:39:15 tetromino Exp $
+
+*gtkhtml-4.2.3 (20 Jan 2012)
+
+  20 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gtkhtml-4.0.2.ebuild, -gtkhtml-4.2.1.ebuild, +gtkhtml-4.2.3.ebuild:
+  Version bump, removes deprecation flags. Drop old.
 
   18 Jan 2012; Markus Meier <maekke@gentoo.org> gtkhtml-4.2.2.ebuild:
   arm stable, bug #393007
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.0.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.0.2.ebuild
deleted file mode 100644
index 4f15c0c4bead..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.0.2.ebuild
+++ /dev/null
@@ -1,47 +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-4.0.2.ebuild,v 1.1 2011/09/09 17:02:47 pacho 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:3
-	>=x11-libs/cairo-1.10
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=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="${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"
-}
-
-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.2.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.2.3.ebuild
index ad8a1d24ca11..be9c1e792024 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.2.1.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2011/10/31 07:11:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.2.3.ebuild,v 1.1 2012/01/20 22:39:15 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -34,8 +34,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	ELTCONF="--reverse-deps"
 	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecated-warning-flags"
+		--disable-static"
 	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
 }