From 5e4a03c8177fb99c92dea188abd1237f8ac57a01 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 11 Jan 2015 20:42:58 +0000 Subject: [PATCH] Corrected sed warnings. Also corrected a bunch of QA warnings. Fix #533856. Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- dev-java/scala-bin/ChangeLog | 7 +++++-- dev-java/scala-bin/Manifest | 4 ++-- dev-java/scala-bin/scala-bin-1.2.0.1.ebuild | 22 ++++++++++----------- 3 files changed, 18 insertions(+), 15 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 scala-bin-1.2.0.1.ebuild: + Corrected sed warnings. Also corrected a bunch of QA warnings. Fix #533856. 15 Dec 2010; Alistair Bush scala-bin-1.2.0.1.ebuild: Block dev-lang/scala diff --git a/dev-java/scala-bin/Manifest b/dev-java/scala-bin/Manifest index 61832af97a2d..df8d185eb643 100644 --- a/dev-java/scala-bin/Manifest +++ b/dev-java/scala-bin/Manifest @@ -1,4 +1,4 @@ DIST scala-1.2.0.1.tar.bz2 4548508 SHA256 975d6e10febf5d52a3f2d826afa7f98ddbec0a6f05eaf6c30a3f27a472ca84b9 SHA512 8fd4958e1603b576cb73f7372a88a7b06c1432e4f8a0fa6a987aa4397343c6d859ddda9972af039e0b4b1ea722dbbbfd4df03fe2edf9cc54bbc72e5cebbf200b WHIRLPOOL dfa5d71b39ffa1012d66ac8bcc281562182af13ec642fceee2e1fb7f3228a303a198a401e0578e3aad7d7608a26ae6e11978042fd488b4503ffb144e5d2efa44 -EBUILD scala-bin-1.2.0.1.ebuild 1490 SHA256 3edf9ac66c19041a29f4b8eb89f76f91cdf8604478fce1be79ef69367ab9da85 SHA512 125bdd85f3d62b9d1d31dadad764fe6b731bd74ceba608f9a3a21dc1390050cbd0ea64efaa41447cb2f5dd64e3b3818228fe3c3840e2b9f3d38ea7e51dbdc287 WHIRLPOOL c8f776de040057124356abbaa7f0f093d8fac3e60fd3cc9d305f879c03a3fcd76f7f1678c9ba4193348051a93afeef5f53427fb88dbda03e366aa0ac67ba535e -MISC ChangeLog 1614 SHA256 7f334f8adc74ca452be8ad7fd56459e6ac6f777fe986111c84c2bf3207880881 SHA512 fcfb3d6187e2291ae03395c345f2fe888c300b92b46655c88cd32dc10aab3952d8e5fcf25c72f539d35e58ba4df4f6b9c02ad0a77e9808bf2f4145a2361e7510 WHIRLPOOL f98dd5f029a770d993a2b3b29574726273bcc37e3fa1e394456c35410252f817e60f10d66a2a82103a5b0a3dd0a31c8cd2b4537da7af41cb3c4273a0471ea1bc +EBUILD scala-bin-1.2.0.1.ebuild 1461 SHA256 aadfd595a15bbeb9ae665fe5c3bc3311b77b222c10b2785bd0f978aa5daa3f15 SHA512 e4382d88fffed340ed2341adcbcba4fb9cb5e1157b46492b92cead867649c3d6b495047d6796de8f75be57c7522dd6aba438dfd0e438c61b2e647ddbe72ef36f WHIRLPOOL 8cdb914b38f6879e9e70d8b306dc6b3055c7561c1ce6b120274ef2eda4649960a1f0c1ffaefd3116e3a4f98b1962f51b6737392ea4fdc07c7141d0b32a4f9681 +MISC ChangeLog 1774 SHA256 4829ba155ae39a62e23e59217d93e3a6c2aaf5d33f57ca1f7de7bdbea915c2b3 SHA512 ceaa8cc5cea6c507f5c6912341b193c62fba7bd8d8abc202f9f7c87200e0df0c09fbba40f6a63a00e51061245471c49670a124339f683b510c921752390d445b WHIRLPOOL e0fcd211b53090973e8615973c2c37ed255762710f87c3e16546bb9d658c40e34641861f3565196ee826c39591cceb8cddf4cb19014ee2d498a0a94488a5f0cb MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc 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} } -- 2.26.2