Fix bug #153019.

Package-Manager: portage-2.1.2_pre3-r9

3 files changed, 20 insertions, 31 deletions

diff --git a/dev-php4/xdebug/ChangeLog b/dev-php4/xdebug/ChangeLog
index e3c66b4e14a9..e498b30d799f 100644
--- a/dev-php4/xdebug/ChangeLog
+++ b/dev-php4/xdebug/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php4/xdebug
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/xdebug/ChangeLog,v 1.10 2006/10/24 07:51:54 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/xdebug/ChangeLog,v 1.11 2006/10/27 19:01:02 sebastian Exp $
+
+  27 Oct 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  xdebug-2.0.0_rc1.ebuild:
+  Fix bug #153019.
 
   24 Oct 2006; Sebastian Bergmann <sebastian@gentoo.org>
   -xdebug-1.3.2.ebuild, -xdebug-2.0.0_beta6.ebuild, xdebug-2.0.0_rc1.ebuild:
diff --git a/dev-php4/xdebug/Manifest b/dev-php4/xdebug/Manifest
index 2276e2f1a32c..632b369bb5f1 100644
--- a/dev-php4/xdebug/Manifest
+++ b/dev-php4/xdebug/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST xdebug-2.0.0rc1.tgz 252286 RMD160 421ef0a9535954f17ddd585e57cf949582e55533 SHA1 6481f458297a0edab39c08ed181fb3bbe0b29520 SHA256 f3b8a65430f2e727460f8fa1ee9c6b2187befa939f99a10d2cf1fa1042bd42f5
-EBUILD xdebug-2.0.0_rc1.ebuild 3822 RMD160 33241c0f157517c0ded4f1c05fb8dc8d16a761c1 SHA1 6313e700d95c57ebd4e992a550fac7a4ab344392 SHA256 f0c6af16faba59d716505a2b9b38352bca7f103ff13d048d37682098bb38d1ab
-MD5 319b1e03b1ed97f40208289396ae1381 xdebug-2.0.0_rc1.ebuild 3822
-RMD160 33241c0f157517c0ded4f1c05fb8dc8d16a761c1 xdebug-2.0.0_rc1.ebuild 3822
-SHA256 f0c6af16faba59d716505a2b9b38352bca7f103ff13d048d37682098bb38d1ab xdebug-2.0.0_rc1.ebuild 3822
-MISC ChangeLog 1592 RMD160 fe4deacda834d5fe23dec7aecc6216f4341ff7a9 SHA1 7ff4c8ebdc3e7d9b97aa8e8180a85f95371b9016 SHA256 94459445058f503865f70a11b335ecc7f3d353976fc3f80750112260a6a830a5
-MD5 0b01065f7f1324d6949a3737e7cf87c7 ChangeLog 1592
-RMD160 fe4deacda834d5fe23dec7aecc6216f4341ff7a9 ChangeLog 1592
-SHA256 94459445058f503865f70a11b335ecc7f3d353976fc3f80750112260a6a830a5 ChangeLog 1592
+EBUILD xdebug-2.0.0_rc1.ebuild 3494 RMD160 502c8699af92823400841a1030b04d4583582264 SHA1 890237e7e2350358b8c84456c5305d4b8194fe0d SHA256 679c5be9527addefb6b1093e4e77df7cc905a52ecbbba5c0cf4e7208ec6318e3
+MD5 53ffd77482f575c671aca198316a2c76 xdebug-2.0.0_rc1.ebuild 3494
+RMD160 502c8699af92823400841a1030b04d4583582264 xdebug-2.0.0_rc1.ebuild 3494
+SHA256 679c5be9527addefb6b1093e4e77df7cc905a52ecbbba5c0cf4e7208ec6318e3 xdebug-2.0.0_rc1.ebuild 3494
+MISC ChangeLog 1696 RMD160 f87553c3026d9edc8f249bd02bd462c2413e4ecc SHA1 af79e47831b119ee29e3c6091c82385fc03d98d8 SHA256 db6b9834fbfa4ad0229647d65365ca765aa9831f5035539957235c3e56e20faa
+MD5 f8ff803a8eb92a1f56d2ad754e759608 ChangeLog 1696
+RMD160 f87553c3026d9edc8f249bd02bd462c2413e4ecc ChangeLog 1696
+SHA256 db6b9834fbfa4ad0229647d65365ca765aa9831f5035539957235c3e56e20faa ChangeLog 1696
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -20,7 +20,7 @@ SHA256 c11162fdd12dd78ea80b13c2ef855fc3f24eb9694eb3e90769b217a39ac0c44a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFPcYhaGfFFLhbXWkRAlG2AJwJLjuoe/LVK1+FtQDV6TneJ9ZDuACgmtfO
-UBXqksddLKKZ8LGBTG7Lebk=
-=t0er
+iD8DBQFFQld0aGfFFLhbXWkRAj7YAKCO4c45+v4FCj8glQSZ8W6byd/RlwCeKV+u
+pq7oZkFadBxkziC9TaZB5BA=
+=poGd
 -----END PGP SIGNATURE-----
diff --git a/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild b/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild
index d95bd64a5d82..dd836721c3d9 100644
--- a/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild
+++ b/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild,v 1.2 2006/10/24 07:51:54 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/xdebug/xdebug-2.0.0_rc1.ebuild,v 1.3 2006/10/27 19:01:02 sebastian Exp $
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_NAME="xdebug"
@@ -17,24 +17,12 @@ S="${WORKDIR}/xdebug-2.0.0RC1"
 LICENSE="Xdebug"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND="${DEPEND} libedit? ( || ( dev-libs/libedit sys-freebsd/freebsd-lib ) )"
-RDEPEND="${RDEPEND} !dev-php5/ZendOptimizer"
+RDEPEND="${RDEPEND}
+	!dev-php5/ZendOptimizer
+	dev-php/xdebug-client"
 
 need_php_by_category
 
-src_compile() {
-	php-ext-source-r1_src_compile
-
-	cd "${S}/debugclient"
-	chmod +x configure
-
-	econf \
-		$(use_with libedit ) \
-		|| die "Configure of debug client failed!"
-
-	emake || die "Build of debug client failed!"
-}
-
 src_install() {
 	php-ext-source-r1_src_install
 	dodoc-php NEWS README Changelog CREDITS LICENSE
@@ -83,7 +71,4 @@ src_install() {
 	php-ext-base-r1_addtoinifiles "xdebug.idekey" '""'
 	php-ext-base-r1_addtoinifiles "xdebug.var_display_max_data" '"512"'
 	php-ext-base-r1_addtoinifiles "xdebug.var_display_max_depth" '"2"'
-
-	cd "${S}/debugclient"
-	newbin debugclient xdebug
 }