commit:     4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 13:25:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 13:25:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ebaa7e5

dev-vcs/subversion: Fixed creation of docs with USE="java" (bug #551094).

Thanks to Alexander Miller for providing a patch.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/subversion-1.8.16-javadoc-nolint.patch      | 19 +++++++++++++++++++
 dev-vcs/subversion/subversion-1.8.16.ebuild           |  1 +
 dev-vcs/subversion/subversion-1.9.4.ebuild            |  1 +
 3 files changed, 21 insertions(+)

diff --git a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch 
b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
new file mode 100644
index 00000000..8b07d22
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
@@ -0,0 +1,19 @@
+With newer versions of javadoc (since JDK-1.8), "make doc-javahl"
+reports many errors, causing build failures. Add "-Xdoclint:none"
+option to restore old, sloppy behavior.
+
+Patch created for subversion-1.8.16, should work for other other
+versions, too.
+See <https://bugs.gentoo.org/show_bug.cgi?id=551094>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -650,7 +650,7 @@
+ 
+ # Generate API documentation for the JavaHL package.
+ doc-javahl:
+-      $(JAVADOC) -d $(abs_builddir)/doc/javadoc \
++      $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \
+         -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
+         -link http://java.sun.com/javase/6/docs/api/ \
+         org.tigris.subversion.javahl \

diff --git a/dev-vcs/subversion/subversion-1.8.16.ebuild 
b/dev-vcs/subversion/subversion-1.8.16.ebuild
index c4edce6..afae86f 100644
--- a/dev-vcs/subversion/subversion-1.8.16.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.16.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
        "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
        "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+       "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
 )
 
 want_apache

diff --git a/dev-vcs/subversion/subversion-1.9.4.ebuild 
b/dev-vcs/subversion/subversion-1.9.4.ebuild
index ced9e81..df0bcd1 100644
--- a/dev-vcs/subversion/subversion-1.9.4.ebuild
+++ b/dev-vcs/subversion/subversion-1.9.4.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
        "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
        "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+       "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
 )
 
 want_apache

Reply via email to