gentoo resync : 28.04.2021

3 files changed, 29 insertions, 29 deletions

diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 1c8a4048349a..089604bebc69 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,4 +1,4 @@
 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
-EBUILD mksh-59c.ebuild 1670 BLAKE2B 08685aa312d079dbe4ecdd949cba7ee2d6827b51a7f18228b5b2884abce29326414c40ad3149e09083b8a7007f5cd180dfe494745c84f264cec8bebf2f73c901 SHA512 3096facaedafef124771d462d1033adbdc06e31f2c32201c5701bf69e01ecfa31b1b92c1ee0de8438543cb86f16b4bf1dc2b36223adb24009ed583f7b07c976c
-EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
+EBUILD mksh-59c.ebuild 1670 BLAKE2B 280eb2f02ed77dd96e2c174c7d11a4609ec72c069da95ec5a2174fa96029f3648866da75099853f820ba64f70b7b48cc112d9b2fd42ca6be0f0d8e856cd0f6ca SHA512 c175cc225ce9d3aa8cddecb40a4620241e7ecc902fabd53f0689ab29aa492936237cbfcc9c8a8d3ee5d510b464c33970ebfa644b9fc561a85597f06837d37c52
+EBUILD mksh-9999.ebuild 1677 BLAKE2B f982dd420a14f10299e9109dbdcc592941e7b1a928a911756df854e30bf62161b34bfa63814295606334192beb4d4659bfb28301d44091561de78bc42669604e SHA512 11045c9d7a2284c090afdd37f17f53d7bcb98898c8a680a458273eca5111302e7227f44fdfda9e196e1d6c984b5d94f20479e75a0caf5f60efb4cea3c6ec16bd
 MISC metadata.xml 595 BLAKE2B be131f5babf31d1c99d0e744fdaea55fe9e3eddaf23464de024bf103b3064b53786c30cd07d95ad284df2bcbf62cec4c2df6c8a9b0de0026c2745b4bce30c04c SHA512 e60a0606ef2ecbddc1c4a0f4180714ae75b24ca9cfc011b017502938e74cb0d8bb6a69759e8ce727b06c9d863bccb2ca6ddfb19bb7551b3c74c6912e7847d862
diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild
index 281e6b0e895a..e66f17ebd1bd 100644
--- a/app-shells/mksh/mksh-59c.ebuild
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -6,11 +6,11 @@ EAPI=7
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit cvs
 	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
+	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
@@ -57,6 +57,18 @@ src_compile() {
 	sh FAQ2HTML.sh || die
 }
 
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
+
 src_install() {
 	into /
 	dobin mksh
@@ -71,15 +83,3 @@ src_install() {
 		doman "${S}"_lksh/lksh.1
 	fi
 }
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index d1e1e13e083f..c94ae683a150 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,11 +6,11 @@ EAPI=7
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit cvs
 	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
 	ECVS_MODULE="mksh"
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
+	inherit cvs
 else
 	SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
@@ -57,6 +57,18 @@ src_compile() {
 	sh FAQ2HTML.sh || die
 }
 
+src_test() {
+	einfo "Testing regular mksh."
+	./mksh test.sh -v || die
+
+	if use lksh; then
+		einfo "Testing lksh, POSIX long-bit mksh."
+		pushd "${S}"_lksh >/dev/null || die
+		./lksh test.sh -v || die
+		popd >/dev/null || die
+	fi
+}
+
 src_install() {
 	into /
 	dobin mksh
@@ -71,15 +83,3 @@ src_install() {
 		doman "${S}"_lksh/lksh.1
 	fi
 }
-
-src_test() {
-	einfo "Testing regular mksh."
-	./mksh test.sh -v || die
-
-	if use lksh; then
-		einfo "Testing lksh, POSIX long-bit mksh."
-		pushd "${S}"_lksh >/dev/null || die
-		./lksh test.sh -v || die
-		popd >/dev/null || die
-	fi
-}