[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     ea4cef5e077ba3c416f45ea47c4f5c797edcefba
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jun 23 04:11:01 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jun 23 04:11:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=ea4cef5e

Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug #465572.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/gcj-jdk/ChangeLog                                   |  7 +++++++
 dev-java/gcj-jdk/Manifest                                    | 12 ++++++------
 .../{gcj-jdk-5.1.0.ebuild => gcj-jdk-5.1.0-r1.ebuild}        |  7 ++++---
 dev-java/gcj-jdk/metadata.xml                                |  3 +++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 51dd655..591e2b0 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.19 2015/05/21 08:50:13 chewi Exp $
 
+*gcj-jdk-5.1.0-r1 (23 Jun 2015)
+
+  23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-5.1.0-r1.ebuild, -gcj-jdk-5.1.0.ebuild, metadata.xml:
+  Make javadoc symlink optional and provide it using GNU Classpath. Resolves bug
+  #465572.
+
   21 May 2015; James Le Cuirot <chewi@gentoo.org> -gcj-jdk-4.8.3.ebuild,
   gcj-jdk-4.8.4.ebuild:
   ~ppc keyword.

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 0141b7d..b3cd8df 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
 AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb WHIRLPOOL 2237edd6abffdfb762d178e611768396f0b93a38f8a70f83c986049b60e26bb7084e3a38b70ed29c09df739091cdbfbfdd688e5eccee6ca4ea4006c23cf2b7d8
-EBUILD gcj-jdk-5.1.0.ebuild 3773 SHA256 725d6ad92722723d9b96d252f7f780181761c458066c661767084933cafab022 SHA512 eb5a7b7197815a5d898078c288f1dfc090edb1a35a16687229580670460033570cb25e828289061a38ceddeaf3e552550de1ebc327c8b90e9aa04c2f11e4248b WHIRLPOOL 555ae67f7fa3075de88c18290c3836ad595d89d8cc1f308d9669bdefdec1605b17378a010ba26967152ec3f3e724b3ee4db530a29a3833b67e34c3a2de3cd150
-MISC ChangeLog 5553 SHA256 b0306b510152d3042dc3d690f1d7fbb38d052b95acbe4aa40f2c325a2e2f5863 SHA512 415b3a4aeb717c5908af242050a743df79a116c713060ea7068c53dfb277bf531b4a398f9f5ee0f4f4303b719a1c3ed0f2ca2ab5ff3499b7829f35a499792d06 WHIRLPOOL 747a6d5b9ab017be0a88bdc2025bbbb0a21455368de20371285cca7f48c8a240115ebd4c97d278679120fd23b74d65375bc3bd69cf363145dae567cf4892ab39
-MISC metadata.xml 420 SHA256 b939a23db890e627c3f9435964b7d4b9d9ecb0896af86b288a81d41e825c25b9 SHA512 6a9921186f1cc07e32515e9837c41a7ec1c802809b30ce8c28520d64ee3d7123c57b58c7ec57f556f7f991792b87b8605514681c4cdf5843628daa0d12b082f2 WHIRLPOOL 526bd3b1a989e90dea71b50e80cbc7c3bf899efbd1f3d8825b920ce0c572daa32c58bd6b5458345d0681feb906862f9a80873d888f744f7d7b0a1aeae6f23d1e
+EBUILD gcj-jdk-5.1.0-r1.ebuild 3841 SHA256 700766807c4e77b72ddf3e17f151e4b84d0359cda5c223a7e8ec08bf0d83830e SHA512 b1e18546a9a70f5e51a830ec7eca17b679fb3a7cfb2328c08beaf042bf58f94031b98dfd21c0a7995cff73c282aae8c95af4cd0463945a905396c6b74c85a208 WHIRLPOOL 55721cb91bb123e2a77f2c7dd9a357e74becb397b05076684765096a20c283a860a867a6a8c1d7bcad5f2caf988b18be526d3029f535b4794b6aa72095f10156
+MISC ChangeLog 5806 SHA256 349eb02bb43ba7c130ba1d4020e6285a8b8fe301ba3cbe271e31f92c426e8563 SHA512 50ce2c57f5307a13a5624740c4d00392076da9d8f86316a0fea3cc572ee18a53cb19d6d81885f5528616ecebc7ada1153ce786d712f05bac15a74900265da89a WHIRLPOOL 348ff25ea170a85bbde31fea07320ac578b98cc522d29f249d9423447152d8ef23a1949a601a71a1bae12308f0555d8dee8ea476b75f3d5a6b98e1664c49cd67
+MISC metadata.xml 511 SHA256 57c9af1c94a64c95432c9462f2a56325c1a739289b622b74ea17aca150bd374c SHA512 6618e9d5e97b6db3fafe917271970e57c3d8145865df0abcfc8dadcfcbb35a438bc9c2b47f988e1cb902eea7cec7d37b884f131f8b38bc3f5cf1c72539d38af7 WHIRLPOOL 62aa67c5119e97971397e4f6fa67f35c0a96da7d781f9b4a24f57b10bc2ae6a77b087f027d85aaf130e545b8e6985e238040ead4ced1ca1d59e25479a1bdb245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EARYIAAYFAlV2RqYACgkQz9oPmzWWQiKqjwD9FNPe0V54+8KWgiahjkBfMx+9
-a36raJehXREWSI/EtFYA+gLiecFVc9x7gthNOA7XRZoPpoFRUpF/lQXGkJnB1b8A
-=JeKs
+iF4EARYIAAYFAlWI3FAACgkQz9oPmzWWQiITAAEAludeYxFAMBBBq0kZW3JUSjkN
+RIeI4LUoH+cbMTSBa4MA/iwHdZ5+NafYeHsLiFxID7GZxbJrJwzzTE9cd+Vx3rYH
+=QzTd
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
similarity index 96%
rename from dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
index a2e271a..83d7ab5 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.1.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 #KEYWORDS="~amd64"
 SLOT="0"
-IUSE="X"
+IUSE="javadoc X"
 
 ECJ_GCJ_SLOT="3.6"
 
@@ -21,7 +21,8 @@ ECJ_GCJ_SLOT="3.6"
 RDEPEND="
 	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}
 	dev-lang/perl
