Fix bug #153019.

Package-Manager: portage-2.1.2_pre3-r9

3 files changed, 20 insertions, 32 deletions

diff --git a/dev-php5/xdebug/ChangeLog b/dev-php5/xdebug/ChangeLog
index 5c814d1e83fd..eee490262e13 100644
--- a/dev-php5/xdebug/ChangeLog
+++ b/dev-php5/xdebug/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/xdebug
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xdebug/ChangeLog,v 1.8 2006/10/24 07:50:15 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xdebug/ChangeLog,v 1.9 2006/10/27 19:02:30 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-2.0.0_beta6.ebuild, xdebug-2.0.0_rc1.ebuild:
diff --git a/dev-php5/xdebug/Manifest b/dev-php5/xdebug/Manifest
index b07c8c36a64d..9a8483ef8743 100644
--- a/dev-php5/xdebug/Manifest
+++ b/dev-php5/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 dec9ff043369751b95043d0145d6c2e04a1f4ef6 SHA1 190010425ae7fa28fd65a862cf8aecb247536225 SHA256 479c8b90dead13a56671952f93c3560ce4a45f96bd9b5cf1d25353463ea5e86f
-MD5 299f48e50f1584de398ec11877838a33 xdebug-2.0.0_rc1.ebuild 3822
-RMD160 dec9ff043369751b95043d0145d6c2e04a1f4ef6 xdebug-2.0.0_rc1.ebuild 3822
-SHA256 479c8b90dead13a56671952f93c3560ce4a45f96bd9b5cf1d25353463ea5e86f xdebug-2.0.0_rc1.ebuild 3822
-MISC ChangeLog 1275 RMD160 436866c4ced58dc9e0ed21b004cb3bc1f9a36798 SHA1 4eaeec5d05dc7ef2eed24c9e1607b74903276a1c SHA256 3e3ae7123cdb529e8b2a7c2aa8cbaa35b01597d4f084588644da16f024b97127
-MD5 5dcbf6c7b1a77f1d4016cf53661ad585 ChangeLog 1275
-RMD160 436866c4ced58dc9e0ed21b004cb3bc1f9a36798 ChangeLog 1275
-SHA256 3e3ae7123cdb529e8b2a7c2aa8cbaa35b01597d4f084588644da16f024b97127 ChangeLog 1275
+EBUILD xdebug-2.0.0_rc1.ebuild 3479 RMD160 01086fd7a4ef7e9c37d9fc32f655e8a1c59b3c63 SHA1 2f32355583c229ef88bc4f25627a177e343b719c SHA256 c4daf46ccb3cb947d3dfe06b93f0d59375153f9e4ac04653181a21f9503330d6
+MD5 472db69ea6e99ad2cd59b2468c3da85b xdebug-2.0.0_rc1.ebuild 3479
+RMD160 01086fd7a4ef7e9c37d9fc32f655e8a1c59b3c63 xdebug-2.0.0_rc1.ebuild 3479
+SHA256 c4daf46ccb3cb947d3dfe06b93f0d59375153f9e4ac04653181a21f9503330d6 xdebug-2.0.0_rc1.ebuild 3479
+MISC ChangeLog 1379 RMD160 1d5905655007309363cc38945e381d81101b7b55 SHA1 eb77b3f3aeb0aec6d82a57b093c53825b987f7c7 SHA256 2cf4b3c1c70c89983be654cd1cd75024c4ac9afa05b912ab17a08ded534791cb
+MD5 1d50ce179bf9653876de779a4e9d4e91 ChangeLog 1379
+RMD160 1d5905655007309363cc38945e381d81101b7b55 ChangeLog 1379
+SHA256 2cf4b3c1c70c89983be654cd1cd75024c4ac9afa05b912ab17a08ded534791cb ChangeLog 1379
 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)
 
-iD8DBQFFPcW/aGfFFLhbXWkRAoBkAJ9/OTPfSj4cMjwCb+zKzK2EJ8aziQCaAviD
-x4lRJ2X2oPZD6GM+rcb4WAs=
-=lE4B
+iD8DBQFFQlfNaGfFFLhbXWkRAlpaAJ9MSSL44+LUToenHe48Q70SqzFK4QCfTY7o
+IaY8TenoEJT86dTzb1OLVT8=
+=u2G1
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild b/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild
index a8b7bdaad30d..80e068348a08 100644
--- a/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild
+++ b/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild,v 1.2 2006/10/24 07:50:15 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/xdebug/xdebug-2.0.0_rc1.ebuild,v 1.3 2006/10/27 19:02:30 sebastian Exp $
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_NAME="xdebug"
 
 inherit php-ext-source-r1
 
-IUSE="libedit"
 DESCRIPTION="A PHP Debugging and Profiling extension."
 HOMEPAGE="http://www.xdebug.org/"
 SLOT="0"
@@ -17,24 +16,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 +70,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
 }