summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-10-11 15:25:21 +0200
committerLars Wendler <polynomial-c@gentoo.org>2016-10-11 15:25:35 +0200
commit4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e (patch)
treec5ef0e77700941034259203ed327e474f5cba4fb /dev-vcs
parentmedia-gfx/argyllcms: version bump to 1.9.1, bug #596790 (diff)
downloadgentoo-4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e.tar.gz
gentoo-4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e.tar.bz2
gentoo-4ebaa7e551b2ad695f482b0b1d6d0f66f5d1db9e.zip
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>
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch19
-rw-r--r--dev-vcs/subversion/subversion-1.8.16.ebuild1
-rw-r--r--dev-vcs/subversion/subversion-1.9.4.ebuild1
3 files changed, 21 insertions, 0 deletions
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 000000000000..8b07d22ca3f4
--- /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 c4edce64bb7f..afae86f8820c 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 ced9e81c70b0..df0bcd133df9 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