Version bump fixing a crash, remove old.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

5 files changed, 8 insertions, 92 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index dbafc0dffa25..e8a70643aece 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.225 2010/10/17 14:57:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.226 2010/11/28 14:43:21 pacho Exp $
+
+*gtkhtml-3.32.1 (28 Nov 2010)
+
+  28 Nov 2010; Pacho Ramos <pacho@gentoo.org> -gtkhtml-3.28.3.ebuild,
+  -gtkhtml-3.32.0.ebuild, +gtkhtml-3.32.1.ebuild, -files/gtkhtml-editor.xml:
+  Version bump fixing a crash, remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> gtkhtml-3.30.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-editor.xml b/gnome-extra/gtkhtml/files/gtkhtml-editor.xml
deleted file mode 100644
index cd91de3679d6..000000000000
--- a/gnome-extra/gtkhtml/files/gtkhtml-editor.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<glade-catalog name="gtkhtml-editor" library="glade-gtkhtml-editor" depends="gtk+">
-
-  <glade-widget-classes>
-    <glade-widget-class name="GtkhtmlColorCombo" generic-name="color-combo" title="Color Combo Box">
-      <properties>
-        <property id="color"/>
-        <property id="popup-shown"/>
-      </properties>
-    </glade-widget-class>
-    <glade-widget-class name="GtkhtmlColorSwatch" generic-name="color-swatch" title="Color Swatch">
-      <properties>
-        <property id="color"/>
-      </properties>
-    </glade-widget-class>
-    <glade-widget-class name="GtkhtmlComboBox" generic-name="combo-box" title="Radio Action Combo Box">
-      <properties>
-        <property id="action"/>
-      </properties>
-    </glade-widget-class>
-  </glade-widget-classes>
-
-  <glade-widget-group name="widgets" title="GtkHTML Editor">
-    <glade-widget-class-ref name="GtkhtmlColorCombo"/>
-    <glade-widget-class-ref name="GtkhtmlColorSwatch"/>
-    <glade-widget-class-ref name="GtkhtmlComboBox"/>
-  </glade-widget-group>
-
-</glade-catalog>
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.28.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.28.3.ebuild
deleted file mode 100644
index a6abb7a9518d..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-3.28.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.28.3.ebuild,v 1.7 2010/08/18 21:15:03 maekke Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-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="glade"
-
-# We keep bonobo until we can make sure no apps in tree uses
-# the old composer code.
-RDEPEND=">=x11-libs/gtk+-2.16
-	>=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
-	glade? ( dev-util/glade:3 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	ELTCONF="--reverse-deps"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_with glade glade-catalog)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Add missing file, upstream bug #597361
-	cp "${FILESDIR}/gtkhtml-editor.xml" \
-		"${S}/components/editor/gtkhtml-editor.xml" || die "cp failed"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
-		a11y/Makefile.am a11y/Makefile.in || die "sed 2 failed"
-
-	# ./../doltcompile: line 31: --silent : command not found
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
index f529d6e3dedc..25b67e89cd56 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.0.ebuild,v 1.2 2010/10/12 20:56:33 eva Exp $
+# $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"
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
index 84c40c2c6ea0..da6fd63d0085 100644
--- a/gnome-extra/gtkhtml/metadata.xml
+++ b/gnome-extra/gtkhtml/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name='glade'>Provide integration with <pkg>dev-util/glade</pkg>.</flag>
-</use>
 </pkgmetadata>