dep/style fixes

(Portage version: 2.0.51.22-r1)

2 files changed, 25 insertions, 26 deletions

diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
index 8786fa978f71..eca4e15ccfe2 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.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-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.4 2005/01/01 18:25:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0.ebuild,v 1.5 2005/07/18 13:01:14 axxo Exp $
 
 inherit java-pkg
 
@@ -11,24 +11,24 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-	jikes? ( >=dev-java/jikes-1.19 )"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/jessie-0.9.7
 	>=dev-java/gnu-crypto-2.0.1
 	"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	jikes? ( >=dev-java/jikes-1.19 )"
 S=${WORKDIR}/inetlib-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S} ; mkdir ext
-	(
-		cd ext
-		java-pkg_jar-from jessie
-		java-pkg_jar-from gnu-crypto
-		cp javax-security.jar javax-security-auth-callback.jar
-		cp javax-security.jar javax-security-sasl.jar
-	)
+	cd ${S}
+
+	mkdir ext && cd ext
+	java-pkg_jar-from jessie
+		
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-auth-callback.jar
+	java-pkg_jar-from gnu-crypto javax-security.jar javax-security-sasl.jar
 }
 
 
@@ -42,13 +42,13 @@ src_compile() {
 		--enable-nntp \
 		--enable-ftp \
 		--enable-gopher \
-		--with-jsse-jar=$(pwd)/ext \
-		--with-javax-security-auth-callback-jar=$(pwd)/ext \
-		--with-javax-security-sasl-jar=$(pwd)/ext \
+		--with-jsse-jar=${S}/ext \
+		--with-javax-security-auth-callback-jar=${S}/ext \
+		--with-javax-security-sasl-jar=${S}/ext \
 		|| die
 	make || die
 	if use doc ; then
-		make javadoc
+		make javadoc || die
 	fi
 }
 
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1.ebuild
index c35b3de57bd4..7fcd86327d83 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1.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-inetlib/gnu-classpath-inetlib-1.1.ebuild,v 1.2 2005/01/01 18:25:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1.ebuild,v 1.3 2005/07/18 13:01:14 axxo Exp $
 
 inherit java-pkg
 
@@ -11,22 +11,21 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-	jikes? ( >=dev-java/jikes-1.19 )"
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/jessie-0.9.7
 	>=dev-java/gnu-crypto-2.0.1
 	"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	jikes? ( >=dev-java/jikes-1.19 )"
 S=${WORKDIR}/inetlib
 
 src_unpack() {
 	unpack ${A}
 	cd ${S} ; mkdir ext
-	(
-		cd ext
-		java-pkg_jar-from jessie
-		java-pkg_jar-from gnu-crypto
-	)
+	cd ext
+	java-pkg_jar-from jessie
+	java-pkg_jar-from gnu-crypto
 }
 
 
@@ -40,12 +39,12 @@ src_compile() {
 		--enable-nntp \
 		--enable-ftp \
 		--enable-gopher \
-		--with-jsse-jar=$(pwd)/ext \
-		--with-javax-security-jar=$(pwd)/ext \
+		--with-jsse-jar=${S}/ext \
+		--with-javax-security-jar=${S}/ext \
 		|| die
 	make || die
 	if use doc ; then
-		make javadoc
+		make javadoc || die
 	fi
 }