import from the php overlay

Package-Manager: portage-2.1.4.4

4 files changed, 28 insertions, 17 deletions

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 8bd80dc4c31b..9880347d4cb9 100644
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.11 2008/03/04 19:39:43 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.12 2008/03/07 19:58:43 armin76 Exp $
+
+  07 Mar 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/php-gtk-2.0.0-no-cli-check.patch, php-gtk-2.0.0.ebuild:
+  import from the php overlay
+
+  07 Mar 2008; Jakub Moc <jakub@gentoo.org> php-gtk-2.0.0.ebuild:
+  Remove sourceview use flag wrt Bug 212595
 
 *php-gtk-2.0.0 (04 Mar 2008)
 
diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index 8dc7ba8527fa..d21149972e51 100644
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -1,7 +1,5 @@
------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
 DIST php-gtk-2.0.0beta.tar.gz 1291728 RMD160 107f030baa5bc3752a815eacb11a8fa2d8086780 SHA1 1d0de61ee4a082aa103875a87e86c62d5c35327b SHA256 9e43326859bb59f79a8e688bd1cb457a915829cf2a5a626f1a06395abb9b1430
 DIST php_gtk_manual-20071130_bg.tar.bz2 871540 RMD160 5d2499ecc023ecff37d72bd32cbc3c5c6511926f SHA1 0f3c3d5aaf2596832a60b8aa6c2bbae137cdd9b4 SHA256 480a79abf3fda29f5bb22deca71110dc9be0ceedf7688df1bc4ba94254b23cbe
@@ -9,14 +7,7 @@ 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 3339 RMD160 698322c720bbdfe1614025f3f14a9a66b9ece9f7 SHA1 a8927f1180e068b87d31241b9eb0a26418a9bbc4 SHA256 2691d10a5e77bf21d8b24b370f633ca58d9ed3294bd77f053519612ec4949753
+EBUILD php-gtk-2.0.0.ebuild 3276 RMD160 11604973d01f474ca9cc8aa2eda0e69136d31700 SHA1 388f8d95acecf87580e869e0fcb262562619db9b SHA256 163860e8cb6916169c935a858fd45a6333388345cd5bf41e48f2446489604223
 EBUILD php-gtk-2.0.0_beta-r1.ebuild 3278 RMD160 7edcafdc0869f1a13bbde53446e24c23fba48fe1 SHA1 093a4a5ba97b8ef8b409e9f7a102182471aa3d23 SHA256 0fcfebb22e7b183900ef870180d96985a3162ffecb1968ff60e829c03176abc2
-MISC ChangeLog 2211 RMD160 00f33aa113bda7daacabec0165c2efd4a8f55641 SHA1 9af0cf2df45a78d7b6365ccbda2f2651e184f8ce SHA256 bc6d7edda51796394cff68940de1679407e7284d673e5d29080d65d14e48c727
+MISC ChangeLog 2469 RMD160 e2bacb82ccb37375e85c71ed8f57191b3779f50d SHA1 479af8ad557ade7d6c0527c0bd273f85feebb42e SHA256 2c8c924655569696a4ea842268e9db0e3b7b62237c0ae75aeb2619abacd16d48
 MISC metadata.xml 403 RMD160 e3aeec7bef8ab5548c3146c01d959d08bd8bad2e SHA1 546780bec6b4636c191e16d45d9707f356be681b SHA256 48da2cda3ea301263a4c75fddcc263e565f1790ec75e744765076ad85f5d9ddb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHzaWFz974XjDVpbkRAiJoAKCSokidDY8S1ArJJWEhgo4ywmIqngCgkc++
-mAyLWYmbYA5IqauXjoBZKkU=
-=XKKV
------END PGP SIGNATURE-----
diff --git a/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch b/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch
new file mode 100644
index 000000000000..8b8d3aecee37
--- /dev/null
+++ b/dev-php5/php-gtk/files/php-gtk-2.0.0-no-cli-check.patch
@@ -0,0 +1,14 @@
+--- config.m4.orig	2008-02-13 06:05:27.000000000 +0100
++++ config.m4	2008-03-03 23:38:00.000000000 +0100
+@@ -27,11 +27,6 @@
+     AC_MSG_ERROR(Could not locate PHP executable)
+   fi
+ 
+-  PHP_SAPI=`$PHP --version | head -1 | sed -n 's/.*(\(...\)).*/\1/p'`
+-  if test "$PHP_SAPI" != "cli" ; then
+-    AC_MSG_ERROR(PHP CLI version is required[,] $PHP_SAPI found)
+-  fi
+-
+   AC_PROG_AWK
+   PHP_SUBST(AWK)
+ 
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 75a7c20db679..9b2435ff14ea 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
 # 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.1 2008/03/04 19:39:43 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.0.ebuild,v 1.2 2008/03/07 19:58:43 armin76 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 sourceview spell"
+IUSE="debug doc examples extra +glade html libsexy mozembed scintilla spell"
 LICENSE="PHP-2.02 PHP-3 PHP-3.01 LGPL-2.1 public-domain Scintilla"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -41,7 +41,6 @@ RDEPEND=">=dev-lang/php-5.1.2
 	html? ( >=gnome-extra/gtkhtml-3.10.0 )
 	libsexy? ( >=x11-libs/libsexy-0.1.10 )
 	mozembed? ( >=www-client/mozilla-firefox-1.5.0 )
-	sourceview? ( >=x11-libs/gtksourceview-1.2.0:1.0 )
 	spell? ( >=app-text/gtkspell-2.0.0 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
@@ -93,10 +92,10 @@ src_compile() {
 		$(use_with html) \
 		$(use_with libsexy) \
 		$(use_with mozembed) \
-		$(use_with sourceview) \
 		$(use_with spell) \
 		$(use_with debug) \
 		$(use_enable scintilla) \
+		--without-sourceview \
 		${GLCONF}
 
 	emake || die "make failed!"