dev-util/hermes: move to commit version for >lua5.1 compat

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo@aisha.cc>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 73 insertions, 15 deletions

diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index cb1e33d2fe62..35772d6d2a42 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -1 +1 @@
-DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3
+DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
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..5d33acdefad9
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8_p20180315.ebuild
@@ -0,0 +1,52 @@
+# 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/luaposix[${LUA_USEDEP}]
+	')
+"
+
+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..b7ca24876556 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,10 +8,16 @@ 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"