diff options
Diffstat (limited to 'dev-php5/php-java-bridge')
| -rw-r--r-- | dev-php5/php-java-bridge/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-php5/php-java-bridge/Manifest | 7 | ||||
| -rw-r--r-- | dev-php5/php-java-bridge/files/digest-php-java-bridge-2.0.7 | 1 | ||||
| -rw-r--r-- | dev-php5/php-java-bridge/files/zend_backtrace_api_change.diff | 11 | ||||
| -rw-r--r-- | dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild | 48 | ||||
| -rw-r--r-- | dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild | 29 |
6 files changed, 41 insertions, 64 deletions
diff --git a/dev-php5/php-java-bridge/ChangeLog b/dev-php5/php-java-bridge/ChangeLog index 2e67d3f6d9d0..c9645db9524c 100644 --- a/dev-php5/php-java-bridge/ChangeLog +++ b/dev-php5/php-java-bridge/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php5/php-java-bridge -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/ChangeLog,v 1.7 2005/12/04 00:32:55 chtekk Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/ChangeLog,v 1.8 2006/01/07 16:41:34 chtekk Exp $ + + 07 Jan 2006; Luca Longinotti <chtekk@gentoo.org> + +files/zend_backtrace_api_change.diff, -php-java-bridge-2.0.7.ebuild, + php-java-bridge-2.0.8.ebuild: + Sync with overlay. Fix variables order. Add patch to support PHP 5.1.X. 04 Dec 2005; Luca Longinotti <chtekk@gentoo.org> php-java-bridge-2.0.8.ebuild: diff --git a/dev-php5/php-java-bridge/Manifest b/dev-php5/php-java-bridge/Manifest index 8d2b39c3bd31..2cef04d7d65e 100644 --- a/dev-php5/php-java-bridge/Manifest +++ b/dev-php5/php-java-bridge/Manifest @@ -1,6 +1,5 @@ -MD5 0bdf59ef99c96be10a6fd7f988061d79 ChangeLog 1271 -MD5 f9772bb4b2696cabf6a11c123cf8060d files/digest-php-java-bridge-2.0.7 74 +MD5 f44a0376df6e6d6489f3db8c5f80c105 ChangeLog 1501 MD5 8562d753d236eb755256a67623db0e81 files/digest-php-java-bridge-2.0.8 74 +MD5 577f0cc2a32d6c1b81c06997c4f55aff files/zend_backtrace_api_change.diff 572 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 -MD5 85b48ee31761d684bf23b1c4c0ac301c php-java-bridge-2.0.7.ebuild 1247 -MD5 1a43bb0faf57c9d14f926423e60cc01b php-java-bridge-2.0.8.ebuild 1246 +MD5 467f208f8a0b74b87537894d5b4af83c php-java-bridge-2.0.8.ebuild 1368 diff --git a/dev-php5/php-java-bridge/files/digest-php-java-bridge-2.0.7 b/dev-php5/php-java-bridge/files/digest-php-java-bridge-2.0.7 deleted file mode 100644 index f0c8280bb34a..000000000000 --- a/dev-php5/php-java-bridge/files/digest-php-java-bridge-2.0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 edf993bac2485893cfbce975691a3e32 php-java-bridge_2.0.7.tar.bz2 125764 diff --git a/dev-php5/php-java-bridge/files/zend_backtrace_api_change.diff b/dev-php5/php-java-bridge/files/zend_backtrace_api_change.diff new file mode 100644 index 000000000000..60ec818a0f83 --- /dev/null +++ b/dev-php5/php-java-bridge/files/zend_backtrace_api_change.diff @@ -0,0 +1,11 @@ +--- java.c 2005-12-20 01:37:59.000000000 +0100 ++++ java.c 2005-12-20 01:40:19.000000000 +0100 +@@ -1049,7 +1049,7 @@ + ZVAL_NULL(trace); + trace->is_ref = 0; + trace->refcount = 0; +- zend_fetch_debug_backtrace(trace, 0 TSRMLS_CC); ++ zend_fetch_debug_backtrace(trace, 0, 0 TSRMLS_CC); + + zend_update_property_string(zend_exception_get_default(), &obj, "file", sizeof("file")-1, zend_get_executed_filename(TSRMLS_C) TSRMLS_CC); + zend_update_property_long(zend_exception_get_default(), &obj, "line", sizeof("line")-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC); diff --git a/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild b/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild deleted file mode 100644 index 318f658d320d..000000000000 --- a/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.5 2005/11/19 19:36:21 corsair Exp $ - -PHP_EXT_ZENDEXT="no" -PHP_EXT_NAME="java" -PHP_EXT_INI="yes" - -inherit php-ext-source-r1 - -SRC_URI="mirror://sourceforge/php-java-bridge/${PN}_${PV}.tar.bz2" -HOMEPAGE="http://php-java-bridge.sourceforge.net/" - -DESCRIPTION="The PHP/Java bridge is a PHP module wich connects the PHP object system with the Java or ECMA 335 object system." -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND="${DEPEND} - >=dev-util/re2c-0.9.9 - dev-java/java-config - =virtual/jdk-1.4*" - -need_php_by_category - -pkg_setup() { - has_php - - # we need session support in PHP for this to compile - require_php_with_use session -} - -src_compile() { - has_php - my_conf="--disable-servlet --with-java=`java-config --jdk-home`" - php-ext-source-r1_src_compile -} - -src_install() { - php-ext-source-r1_src_install - insinto ${EXT_DIR} - doins modules/JavaBridge.jar - doins modules/RunJavaBridge - doins modules/libnatcJavaBridge.a - doins modules/libnatcJavaBridge.so - dodoc-php ChangeLog README README.GNU_JAVA PROTOCOL.TXT -} diff --git a/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild b/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild index 603dda5d34ca..d7a8599d3592 100644 --- a/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild +++ b/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.4 2005/12/04 00:32:55 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.5 2006/01/07 16:41:34 chtekk Exp $ -PHP_EXT_ZENDEXT="no" PHP_EXT_NAME="java" PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" inherit php-ext-source-r1 -SRC_URI="mirror://sourceforge/php-java-bridge/${PN}_${PV}.tar.bz2" -HOMEPAGE="http://php-java-bridge.sourceforge.net/" - +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" DESCRIPTION="The PHP/Java bridge is a PHP module wich connects the PHP object system with the Java or ECMA 335 object system." +HOMEPAGE="http://php-java-bridge.sourceforge.net/" +SRC_URI="mirror://sourceforge/php-java-bridge/${PN}_${PV}.tar.bz2" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" DEPEND="${DEPEND} @@ -27,10 +26,22 @@ need_php_by_category pkg_setup() { has_php - # we need session support in PHP for this to compile + # We need session support in PHP for this to compile require_php_with_use session } +src_unpack() { + unpack ${A} + + cd "${S}" + + # Patch against 'zend_fetch_debug_backtrace' API change + # only if PHP 5.0 is not used + if ! has_version '=dev-lang/php-5.0*' ; then + epatch "${FILESDIR}/zend_backtrace_api_change.diff" + fi +} + src_compile() { has_php my_conf="--disable-servlet --with-java=`java-config --jdk-home`" @@ -39,7 +50,7 @@ src_compile() { src_install() { php-ext-source-r1_src_install - insinto ${EXT_DIR} + insinto "${EXT_DIR}" doins modules/JavaBridge.jar doins modules/RunJavaBridge doins modules/libnatcJavaBridge.a |