gienah      14/11/26 02:44:19

  Modified:             ChangeLog scala-2.11.2.ebuild
  Log:
  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)

Revision  Changes    Path
1.41                 dev-lang/scala/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.41&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?rev=1.41&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/ChangeLog?r1=1.40&r2=1.41

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog   6 Oct 2014 05:51:40 -0000       1.40
+++ ChangeLog   26 Nov 2014 02:44:19 -0000      1.41
@@ -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 <[email protected]> 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 <[email protected]> scala-2.11.1.ebuild,
   scala-2.11.2.ebuild:



1.3                  dev-lang/scala/scala-2.11.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild?r1=1.2&r2=1.3

Index: scala-2.11.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scala-2.11.2.ebuild 6 Oct 2014 05:51:40 -0000       1.2
+++ scala-2.11.2.ebuild 26 Nov 2014 02:44:19 -0000      1.3
@@ -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 @@
                        # 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 @@
        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
 }




Reply via email to