Remove deprecated gtkhtml:3.8 support, bug #280961.

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

4 files changed, 13 insertions, 12 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 31ade10e20e1..845ea7042133 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.15 2009/03/20 17:35:46 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.16 2009/09/12 21:35:59 eva Exp $
+
+  12 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org> php-gtk-2.0.0.ebuild,
+  php-gtk-2.0.1.ebuild, metadata.xml:
+  Remove deprecated gtkhtml:3.8 support, bug #280961.
 
   20 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/dev-php5/php-gtk/metadata.xml b/dev-php5/php-gtk/metadata.xml
index 2bc83cfd3e16..c82175bac8df 100644
--- a/dev-php5/php-gtk/metadata.xml
+++ b/dev-php5/php-gtk/metadata.xml
@@ -9,7 +9,6 @@
   <use>
     <flag name="extra">Enable GtkExtra support</flag>
     <flag name="glade">Enable libglade support</flag>
-    <flag name="html">Enable GtkHTML2 support</flag>
     <flag name="libsexy">Enable libsexy support</flag>
     <flag name="mozembed">Enable GtkMozembed support</flag>
     <flag name="scintilla">Enable Scintilla support</flag>
diff --git a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild
index bdeb439326ca..49122a44679d 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.0.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0.ebuild,v 1.3 2008/12/04 20:54:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0.ebuild,v 1.4 2009/09/12 21:35:59 eva Exp $
 
 EAPI="1"
 
@@ -15,7 +15,7 @@ inherit php-ext-source-r1
 DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
 HOMEPAGE="http://gtk.php.net/"
 SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz"
-IUSE="debug doc examples extra +glade html libsexy mozembed scintilla spell"
+IUSE="debug doc examples extra +glade libsexy mozembed scintilla spell"
 LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -38,7 +38,6 @@ RDEPEND=">=dev-lang/php-5.1.2
 	>=dev-libs/atk-1.9.0
 	extra? ( >=x11-libs/gtk+extra-2.1.1 )
 	glade? ( >=gnome-base/libglade-2.5.0 )
-	html? ( >=gnome-extra/gtkhtml-3.10.0:3.8 )
 	libsexy? ( >=x11-libs/libsexy-0.1.10 )
 	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
 	spell? ( >=app-text/gtkspell-2.0.0 )"
@@ -89,12 +88,12 @@ src_compile() {
 	./buildconf
 
 	econf $(use_with extra) \
-		$(use_with html) \
 		$(use_with libsexy) \
 		$(use_with mozembed) \
 		$(use_with spell) \
 		$(use_with debug) \
 		$(use_enable scintilla) \
+		--without-html \
 		--without-sourceview \
 		${GLCONF}
 
diff --git a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
index a9204c8c2cd1..d5581dfc81a7 100644
--- a/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1.ebuild,v 1.2 2008/12/04 20:54:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1.ebuild,v 1.3 2009/09/12 21:35:59 eva Exp $
 
 EAPI="1"
 
@@ -15,7 +15,7 @@ inherit php-ext-source-r1
 DESCRIPTION="PHP 5 bindings for the Gtk+ 2 library."
 HOMEPAGE="http://gtk.php.net/"
 SRC_URI="http://gtk.php.net/distributions/${P}.tar.gz"
-IUSE="debug doc examples extra +glade html libsexy mozembed scintilla spell"
+IUSE="debug doc examples extra +glade libsexy mozembed scintilla spell"
 LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -38,7 +38,6 @@ RDEPEND=">=dev-lang/php-5.1.2
 	>=dev-libs/atk-1.9.0
 	extra? ( >=x11-libs/gtk+extra-2.1.1 )
 	glade? ( >=gnome-base/libglade-2.5.0 )
-	html? ( >=gnome-extra/gtkhtml-3.10.0:3.8 )
 	libsexy? ( >=x11-libs/libsexy-0.1.10 )
 	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
 	spell? ( >=app-text/gtkspell-2.0.0 )"
@@ -91,12 +90,12 @@ src_unpack() {
 
 src_compile() {
 	my_conf="$(use_with extra) \
-		$(use_with html) \
 		$(use_with libsexy) \
 		$(use_with mozembed) \
 		$(use_with spell) \
 		$(use_enable debug) \
 		$(use_enable scintilla) \
+		--without-html \
 		--without-sourceview \
 		$(use glade || echo '--without-libglade')"
 	php-ext-source-r1_src_compile