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@gentoo.org>

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 (file)
index 0000000..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 c4edce64bb7fedea858b67c674e0534e73aa53c2..afae86f8820ce0361690bd0b4dd677d77d704c85 100644 (file)
--- 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 ced9e81c70b0df0616705fd1bffae2e1b8ec303d..df0bcd133df9a9a14a43e3fd94b026cd851f3497 100644 (file)
--- 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