Update php-java-bridge.

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-php4/php-java-bridge/ChangeLog b/dev-php4/php-java-bridge/ChangeLog
index de0b1bbb95d07514135f608de01892a52330cb0b..6a985b33c2de27c82c4e191de9438fdbffc06297 100644 (file)
--- a/dev-php4/php-java-bridge/ChangeLog
+++ b/dev-php4/php-java-bridge/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php4/php-java-bridge
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.3 2005/09/16 21:53:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.4 2005/11/19 18:39:03 chtekk Exp $
+
+*php-java-bridge-2.0.8 (19 Nov 2005)
+
+  19 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  php-java-bridge-2.0.7.ebuild, +php-java-bridge-2.0.8.ebuild:
+  Add 2.0.8 to the tree, fix some stuff in 2.0.7 to be compliant with newer
+  installs of PHP.
 
   16 Sep 2005; Christian Parpart <trapni@gentoo.org>
   php-java-bridge-2.0.7.ebuild:

diff --git a/dev-php4/php-java-bridge/Manifest b/dev-php4/php-java-bridge/Manifest
index 1bf04fc4fcc97f3a00f32b472d741e09648196d9..77b4db48ddacf72ba0c72e647705205c6b140f10 100644 (file)
--- a/dev-php4/php-java-bridge/Manifest
+++ b/dev-php4/php-java-bridge/Manifest
@@ -1,4 +1,6 @@
-MD5 5e2515bef2494f6adf3e008c2381cc60 ChangeLog 594
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 2a7be7017743bdd66bcf28551c51db2d php-java-bridge-2.0.7.ebuild 1212
+MD5 469f1910226a94299127ed3e8c233f6b ChangeLog 842
 MD5 f9772bb4b2696cabf6a11c123cf8060d files/digest-php-java-bridge-2.0.7 74
+MD5 8562d753d236eb755256a67623db0e81 files/digest-php-java-bridge-2.0.8 74
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 34f0a2fbed7bd8bdffd38bfd0a073f9a php-java-bridge-2.0.7.ebuild 1666
+MD5 33a6976274cdb86b60ed271bcfea93c5 php-java-bridge-2.0.8.ebuild 1647

diff --git a/dev-php4/php-java-bridge/files/digest-php-java-bridge-2.0.8 b/dev-php4/php-java-bridge/files/digest-php-java-bridge-2.0.8
new file mode 100644 (file)
index 0000000..8a2b772
--- /dev/null
+++ b/dev-php4/php-java-bridge/files/digest-php-java-bridge-2.0.8
@@ -0,0 +1 @@
+MD5 58c3b2dbd8b5a21c52a9cc9d6904e24b php-java-bridge_2.0.8.tar.bz2 250144

diff --git a/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild b/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild
index e97b5b19a4b796be5ac3c809745646230b4a224b..36df4aa02b7bb50ef5b2f274c093d77935622adb 100644 (file)
--- a/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild
+++ b/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.3 2005/09/16 21:53:25 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.4 2005/11/19 18:39:03 chtekk Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_NAME="java"
@@ -26,12 +26,23 @@ need_php_by_category
 
 pkg_setup() {
        has_php
-       require_php_with_use java-external
+
+       # we need session support in PHP for this to compile
+       require_php_with_use session
+
+       # if the user has compiled the internal Java extension, he can't use this package
+               if built_with_use =${PHP_PKG} java-internal ; then
+                       eerror
+                       eerror "You have built ${PHP_PKG} to use the internal Java extension."
+                       eerror "If you want to use the php-java-bridge package, you must rebuild"
+                       eerror "your PHP with the 'java-external' USE flag instead."
+                       eerror
+                       die "PHP built to use internal Java extension"
+               fi
 }
 
 src_compile() {
        has_php
-       export WANT_AUTOCONF=2.5
        my_conf="--disable-servlet --with-java=`java-config --jdk-home`"
        php-ext-source-r1_src_compile
 }
@@ -43,5 +54,5 @@ src_install() {
        doins modules/RunJavaBridge
        doins modules/libnatcJavaBridge.a
        doins modules/libnatcJavaBridge.so
-       dodoc ChangeLog README README.GNU_JAVA PROTOCOL.TXT
+       dodoc-php ChangeLog README README.GNU_JAVA PROTOCOL.TXT
 }

diff --git a/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild b/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild
new file mode 100644 (file)
index 0000000..ccecb2f
--- /dev/null
+++ b/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.1 2005/11/19 18:39:03 chtekk 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="~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
+
+       # if the user has compiled the internal Java extension, he can't use this package
+               if built_with_use =${PHP_PKG} java-internal ; then
+                       eerror
+                       eerror "You have built ${PHP_PKG} to use the internal Java extension."
+                       eerror "If you want to use the php-java-bridge package, you must rebuild"
+                       eerror "your PHP with the 'java-external' USE flag instead."
+                       eerror
+                       die "PHP built to use internal Java extension"
+               fi
+}
+
+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
+}