monsieurp 15/01/11 20:42:54 Modified: scala-bin-1.2.0.1.ebuild ChangeLog Log: Corrected sed warnings. Also corrected a bunch of QA warnings. Fix #533856. (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.9 dev-java/scala-bin/scala-bin-1.2.0.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild?r1=1.8&r2=1.9 Index: scala-bin-1.2.0.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scala-bin-1.2.0.1.ebuild 15 Dec 2010 07:07:47 -0000 1.8 +++ scala-bin-1.2.0.1.ebuild 11 Jan 2015 20:42:54 -0000 1.9 @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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-1.2.0.1.ebuild,v 1.8 2010/12/15 07:07:47 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild,v 1.9 2015/01/11 20:42:54 monsieurp Exp $ inherit java-pkg-2 @@ -20,13 +20,13 @@ jars=/usr/share/${PN}/lib - sed -e "s§RUNTIME_SOURCES=.*§RUNTIME_SOURCES=\"/usr/share/${PF}/src\";§" \ - -e "s§RUNTIME_CLASSES=.*§RUNTIME_CLASSES=\"${jars}/scala.jar\";§" \ - -e "s§TOOLS_CLASSES=.*§TOOLS_CLASSES=\"${jars}/tools.jar\";§" \ - -e "s§FJBG_CLASSES=.*§FJBG_CLASSES=\"${jars}/fjbg.jar\";§" \ - -e "s§MSIL_CLASSES=.*§MSIL_CLASSES=\"${jars}/msil.jar\";§" \ - < bin/.scala_wrapper \ - > scala_wrapper +sed -e "s#RUNTIME_SOURCES=.*#RUNTIME_SOURCES=\"/usr/share/${PF}/src\";#; + s#RUNTIME_CLASSES=.*#RUNTIME_CLASSES=\"${jars}/scala.jar\";#; + s#TOOLS_CLASSES=.*#TOOLS_CLASSES=\"${jars}/tools.jar\";#; + s#FJBG_CLASSES=.*#FJBG_CLASSES=\"${jars}/fjbg.jar\";#; + s#MSIL_CLASSES=.*#MSIL_CLASSES=\"${jars}/msil.jar\";#" \ + < bin/.scala_wrapper \ + > scala_wrapper :; } @@ -45,11 +45,11 @@ java-pkg_dojar lib/*.jar java-pkg_dohtml -r doc/api - cp -r examples ${D}/usr/share/doc/${PF} + cp -r examples "${D}"/usr/share/doc/${PF} dodoc doc/*.pdf dodoc README VERSION dodir /usr/share/${PF} - cp -r src support ${D}/usr/share/${PF} + cp -r src support "${D}"/usr/share/${PF} } 1.12 dev-java/scala-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/scala-bin/ChangeLog?r1=1.11&r2=1.12 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ChangeLog 15 Dec 2010 07:07:47 -0000 1.11 +++ ChangeLog 11 Jan 2015 20:42:54 -0000 1.12 @@ -1,6 +1,9 @@ # ChangeLog for dev-java/scala-bin -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.11 2010/12/15 07:07:47 ali_bush Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/scala-bin/ChangeLog,v 1.12 2015/01/11 20:42:54 monsieurp Exp $ + + 11 Jan 2015; Patrice Clement <monsie...@gentoo.org> scala-bin-1.2.0.1.ebuild: + Corrected sed warnings. Also corrected a bunch of QA warnings. Fix #533856. 15 Dec 2010; Alistair Bush <ali_b...@gentoo.org> scala-bin-1.2.0.1.ebuild: Block dev-lang/scala
