Clean up deprecated gtkhtml:3.8 after taking care of bug #280961.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 5 insertions, 116 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 9b5589f48e4d..5218f29e656a 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.192 2009/08/18 16:41:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.193 2009/09/12 21:39:57 eva Exp $
+
+  12 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtkhtml-3.12.3.ebuild, -files/gtkhtml-3.12.3-allow-deprecated.patch:
+  Clean up deprecated gtkhtml:3.8 after taking care of bug #280961.
 
   18 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
   +gtkhtml-3.12.3.ebuild, +files/gtkhtml-3.12.3-allow-deprecated.patch:
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
deleted file mode 100644
index bd2bd74188d5..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-3.12.3-allow-deprecated.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.am gtkhtml-3.12.3/a11y/Makefile.am
---- gtkhtml-3.12.3.orig/a11y/Makefile.am	2007-01-29 04:51:00.000000000 -0500
-+++ gtkhtml-3.12.3/a11y/Makefile.am	2008-03-04 19:56:35.000000000 -0500
-@@ -2,7 +2,7 @@ END=
- 
- INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
- 
--AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
-+AM_CFLAGS = $(GAIL_CFLAGS) -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
- 
- noinst_LTLIBRARIES = libgtkhtml-a11y.la
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/a11y/Makefile.in gtkhtml-3.12.3/a11y/Makefile.in
---- gtkhtml-3.12.3.orig/a11y/Makefile.in	2007-01-29 10:12:48.000000000 -0500
-+++ gtkhtml-3.12.3/a11y/Makefile.in	2008-03-04 19:56:38.000000000 -0500
-@@ -251,7 +251,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- END = 
- INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS) $(I18N_LIB_CFLAGS)
--AM_CFLAGS = $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
-+AM_CFLAGS = $(GAIL_CFLAGS) -DGDK_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1
- noinst_LTLIBRARIES = libgtkhtml-a11y.la
- libgtkhtml_a11y_la_SOURCES = \
- 	cell.h						\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.am gtkhtml-3.12.3/components/html-editor/Makefile.am
---- gtkhtml-3.12.3.orig/components/html-editor/Makefile.am	2007-01-29 04:50:53.000000000 -0500
-+++ gtkhtml-3.12.3/components/html-editor/Makefile.am	2008-03-04 19:56:21.000000000 -0500
-@@ -23,7 +23,6 @@ AM_CFLAGS = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
- 	-DGLADE_DATADIR=\"$(gladedir)\"			\
- 	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
- 	-DDATADIR=\""$(datadir)"\"			\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/components/html-editor/Makefile.in gtkhtml-3.12.3/components/html-editor/Makefile.in
---- gtkhtml-3.12.3.orig/components/html-editor/Makefile.in	2007-01-29 10:12:49.000000000 -0500
-+++ gtkhtml-3.12.3/components/html-editor/Makefile.in	2008-03-04 19:56:23.000000000 -0500
-@@ -325,7 +325,6 @@ AM_CFLAGS = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"\
- 	-DGLADE_DATADIR=\"$(gladedir)\"			\
- 	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
- 	-DDATADIR=\""$(datadir)"\"			\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.am gtkhtml-3.12.3/src/Makefile.am
---- gtkhtml-3.12.3.orig/src/Makefile.am	2007-01-29 04:50:59.000000000 -0500
-+++ gtkhtml-3.12.3/src/Makefile.am	2008-03-04 19:56:26.000000000 -0500
-@@ -20,7 +20,6 @@ INCLUDES = 				\
- 
- AM_CFLAGS = 						\
- 	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
- 	-DGNOME_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DLIBDIR=\""$(datadir)"\"			\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkhtml-3.12.3.orig/src/Makefile.in gtkhtml-3.12.3/src/Makefile.in
---- gtkhtml-3.12.3.orig/src/Makefile.in	2007-01-29 10:12:49.000000000 -0500
-+++ gtkhtml-3.12.3/src/Makefile.in	2008-03-04 19:56:28.000000000 -0500
-@@ -379,7 +379,6 @@ INCLUDES = \
- 
- AM_CFLAGS = \
- 	-DGDK_DISABLE_DEPRECATED=1			\
--	-DG_DISABLE_DEPRECATED=1			\
- 	-DGNOME_DISABLE_DEPRECATED=1			\
- 	-DPREFIX=\""$(prefix)"\"			\
- 	-DLIBDIR=\""$(datadir)"\"			\
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
deleted file mode 100644
index d134788d183c..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.12.3.ebuild,v 1.15 2009/08/18 16:41:48 mr_bones_ Exp $
-
-EAPI="1"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.8"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="static"
-
-RDEPEND=">=gnome-base/gail-1.1
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2
-	>=gnome-base/libbonobo-2
-	net-libs/libsoup:2.2
-	>=x11-libs/gtk+-2.4
-	>=x11-themes/gnome-icon-theme-1.2"
-
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="$(use_enable static) --enable-file-chooser"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix tests. Upstream has fix in gnome 2.19 only at this time
-	echo "components/html-editor/GNOME_GtkHTML_Editor-emacs.xml" >> "${S}/po/POTFILES.skip"
-	echo "components/html-editor/GNOME_GtkHTML_Editor.xml" >> "${S}/po/POTFILES.skip"
-	# Don't set G_DISABLE_DEPRECATED; it breaks builds
-	epatch "${FILESDIR}"/${P}-allow-deprecated.patch
-}