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

Package-Manager: portage-2.1.2.7

4 files changed, 34 insertions, 27 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/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
index cdcb723ba6ee..3a709d65dcd0 100644
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -11,18 +11,18 @@ RMD160 94738b692c0a9dfad3d38bf470c1429b88fd8df9 files/gnu-classpath-inetlib-1.1-
 SHA256 98cafdb45968673a3378b1c031f15be7519add216a5fd19d8ad672bc3c6b1129 files/gnu-classpath-inetlib-1.1-jdk15.patch 3932
 DIST inetlib-1.0.tar.gz 151002 RMD160 c3dc231e02268e1a6bbb4a17bc3409c23995ef8e SHA1 6f5e6ab6237024c12778f4eae4cef757a79a207a SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8
 DIST inetlib-1.1.tar.gz 177251 RMD160 0cc424a46105798ea71cb8793bc4ba60a16603b7 SHA1 125e5529746f1c15bdeb42c909d8e5bc57f9533b SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0
-EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1747 RMD160 e1529c6774a1ca5a5967ea54b5e71fef59751fcb SHA1 6f9911f955e421c504bcbacac129a128643e4a87 SHA256 3213a7140fd7a4f876bade7513c0419db1d3440d293d554c81e77a12638d2c46
-MD5 8ce5ab8393192c557df9f93331895168 gnu-classpath-inetlib-1.0-r2.ebuild 1747
-RMD160 e1529c6774a1ca5a5967ea54b5e71fef59751fcb gnu-classpath-inetlib-1.0-r2.ebuild 1747
-SHA256 3213a7140fd7a4f876bade7513c0419db1d3440d293d554c81e77a12638d2c46 gnu-classpath-inetlib-1.0-r2.ebuild 1747
-EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1348 RMD160 810ef191fac3468eb187baaa9a01b3a7876f5a8c SHA1 f5989882a554a04f18cb19a5d217119823b5e546 SHA256 79585779470ce22a47b341ffc565bbcd5cff6921e298b94b221dea8792eba39d
-MD5 f747d3c3f8958b3da761ac85bde907ca gnu-classpath-inetlib-1.1-r2.ebuild 1348
-RMD160 810ef191fac3468eb187baaa9a01b3a7876f5a8c gnu-classpath-inetlib-1.1-r2.ebuild 1348
-SHA256 79585779470ce22a47b341ffc565bbcd5cff6921e298b94b221dea8792eba39d gnu-classpath-inetlib-1.1-r2.ebuild 1348
-MISC ChangeLog 1862 RMD160 fe3d739b88243ba701a6c18a43e3dd406845c96f SHA1 443f8cda5d1d2ae82a93a0e515018548f5f4bcfd SHA256 b99b92c84d0f6ef68de4443060c1e48bec4bcebf4eef0f362be522863f949200
-MD5 e56c10ffc0c13a3729260d018b6d958d ChangeLog 1862
-RMD160 fe3d739b88243ba701a6c18a43e3dd406845c96f ChangeLog 1862
-SHA256 b99b92c84d0f6ef68de4443060c1e48bec4bcebf4eef0f362be522863f949200 ChangeLog 1862
+EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1810 RMD160 f226ce755cd186edcfa44a69b8bc0b041670ad70 SHA1 1266658413f890992f29131c721cbe413514e95f SHA256 ef073eff042f34bf1d3f615588750458c228183afddf5c4af7b1ae0d5a6abe32
+MD5 055785bd2458ed217dd999dd933a6695 gnu-classpath-inetlib-1.0-r2.ebuild 1810
+RMD160 f226ce755cd186edcfa44a69b8bc0b041670ad70 gnu-classpath-inetlib-1.0-r2.ebuild 1810
+SHA256 ef073eff042f34bf1d3f615588750458c228183afddf5c4af7b1ae0d5a6abe32 gnu-classpath-inetlib-1.0-r2.ebuild 1810
+EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1412 RMD160 edff83b5edc7eafda42943b704341c7336ee8220 SHA1 f3aee033699df319c393177fa530fd97cb39ea4d SHA256 4f2ca65f288e71fab3c05558d9fa46f963f158b37415dd849da3c0009ddce2ef
+MD5 a6189aadd5a0f153f82fc4f1f9b3fce6 gnu-classpath-inetlib-1.1-r2.ebuild 1412
+RMD160 edff83b5edc7eafda42943b704341c7336ee8220 gnu-classpath-inetlib-1.1-r2.ebuild 1412
+SHA256 4f2ca65f288e71fab3c05558d9fa46f963f158b37415dd849da3c0009ddce2ef gnu-classpath-inetlib-1.1-r2.ebuild 1412
+MISC ChangeLog 2105 RMD160 03e1f94da1a77da2b38c303746b0b116b43a98e3 SHA1 d8445c6491d0426202cb983a11745d931de61c04 SHA256 ea71bcfdf60bb88d17247fbcb1ac7f1d28fd0dd7804854dd745d425f6f01565b
+MD5 4eba57941630b89fff571afd0b0dd5f2 ChangeLog 2105
+RMD160 03e1f94da1a77da2b38c303746b0b116b43a98e3 ChangeLog 2105
+SHA256 ea71bcfdf60bb88d17247fbcb1ac7f1d28fd0dd7804854dd745d425f6f01565b ChangeLog 2105
 MISC metadata.xml 430 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 SHA1 40dc1cf7659e11765df7cfb0ced41eec6f3bf537 SHA256 bef2fad85b9f4da5e38421c1bfd3a81a6c5a3a12a5077eefae398c0dfe5b718b
 MD5 cae9047aa616f454f13653091a077f60 metadata.xml 430
 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 metadata.xml 430
@@ -34,9 +34,9 @@ MD5 eb2b08694c0bdeed41c430ff8d8e792c files/digest-gnu-classpath-inetlib-1.1-r2 2
 RMD160 c925240dbf9a51c3d4d0dc9b14569d1ae1933a4c files/digest-gnu-classpath-inetlib-1.1-r2 235
 SHA256 dc83250a1ebec0229a1504a07fc3536d4759801d9d95e81a261f2697e6ec9d5e files/digest-gnu-classpath-inetlib-1.1-r2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGCrCbcxLzpIGCsLQRAntrAJ9nMg/uOJiBNGMYy6TkB4a8rnivywCeONI8
-WjwMImUUY+B6WBzBZwP5XpI=
-=xt8J
+iD8DBQFGWLiXcxLzpIGCsLQRArbxAJ0WDdb06NQKvSaowxamGM4hYRymMwCbBIaz
+5qKYTGjUQTlQ6FGiECgNXvs=
+=Liom
 -----END PGP SIGNATURE-----
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
 }