gentoo resync : 17.02.2021

4 files changed, 84 insertions, 19 deletions

diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index 6e2f5a6a2652..44652c99622a 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -1,5 +1,6 @@
 AUX 99hermes 23 BLAKE2B e0c6e227ba65cc9a4d13c0b1207c4afb1b268c7c82c34eb823912c3f065988d8282bbebe42312770517940e557b0c93610dc632597193a5d9fd78dfb9d1f066d SHA512 9ac639746a3f37910c63a305daabd1c338976e3d4232b2d769e73f869727a09b3cb48e3a1f428f55751c870529403c2ea5dd4ece9676f07f16d9e40d3d9950c5
-AUX hermes-2.8-lua-shebang.patch 514 BLAKE2B 70c2c393d8c3c653de67b9cf5733ea11af9ada13ff1fc9c693bae311a9266e8776269b60387182a8937df6a631aa93bdbdc99231208c2d2644084ad08521e089 SHA512 124e36c8584f263008498c572819eb239761ea96c4716175c60a181d21da9b52fd67f33df4f3a6e0bb39a1aa236062b89ac84d8344710bfe759fee3e37c42ddd
-DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3
-EBUILD hermes-2.8.ebuild 899 BLAKE2B 641716bb0d45f91474ea08bd454836c87c5aecd5f4e1a221eb3a7030e7f54a8e06f2c9e3a3a04d7782e819ec7000cf9992479bf35539b46cec6d864ae8fa3a75 SHA512 89dafd4dda86b0839c95fba76d856a2d4d66fc28624c0a0091821da3a0eef5e2229d640eb361173da9a64fc87d4a1884729c5785a543959e256e2ec786b999d5
+AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126a0ece9ec364d9a2bd6861ac018bdf5ef4182c9723307f208c1c96523c9d5b9af63055f927a77787df4ded504edcc3 SHA512 9713eb09c50212e8f8c5abca911e5f13891941be4d348267f33159bd0aa5517e39b760d1ade8855751849605e67580df4de69c990c17a3eec3c45a08501e47ae
+DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
+EBUILD hermes-2.8_p20180315.ebuild 1129 BLAKE2B 5f564bce7edf5ac2a57f2453cd09155f9484ed93d9caa458f94eff526e12706d8f753662989a55854edbe67465b45b52cbb385685ee1edfb399efa01c1650d00 SHA512 30a4849c484da212a7e9e1ee40ad05d4223647dc586f11206528eb0a573f25e59a9d89ef6b1d54b14c74e5c2b0b96e7f729ae0b30b241cb2afd7f00a400f33ed
+EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
 MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
diff --git a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
index 67058f726d78..c575c5e605a2 100644
--- a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
+++ b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
@@ -1,13 +1,3 @@
-diff --git a/lib/tool.lua b/lib/tool.lua
-index a9124f3..8c39911 100755
---- a/lib/tool.lua
-+++ b/lib/tool.lua
-@@ -1,4 +1,4 @@
--#!/usr/bin/env lua
-+#!@LUA@
- 
- require("strict")
- function tool()
 diff --git a/bin/lua_cmd b/bin/lua_cmd
 index fabc5d5..32c8e13 100755
 --- a/bin/lua_cmd
@@ -21,3 +11,13 @@ index fabc5d5..32c8e13 100755
  fi
  
  export LUA_PATH="$execLuaPath$extra"
+diff --git a/lib/tool.lua b/lib/tool.lua
+index 01acca1..bec5e8d 100755
+--- a/lib/tool.lua
++++ b/lib/tool.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!@LUA@
+ _DEBUG      = false
+ local posix = require("posix")
+ 
diff --git a/dev-util/hermes/hermes-2.8_p20180315.ebuild b/dev-util/hermes/hermes-2.8_p20180315.ebuild
new file mode 100644
index 000000000000..1f67ffbecd8b
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8_p20180315.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single
+
+DESCRIPTION="Lua based testing manager"
+HOMEPAGE="https://github.com/TACC/Hermes"
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TACC/Hermes"
+else
+	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
+	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Hermes-${COMMIT}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+		dev-lua/luaposix[${LUA_USEDEP}]
+	')
+"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
+
+src_compile() {
+	sed -e "s|@LUA@|${LUA}|g" \
+		-i lib/tool.lua \
+		-i bin/lua_cmd || die
+}
+
+src_test() {
+	local -x PATH="bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dodir /opt/hermes
+	cp -r "${S}"/. "${ED}"/opt/hermes/ || die
+
+	doenvd "${FILESDIR}"/99hermes
+}
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-9999.ebuild
index a6b7694d1f6a..e616c7382f47 100644
--- a/dev-util/hermes/hermes-2.8.ebuild
+++ b/dev-util/hermes/hermes-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
@@ -8,28 +8,37 @@ inherit lua-single
 
 DESCRIPTION="Lua based testing manager"
 HOMEPAGE="https://github.com/TACC/Hermes"
-SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/Hermes-${PV}
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TACC/Hermes"
+else
+	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
+	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Hermes-${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
 		dev-lua/luaposix[${LUA_USEDEP}]
 	')
 "
+DEPEND="test? ( ${RDEPEND} )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
 
 src_compile() {
 	sed -e "s|@LUA@|${LUA}|g" \
-	    -i lib/tool.lua \
-	    -i bin/lua_cmd || die
+		-i lib/tool.lua \
+		-i bin/lua_cmd || die
 }
 
 src_test() {