Tidy up ebuild.

Package-Manager: portage-2.0.53_rc7

4 files changed, 39 insertions, 35 deletions

diff --git a/dev-php4/php-java-bridge/ChangeLog b/dev-php4/php-java-bridge/ChangeLog
index 4bd74716ac1d..3b63bf8640f9 100644
--- 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.5 2005/11/19 20:24:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/ChangeLog,v 1.6 2005/11/25 16:09:05 chtekk Exp $
+
+  25 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  php-java-bridge-2.0.7.ebuild, php-java-bridge-2.0.8.ebuild:
+  Tidy up ebuild.
 
   19 Nov 2005; Markus Rothe <corsair@gentoo.org>
   php-java-bridge-2.0.7.ebuild, php-java-bridge-2.0.8.ebuild:
diff --git a/dev-php4/php-java-bridge/Manifest b/dev-php4/php-java-bridge/Manifest
index 6b474f9a2dde..7a3850c1950a 100644
--- a/dev-php4/php-java-bridge/Manifest
+++ b/dev-php4/php-java-bridge/Manifest
@@ -1,6 +1,6 @@
-MD5 686254186439ab755d7745ac45d491a2 ChangeLog 992
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 05f44d29ca175c368bf7f18c599e4c0c php-java-bridge-2.0.7.ebuild 1674
-MD5 341415d701258b024f8f74eba3727958 php-java-bridge-2.0.8.ebuild 1655
+MD5 6aeccc5ff4546d5b09b8705bb77f4f41 ChangeLog 1123
 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 80313f5d0c7d38608d5c1a455114c2ec php-java-bridge-2.0.7.ebuild 1667
+MD5 7f636a9a8dd77f05654577532c8b78b9 php-java-bridge-2.0.8.ebuild 1648
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 8d8988f2280e..950e0a733759 100644
--- 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,20 +1,19 @@
 # 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.5 2005/11/19 20:24:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.6 2005/11/25 16:09:05 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}
@@ -31,14 +30,14 @@ pkg_setup() {
 	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
+	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() {
@@ -49,7 +48,8 @@ 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
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 7d90a71f8bff..9ac865933b30 100644
--- 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,20 +1,19 @@
 # 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.2 2005/11/19 20:24:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.3 2005/11/25 16:09:05 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="~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"
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~ppc64 ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
@@ -31,14 +30,14 @@ pkg_setup() {
 	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
+	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() {
@@ -49,7 +48,8 @@ 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