summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2014-11-26 02:44:19 +0000
committerMark Wright <gienah@gentoo.org>2014-11-26 02:44:19 +0000
commit122f6066f2590e33d0f76e9dfb11e29df054b9a9 (patch)
tree6b7e912b5ac046e595dc0bd96b595c66177a8e12 /dev-lang/scala
parentVersion bump. Cleanup old. (diff)
downloadgentoo-2-122f6066f2590e33d0f76e9dfb11e29df054b9a9.tar.gz
gentoo-2-122f6066f2590e33d0f76e9dfb11e29df054b9a9.tar.bz2
gentoo-2-122f6066f2590e33d0f76e9dfb11e29df054b9a9.zip
Thanks to zmedico for fixing and reporting Bug 530510 - dev-lang/scala-2.11.2: library API docs are not built when USE=doc is enabled.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-lang/scala')
-rw-r--r--dev-lang/scala/ChangeLog6
-rw-r--r--dev-lang/scala/scala-2.11.2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 8ab0d30dc664..7cfcbb9f3562 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/scala
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.40 2014/10/06 05:51:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.41 2014/11/26 02:44:19 gienah Exp $
+
+ 26 Nov 2014; Mark Wright <gienah@gentoo.org> scala-2.11.2.ebuild:
+ Thanks to zmedico for fixing and reporting Bug 530510 - dev-lang/scala-2.11.2:
+ library API docs are not built when USE=doc is enabled.
06 Oct 2014; Mark Wright <gienah@gentoo.org> scala-2.11.1.ebuild,
scala-2.11.2.ebuild:
diff --git a/dev-lang/scala/scala-2.11.2.ebuild b/dev-lang/scala/scala-2.11.2.ebuild
index e86ac14d6a31..0632f57cd478 100644
--- a/dev-lang/scala/scala-2.11.2.ebuild
+++ b/dev-lang/scala/scala-2.11.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v 1.2 2014/10/06 05:51:40 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v 1.3 2014/11/26 02:44:19 gienah Exp $
EAPI="5"
@@ -163,6 +163,8 @@ src_compile() {
# java.lang.OutOfMemoryError: PermGen space
eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
docscomp
+ eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
+ docs
fi
else
einfo "Skipping compilation, USE=binary is set."
@@ -207,9 +209,9 @@ src_install() {
fi
popd
- local docdir="build/scaladoc/compiler"
+ local docdir="build/scaladoc"
dodoc docs/TODO doc/README
if use doc; then
- dohtml -r "${docdir}"
+ dohtml -r "${docdir}"/{compiler,library}
fi
}