Cleanup.

Package-Manager: portage-2.1.2.1

diff --git a/dev-php4/php-java-bridge/ChangeLog b/dev-php4/php-java-bridge/ChangeLog
index 91a9e49b51ea3bd7ec70b1a1b0b390de2aa56dc0..da470e9a350eabe937a0382ac7af6ff35daa9ce5 100644 (file)
--- a/dev-php4/php-java-bridge/ChangeLog
+++ b/dev-php4/php-java-bridge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php4/php-java-bridge
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.16 2006/10/14 22:32:11 chtekk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.17 2007/03/06 22:04:31 chtekk Exp $
+
+  06 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  php-java-bridge-2.0.8.ebuild:
+  Cleanup.
 
   14 Oct 2006; Luca Longinotti <chtekk@gentoo.org>
   php-java-bridge-2.0.8.ebuild:

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
index a3b662dde59849cc43cb2daa8bfaea97788349f9..0981a885d765c1f9e485bb2bacbf8e37f80ecec2 100644 (file)
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.13 2006/10/14 22:32:11 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.14 2007/03/06 22:04:31 chtekk Exp $
 
 PHP_EXT_NAME="java"
 PHP_EXT_INI="yes"
@@ -9,6 +9,7 @@ PHP_EXT_ZENDEXT="no"
 inherit php-ext-source-r1
 
 KEYWORDS="amd64 ppc ppc64 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"
@@ -16,10 +17,9 @@ LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="${DEPEND}
-               >=dev-util/re2c-0.9.9
-               dev-java/java-config
-               =virtual/jdk-1.4*"
+DEPEND="dev-java/java-config
+               >=virtual/jdk-1.4.2"
+RDEPEND="${DEPEND}"
 
 need_php_by_category
 
@@ -41,8 +41,6 @@ pkg_setup() {
 }
 
 src_compile() {
-       has_php
-       export WANT_AUTOMAKE=1.9 WANT_AUTOCONF=2.5
        my_conf="--disable-servlet --with-java=`java-config --jdk-home`"
        php-ext-source-r1_src_compile
 }
@@ -55,5 +53,6 @@ src_install() {
        doins modules/RunJavaBridge
        doins modules/libnatcJavaBridge.a
        doins modules/libnatcJavaBridge.so
+
        dodoc-php ChangeLog README README.GNU_JAVA PROTOCOL.TXT
 }

diff --git a/dev-php4/phpunit/ChangeLog b/dev-php4/phpunit/ChangeLog
index 0bfbd541f8d34f8933f783b60ce1118033f9d8d5..e6f2a0d5d65878e5280bd0414a6b8ada4f9e7b6a 100644 (file)
--- a/dev-php4/phpunit/ChangeLog
+++ b/dev-php4/phpunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php4/phpunit
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/phpunit/ChangeLog,v 1.1 2006/09/08 08:24:41 sebastian Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/phpunit/ChangeLog,v 1.2 2007/03/06 22:07:44 chtekk Exp $
+
+  06 Mar 2007; Luca Longinotti <chtekk@gentoo.org> metadata.xml,
+  phpunit-1.3.2.ebuild:
+  Cleanup.
 
 *phpunit-1.3.2 (08 Sep 2006)
 

diff --git a/dev-php4/phpunit/metadata.xml b/dev-php4/phpunit/metadata.xml
index 40dbb4c4bbafa916469a86c5314d2fa1ba9e0719..fd3dbe39fa64544d93653545354397b4f1e1e79c 100644 (file)
--- a/dev-php4/phpunit/metadata.xml
+++ b/dev-php4/phpunit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+       <herd>php</herd>
 </pkgmetadata>

diff --git a/dev-php4/phpunit/phpunit-1.3.2.ebuild b/dev-php4/phpunit/phpunit-1.3.2.ebuild
index 640fa64c79ac91be8b8bd941594763cb56ce80d0..6b63e8ac2c7129898c10e0d6de1b22cbcdd17756 100644 (file)
--- a/dev-php4/phpunit/phpunit-1.3.2.ebuild
+++ b/dev-php4/phpunit/phpunit-1.3.2.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/phpunit/phpunit-1.3.2.ebuild,v 1.1 2006/09/08 08:24:41 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/phpunit/phpunit-1.3.2.ebuild,v 1.2 2007/03/06 22:07:44 chtekk Exp $
 
 inherit php-pear-lib-r1
 
+KEYWORDS="~amd64 ~sparc ~x86"
+
 DESCRIPTION="Unit Testing framework for PHP 4."
 HOMEPAGE="http://www.phpunit.de/"
+SRC_URI="http://pear.phpunit.de/get/PHPUnit-${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
+
 DEPEND="!dev-php5/phpunit"
-SRC_URI="http://pear.phpunit.de/get/PHPUnit-${PV}.tgz"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/PHPUnit-${PV}"