Sync with overlay.

(Portage version: 2.0.53_rc7)

4 files changed, 47 insertions, 13 deletions

diff --git a/dev-php5/pecl-apd/ChangeLog b/dev-php5/pecl-apd/ChangeLog
index 8bc1c4f563ed..890f87f5d17d 100644
--- a/dev-php5/pecl-apd/ChangeLog
+++ b/dev-php5/pecl-apd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-apd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/ChangeLog,v 1.2 2005/10/15 22:49:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/ChangeLog,v 1.3 2005/11/26 23:17:00 chtekk Exp $
+
+  26 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  +files/fix-version-string-1.0.1.patch, pecl-apd-1.0.1.ebuild:
+  Fix version string, sync with PHP overlay.
 
   15 Oct 2005; Jason Wever <weeve@gentoo.org> pecl-apd-1.0.1.ebuild:
   Added ~sparc keyword.
diff --git a/dev-php5/pecl-apd/Manifest b/dev-php5/pecl-apd/Manifest
index efad281d6120..8b29dc0d3208 100644
--- a/dev-php5/pecl-apd/Manifest
+++ b/dev-php5/pecl-apd/Manifest
@@ -1,4 +1,5 @@
-MD5 b8406d93c9b0f225ac3f008aac0f9f09 ChangeLog 461
+MD5 f959a93cedbd2d31dc95a3548a5bb2e1 ChangeLog 622
 MD5 3f5b44e18a6fc64c64ad6919e7192603 files/digest-pecl-apd-1.0.1 57
+MD5 28ec9f62ed19b6ea529b0efefcd2c119 files/fix-version-string-1.0.1.patch 278
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 50aba09a9eee02ff04d76866973d0a3e pecl-apd-1.0.1.ebuild 623
+MD5 f0a793131559baef7d5d19a3afa5c630 pecl-apd-1.0.1.ebuild 1117
diff --git a/dev-php5/pecl-apd/files/fix-version-string-1.0.1.patch b/dev-php5/pecl-apd/files/fix-version-string-1.0.1.patch
new file mode 100644
index 000000000000..1c6fa7dc0c06
--- /dev/null
+++ b/dev-php5/pecl-apd/files/fix-version-string-1.0.1.patch
@@ -0,0 +1,11 @@
+--- php_apd.h	2004/03/10 16:40:55
++++ php_apd.h	2004/10/20 14:17:02
+@@ -89,7 +89,7 @@
+ extern zend_module_entry apd_module_entry;
+ #define apd_module_ptr &apd_module_entry
+
+-#define APD_VERSION "0.9"
++#define APD_VERSION "1.0.1"
+
+ #define FUNCTION_TRACE 1
+ #define ARGS_TRACE 2
diff --git a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild b/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
index a3d2489c3eb8..c641b028279d 100644
--- a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
+++ b/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
@@ -1,25 +1,43 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.3 2005/10/15 22:49:20 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.4 2005/11/26 23:17:00 chtekk Exp $
 
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_PECL_PKG="apd"
 PHP_EXT_NAME="apd"
 PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
 
 inherit php-ext-pecl-r1
 
-IUSE=""
+KEYWORDS="~sparc ~x86"
 DESCRIPTION="A full-featured engine-level profiler/debugger."
-SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND} >=dev-php/PEAR-Console_Getopt-1.2-r1 !dev-php5/ZendOptimizer"
 
 need_php_by_category
 
-src_install () {
-	sed -i 's:/usr/local:/usr:g' ${S}/pprofp || die #83612
+pkg_setup() {
+	has_php
+	require_php_cli
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/fix-version-string-1.0.1.patch"
+}
+
+src_install() {
+	sed -i 's:/usr/local/bin/php:/usr/lib/php5/bin/php:g' "${S}/pprofp" || die "Unable to replace PHP path"
+	sed -i 's:pprofp:pprofp-php5:g' "${S}/pprofp" || die "Unable to replace PHP path"
+	sed -i 's:/usr/bin/env php:/usr/lib/php5/bin/php:g' "${S}/pprof2calltree" || die "Unable to replace PHP path"
+	sed -i 's:pprof2calltree:pprof2calltree-php5:g' "${S}/pprof2calltree" || die "Unable to replace PHP path"
 	php-ext-pecl-r1_src_install
-	dobin pprofp pprof2calltree
-	dodoc LICENSE README
+	newbin pprofp pprofp-php5
+	newbin pprof2calltree pprof2calltree-php5
+	dodoc-php LICENSE README
 }