Correct typo in the comments: sed -e s@WORDIR@WORKDIR@g -i *.ebuild

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

8 files changed, 22 insertions, 16 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index d1494358d1cd..87afbcd8e1ff 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.45 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.46 2015/04/18 07:42:09 gienah Exp $
+
+  18 Apr 2015; Mark Wright <gienah@gentoo.org> scala-2.10.2-r2.ebuild,
+  scala-2.10.3-r1.ebuild, scala-2.10.4-r1.ebuild, scala-2.11.1-r1.ebuild,
+  scala-2.11.2-r1.ebuild, scala-2.11.4-r1.ebuild, scala-2.11.6.ebuild,
+  scala-2.9.2-r1.ebuild:
+  Correct typo in the comments: sed -e s@WORDIR@WORKDIR@g -i *.ebuild
 
 *scala-2.9.2-r1 (17 Apr 2015)
 *scala-2.11.1-r1 (17 Apr 2015)
diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r2.ebuild
index de93e7be024b..b50c8c5c2a35 100644
--- a/dev-lang/scala/scala-2.10.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r2.ebuild
@@ -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-lang/scala/scala-2.10.2-r2.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2-r2.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -137,8 +137,8 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. comment out applying the maven-deps patch and all the stuff here up to and including the sed of build.xml
-		# 3. try emerge scala, it will likely download more stuff in src_compile to ${WORDIR}/.m2
-		# 4. tar up the stuff in ${WORDIR}/.m2 and change the ${P}-maven-deps.tar.gz in SRC_URI to point to it.
+		# 3. try emerge scala, it will likely download more stuff in src_compile to ${WORKDIR}/.m2
+		# 4. tar up the stuff in ${WORKDIR}/.m2 and change the ${P}-maven-deps.tar.gz in SRC_URI to point to it.
 		# 5. uncomment the maven-deps patch apply and all the stuff up to and including the sed of build.xml
 		# 6. the hash in ${P}-no-git.patch should be updated by searching for hash matching the scala release
 		# tag, so that the source code hyper-links in the scala documentation will point to the correct version of
diff --git a/dev-lang/scala/scala-2.10.3-r1.ebuild b/dev-lang/scala/scala-2.10.3-r1.ebuild
index d44cb15e8850..176f718e1b66 100644
--- a/dev-lang/scala/scala-2.10.3-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r1.ebuild
@@ -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-lang/scala/scala-2.10.3-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.3-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -151,7 +151,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r1.ebuild
index c6f08837b47f..13d502e52af9 100644
--- a/dev-lang/scala/scala-2.10.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r1.ebuild
@@ -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-lang/scala/scala-2.10.4-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -154,7 +154,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r1.ebuild
index 78a7f4482019..3cc6dfb9a156 100644
--- a/dev-lang/scala/scala-2.11.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r1.ebuild
@@ -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-lang/scala/scala-2.11.1-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -137,7 +137,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r1.ebuild
index 1a3a11c0b59f..60cd316b153c 100644
--- a/dev-lang/scala/scala-2.11.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r1.ebuild
@@ -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-lang/scala/scala-2.11.2-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.2-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -137,7 +137,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 8925fe69f668..8feb57b4692f 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -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-lang/scala/scala-2.11.4-r1.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -137,7 +137,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6.ebuild
index 72597c018fa8..ee05c5ec74c5 100644
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.6.ebuild
@@ -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-lang/scala/scala-2.11.6.ebuild,v 1.1 2015/04/17 14:39:37 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.6.ebuild,v 1.2 2015/04/18 07:42:09 gienah Exp $
 
 EAPI="5"
 
@@ -137,7 +137,7 @@ java_prepare() {
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
 		# or /var/tmp/portage/.m2 or /root/.m2
 		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
 		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \