diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-01-11 20:42:54 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-01-11 20:42:54 +0000 |
| commit | 456c716bd8c5a4419bddb02105596fdfe82c2995 (patch) | |
| tree | 55571a014ee7c890bb411dac9f8a7d2611553f30 /dev-java/scala-bin | |
| parent | Add fallback https EGIT_REPO_URI (diff) | |
| download | gentoo-2-456c716bd8c5a4419bddb02105596fdfe82c2995.tar.gz gentoo-2-456c716bd8c5a4419bddb02105596fdfe82c2995.tar.bz2 gentoo-2-456c716bd8c5a4419bddb02105596fdfe82c2995.zip | |
Corrected sed warnings. Also corrected a bunch of QA warnings. Fix #533856.
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-java/scala-bin')
| -rw-r--r-- | dev-java/scala-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/scala-bin/scala-bin-1.2.0.1.ebuild | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/dev-java/scala-bin/ChangeLog b/dev-java/scala-bin/ChangeLog index 551e1e610448..0402990f7912 100644 --- a/dev-java/scala-bin/ChangeLog +++ b/dev-java/scala-bin/ChangeLog @@ -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 <monsieurp@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_bush@gentoo.org> scala-bin-1.2.0.1.ebuild: Block dev-lang/scala diff --git a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild b/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild index d7760f3755b3..242ffcda85a8 100644 --- a/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild +++ b/dev-java/scala-bin/scala-bin-1.2.0.1.ebuild @@ -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 @@ src_compile() { 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 @@ src_install() { 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} } |