Remove deprecated gtkhtml:3.8 support, bug #280961.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 27 insertions, 16 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/Manifest b/dev-php5/php-gtk/Manifest
index eff1a4a5cde9..79bbc520feab 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX no-cli-check.patch 391 RMD160 15754f4f2fe8a2e55c521a6301e1db2ac971ec31 SHA1 3a43d565115737c3292d4ae4779ca2f461ba6e85 SHA256 7d505e67ddf87808842dc0b747b12f99b60af74526bee3b59159ed8346449e23
 AUX php-gtk-2.0.0-no-cli-check.patch 402 RMD160 82dcbd36ce596c98fed40523e4751a40fabbbf13 SHA1 d3acf2905959f6c5e7997e16efa96413d3887e6a SHA256 d6c0d4d541647c205d73b1f8e20747f2974c44494350cf59c0b24198f4462dab
 DIST php-gtk-2.0.0.tar.gz 1022830 RMD160 de59554ba447c755ea64b805ba65eb24fad7efa8 SHA1 f9172ce64d85479d341c808b44a6127b164cd1a2 SHA256 711934fbdd6b84d8e2b78588f6b4ef9a4e9378e622a4e80279744ff6bded0718
@@ -7,7 +10,14 @@ DIST php_gtk_manual-20071130_en.tar.bz2 922621 RMD160 b654f1ee83a3608208005d60a8
 DIST php_gtk_manual-20071130_ja.tar.bz2 873089 RMD160 f34e2887a4890877b1582113fd07b399b0b72ceb SHA1 e01128053e96147a25b44a0aea24bef0023f2280 SHA256 3a990b8e156e88a06c70a6eab450600304132fc3670f4240a8a152413d333ccc
 DIST php_gtk_manual-20071130_pt_BR.tar.bz2 940444 RMD160 37fd4a08f8aadeec338481fd61d4f8c2bc831adc SHA1 b3cd5ce5e9e9c4ec5ab6db7b55063ce8f8ffd7eb SHA256 7dfecfafbc2f3e796f5deafbce5e389eba2877e453b3fd9fd69e3fc5c33df083
 DIST php_gtk_manual-20071130_zh_CN.tar.bz2 869165 RMD160 3b3b51f3c4e1ca9827fc238e86e59a2b64d40d9e SHA1 091215691890cf8b51c2fea962fca18f8c845e05 SHA256 2c242e78b0de5253edafdc0df852cc32b2c9fa49878fa494dfe5e1df10790ae2
-EBUILD php-gtk-2.0.0.ebuild 3276 RMD160 e2fabb43cc2aab2b4aa868e3796573a044cc4179 SHA1 f1b83c95705aa3aba50b8639d34f488f3b6dedcf SHA256 47c4803c3e93ce0f26c42a1a5087966743f48a007595a74b9a85a45139f70fdd
-EBUILD php-gtk-2.0.1.ebuild 3397 RMD160 64dba42eb4af621debf9892af48cdffbcec34fcd SHA1 8b016cd489f8ac9313bb4855f7569be5f6dcf764 SHA256 00fdfa4cb9eaaf695d80aabdd9404fd0a04f7dfe86e601315f6e65b313863a6e
-MISC ChangeLog 3090 RMD160 66cff1f58108328cd2918c03d50fbd8944460d7e SHA1 11baf97149764689b4a25ab0612b9c348092280e SHA256 4fc4d6ad00269dbf3190d4504cb582059d695b3f2469daad2c9aa0accbb8873f
-MISC metadata.xml 668 RMD160 e5d2fa4e02b028c09fe67f2c0f200705503ee22b SHA1 3496f9a8caabfd325abf006f55747ff93da3272f SHA256 896ad190c2e9cbd7f7281eb0dd35ddb2b98b44e18ad84eb0ef4b7e37b3a6be80
+EBUILD php-gtk-2.0.0.ebuild 3225 RMD160 363bfb217935bdbabcc0735ee2892e30c683fcdd SHA1 33607dd4ba7066b2dea22e0fb079443484fc1cc7 SHA256 0186a6abcc9803cdcc86054cfc5cd26dee3bb08b890ac09af0ab4a6723736484
+EBUILD php-gtk-2.0.1.ebuild 3346 RMD160 c873d2b00a87f622a5074865dd29c36333e161f2 SHA1 2170475534fc65506829fb98bd210a253f02f517 SHA256 9387c29db81a483bb1c8bfe200c5cb117a173f761c1829e979d781e455a3ad27
+MISC ChangeLog 3251 RMD160 86652bca7390b498ebec6f3daea371fc57046da0 SHA1 61c35561f15ccedcc29793354f4eec1b7583bfda SHA256 98301a8abc46e50ce75737758153a27cd2f0616c87f58251141138ac1d749706
+MISC metadata.xml 615 RMD160 6c77c1cf573b0b4be97b099ce8de4442a5ab62db SHA1 3430e283c84c55a24e9a73c3f0312d6af9f9ffa3 SHA256 747706c673860b81a665ac1878c3a8addd661d111565153be458b42f8ccf323c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqsFEkACgkQ1fmVwcYIWAaCfACeLjdgx3QASSP+nsdEgj3ZTjlA
+JckAoMnnMuNxjwzwv6PeMPrSQTYtB7GU
+=1rny
+-----END PGP SIGNATURE-----
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