[gentoo-commits] repo/proj/guru:dev commit in: dev-lang/fennel/

["Theo Anderson" <telans@posteo.de>]

commit:     61f9a5724531c7593d38444d261e8fd92c83e7b9
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sat Apr 17 22:52:03 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Apr 17 22:52:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=61f9a572

dev-lang/fennel: fix VariableScope ED

Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 dev-lang/fennel/fennel-0.9.1.ebuild | 23 +++++++----------------
 dev-lang/fennel/fennel-9999.ebuild  | 23 +++++++----------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/dev-lang/fennel/fennel-0.9.1.ebuild b/dev-lang/fennel/fennel-0.9.1.ebuild
index 6b904151f..62871fa60 100644
--- a/dev-lang/fennel/fennel-0.9.1.ebuild
+++ b/dev-lang/fennel/fennel-0.9.1.ebuild
@@ -10,7 +10,7 @@ inherit lua-single
 DESCRIPTION="Fennel is a lisp that compiles to Lua"
 HOMEPAGE="https://fennel-lang.org/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~technomancy/fennel"
 else
@@ -22,24 +22,15 @@ LICENSE="MIT"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-BDEPEND="${LUA_DEPS}"
-RDEPEND="${BDEPEND}"
+RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	lua-single_pkg_setup
-}
-
-src_compile() {
-	emake LUA_VERSION="$(lua_get_version)" \
-		  LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
-		  PREFIX="${ED}/usr"
-}
+BDEPEND="${RDEPEND}"
 
 src_install() {
-	emake LUA_VERSION="$(lua_get_version)" \
-		  LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
-		  PREFIX="${ED}/usr" install
+	emake \
+		LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
+		PREFIX="${ED}/usr" \
+		install
 	doman "${PN}.1"
 	dodoc *.md
 }

diff --git a/dev-lang/fennel/fennel-9999.ebuild b/dev-lang/fennel/fennel-9999.ebuild
index 6b904151f..62871fa60 100644
--- a/dev-lang/fennel/fennel-9999.ebuild
+++ b/dev-lang/fennel/fennel-9999.ebuild
@@ -10,7 +10,7 @@ inherit lua-single
 DESCRIPTION="Fennel is a lisp that compiles to Lua"
 HOMEPAGE="https://fennel-lang.org/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~technomancy/fennel"
 else
@@ -22,24 +22,15 @@ LICENSE="MIT"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-BDEPEND="${LUA_DEPS}"
-RDEPEND="${BDEPEND}"
+RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	lua-single_pkg_setup
-}
-
-src_compile() {
-	emake LUA_VERSION="$(lua_get_version)" \
-		  LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
-		  PREFIX="${ED}/usr"
-}
+BDEPEND="${RDEPEND}"
 
 src_install() {
-	emake LUA_VERSION="$(lua_get_version)" \
-		  LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
-		  PREFIX="${ED}/usr" install
+	emake \
+		LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \
+		PREFIX="${ED}/usr" \
+		install
 	doman "${PN}.1"
 	dodoc *.md
 }