-	~sys-devel/gcc-${PV}[gcj]"
+	~sys-devel/gcc-${PV}[gcj]
+	javadoc? ( dev-java/gnu-classpath:0[gjdoc] )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -45,7 +46,6 @@ src_install() {
 	dosym ${gccbin}/gij ${gcjhome}/bin/java
 	dosym ${gccbin}/gij ${gcjhome}/jre/bin/java
 	dosym ${gccbin}/gjar ${gcjhome}/bin/jar
-	dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc
 	dosym ${gccbin}/grmic ${gcjhome}/bin/rmic
 	dosym ${gccbin}/gjavah ${gcjhome}/bin/javah
 	dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap
@@ -69,6 +69,7 @@ src_install() {
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
 	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
 	use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
+	use javadoc && dosym /usr/bin/gjdoc ${gcjhome}/bin/javadoc
 
 	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
 		${gcjhome}/jre/lib/rt.jar

diff --git a/dev-java/gcj-jdk/metadata.xml b/dev-java/gcj-jdk/metadata.xml
index f988aaf..33d5fc2 100644
--- a/dev-java/gcj-jdk/metadata.xml
+++ b/dev-java/gcj-jdk/metadata.xml
@@ -8,4 +8,7 @@
   <name>Andrew John Hughes</name>
 </maintainer>
 <longdescription>This provides a JDK wrapper for GCJ, in the style of gcj-java-compat in other distributions.</longdescription>
+<use>
+  <flag name="javadoc">Provide javadoc using gjdoc from GNU Classpath.</flag>
+</use>
 </pkgmetadata>