dep/style fixes

(Portage version: 2.0.51.22-r1)

2 files changed, 14 insertions, 14 deletions

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
index fd520e5c2273..36372051e59f 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.14.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-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.3 2005/06/17 17:30:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.4 2005/07/18 12:04:45 axxo Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -11,9 +11,6 @@ SLOT="0"
 KEYWORDS="x86 ~sparc ppc amd64"
 IUSE="jikes gtk xml2"
 
-DEPEND=">=virtual/jdk-1.4
-	app-arch/zip
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4
 	gtk? (
 		media-libs/gdk-pixbuf
@@ -21,24 +18,26 @@ RDEPEND=">=virtual/jre-1.4
 		>=media-libs/libart_lgpl-2.1
 	)
 	xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	app-arch/zip
+	jikes? ( dev-java/jikes )"
 
 S=${WORKDIR}/classpath-${PV}
 
 src_compile() {
-	local myjavac="--with-java=`java-config -c`"
-	local myc=""
+	local myjavac="--with-java=$(java-config -c)"
 	use jikes && myjavac="--with-jikes=/usr/bin/jikes"
-	use gtk && myc="${myc} --enable-gtk-peer" || myc="${myc} --disable-gtk-peer"
-	use xml2 && myc="${myc} --enable-xmlj"
 
 	econf \
 		--enable-jni \
-		${myc} \
+		$(use_enable gtk gtk-peer) \
+		$(use_enable xml2 xmlj) \
 		--prefix=/usr/share/${PN}\
 		 ${myjavac} || die "./configure failed"
 	emake || die "make failed"
 }
 
-src_install () {
+src_install() {
 	einstall || die "make install failed"
 }
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
index 983ddf9e70dd..46bf77c02420 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.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-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.4 2005/05/22 14:18:30 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.5 2005/07/18 12:04:45 axxo Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -11,11 +11,12 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="cairo gtk xml2"
 
-DEPEND="app-arch/zip
-	    dev-java/jikes"
 RDEPEND="cairo? ( >=x11-libs/cairo-0.3.0 )
 		 gtk? ( >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 media-libs/gdk-pixbuf )
 		 xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	dev-java/jikes"
 
 S=${WORKDIR}/classpath-${PV}
 
@@ -37,7 +38,7 @@ src_compile() {
 	emake || die "make failed"
 }
 
-src_install () {
+src_install() {
 	einstall || die "make install failed"
 
 	if use cairo; then