monsieurp 15/01/18 21:39:44 Modified: scala-bin-2.11.4.ebuild ChangeLog Log: Use java_prepare() instead of src_prepare. Add `doc' USE flag. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 dev-java/scala-bin/scala-bin-2.11.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild?r1=1.1&r2=1.2 Index: scala-bin-2.11.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scala-bin-2.11.4.ebuild 18 Jan 2015 01:05:53 -0000 1.1 +++ scala-bin-2.11.4.ebuild 18 Jan 2015 21:39:44 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.1 2015/01/18 01:05:53 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-2.11.4.ebuild,v 1.2 2015/01/18 21:39:44 monsieurp Exp $ EAPI=5 inherit java-utils-2 @@ -17,9 +17,10 @@ RDEPEND=">=virtual/jre-1.6 !dev-lang/scala" +JAVA_PKG_IUSE='doc' S=${WORKDIR}/scala-${PV} -src_prepare() { +java_prepare() { ebegin 'Cleaning .bat files' rm -f bin/*.bat eend $? @@ -67,7 +68,9 @@ doman man/man1/*.1 eend $? - ebegin 'Installing documentation' - java-pkg_dohtml -r doc/tools - eend $? + if use doc; then + ebegin 'Installing documentation' + java-pkg_dohtml -r doc/tools + eend $? + fi } 1.15 dev-java/scala-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?r1=1.14&r2=1.15 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ChangeLog 18 Jan 2015 01:05:53 -0000 1.14 +++ ChangeLog 18 Jan 2015 21:39:44 -0000 1.15 @@ -1,6 +1,9 @@ # ChangeLog for dev-java/scala-bin # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.14 2015/01/18 01:05:53 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.15 2015/01/18 21:39:44 monsieurp Exp $ + + 18 Jan 2015; Patrice Clement <monsie...@gentoo.org> scala-bin-2.11.4.ebuild: + Use java_prepare() instead of src_prepare. Add `doc' USE flag. *scala-bin-2.11.4 (18 Jan 2015)
