Add -j1 because this package doesn't like parallel make and switch to java-pkg_dojavadoc. Fixes bug #179897.

(Portage version: 2.1.2.7)

3 files changed, 18 insertions, 11 deletions

diff --git a/dev-java/gnu-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index ca88c2e15c0e..7c018445ffec 100644
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.22 2007/03/28 18:14:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.23 2007/05/26 22:45:41 betelgeuse Exp $
+
+  26 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-classpath-inetlib-1.0-r2.ebuild, gnu-classpath-inetlib-1.1-r2.ebuild:
+  Add -j1 because this package doesn't like parallel make and switch to
+  java-pkg_dojavadoc. Fixes bug #179897.
 
   28 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
   gnu-classpath-inetlib-1.0-r2.ebuild, gnu-classpath-inetlib-1.1-r2.ebuild:
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
index 435904c2beb9..9e083b9e6aa0 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.7 2007/03/28 18:14:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild,v 1.8 2007/05/26 22:45:41 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -48,9 +48,10 @@ src_compile() {
 		--with-javax-security-auth-callback-jar=${S}/ext \
 		--with-javax-security-sasl-jar=${S}/ext \
 		|| die "econf failed"
-	emake JAVACFLAGS="${JAVACFLAGS}" || die "emake failed"
+	# https://bugs.gentoo.org/show_bug.cgi?id=179897
+	emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die "emake failed"
 	if use doc ; then
-		emake javadoc || die "emake javadoc failed"
+		emake -j1 javadoc || die "emake javadoc failed"
 	fi
 }
 
@@ -58,6 +59,6 @@ src_install() {
 	einstall || die
 	rm -rf ${D}/usr/share/java
 	java-pkg_dojar ${MY_PN}.jar
-	use doc && java-pkg_dohtml -r docs/*
-	dodoc AUTHORS NEWS README
+	use doc && java-pkg_dojavadoc docs
+	dodoc AUTHORS NEWS README || die
 }
diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
index a1018719bd1a..8dfc18742183 100644
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.4 2007/03/28 18:14:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild,v 1.5 2007/05/26 22:45:41 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -44,9 +44,10 @@ src_compile() {
 		--with-jsse-jar=${S}/ext \
 		--with-javax-security-jar=${S}/ext \
 		|| die
-	emake JAVACFLAGS="${JAVACFLAGS}" || die
+	# https://bugs.gentoo.org/show_bug.cgi?id=179897
+	emake JAVACFLAGS="${JAVACFLAGS}" -j1 || die
 	if use doc ; then
-		make javadoc || die
+		emake -j1 javadoc || die
 	fi
 }
 
@@ -54,6 +55,6 @@ src_install() {
 	einstall || die
 	rm -rf ${D}/usr/share/java
 	java-pkg_dojar inetlib.jar
-	use doc && java-pkg_dohtml -r docs/*
-	dodoc AUTHORS NEWS README
+	use doc && java-pkg_dojavadoc docs
+	dodoc AUTHORS NEWS README || die
 }