aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorILMostro <ilmostro7@gmail.com>2018-06-19 23:26:39 -0500
committerILMostro <ilmostro7@gmail.com>2018-06-19 23:26:39 -0500
commit6490b5a3c499c5559d0eb37799f2dd7d8fbc7a06 (patch)
tree9eaad33bb4f58dfe849a1f0c6e49eee69b1c1397 /dev-lua
parentfixed categories in README table (diff)
downloadag-ops-6490b5a3c499c5559d0eb37799f2dd7d8fbc7a06.tar.gz
ag-ops-6490b5a3c499c5559d0eb37799f2dd7d8fbc7a06.tar.bz2
ag-ops-6490b5a3c499c5559d0eb37799f2dd7d8fbc7a06.zip
find lua version correctly for lgi
Diffstat (limited to 'dev-lua')
-rw-r--r--dev-lua/lgi/files/lgi-0.9.2.patch15
-rw-r--r--dev-lua/lgi/lgi-0.9.2.ebuild4
2 files changed, 7 insertions, 12 deletions
diff --git a/dev-lua/lgi/files/lgi-0.9.2.patch b/dev-lua/lgi/files/lgi-0.9.2.patch
index b6fd231..16e9cd4 100644
--- a/dev-lua/lgi/files/lgi-0.9.2.patch
+++ b/dev-lua/lgi/files/lgi-0.9.2.patch
@@ -1,8 +1,8 @@
diff --git a/lgi/Makefile b/lgi/Makefile
-index 08419bd..a56df02 100644
+index 08419bd..b93becf 100644
--- a/lgi/Makefile
+++ b/lgi/Makefile
-@@ -5,11 +5,12 @@
+@@ -5,9 +5,9 @@
# License: MIT
#
@@ -10,12 +10,7 @@ index 08419bd..a56df02 100644
+PREFIX = /usr
HOST_OS = $(shell uname -s | tr A-Z a-z)
-LUA_VERSION=5.1
--LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
--LUA_SHAREDIR = $(PREFIX)/share/lua/$(LUA_VERSION)
-+# Dirty hack for the time being
-+# See https://github.com/pavouk/lgi/issues/196
-+LUA_LIBDIR = $(PREFIX)/lib/lua
-+LUA_SHAREDIR = $(PREFIX)/share/lua
++LUA_VERSION=$(shell readlink -e "${EROOT}"/usr/bin/lua | sed -ne 's:.*/usr/bin/lua\([\d.-]*\):\1:p')
+ LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
+ LUA_SHAREDIR = $(PREFIX)/share/lua/$(LUA_VERSION)
- PKG_CONFIG = pkg-config
- GINAME = gobject-introspection-1.0
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
index 37a5f2d..ba0d9d2 100644
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2.ebuild
@@ -5,8 +5,8 @@ EAPI=6
VIRTUALX_REQUIRED="manual"
-# inherit eutils toolchain-funcs flag-o-matic virtualx
-inherit eutils toolchain-funcs virtualx
+inherit eutils toolchain-funcs flag-o-matic virtualx
+# inherit eutils toolchain-funcs virtualx
DESCRIPTION="Lua bindings using gobject-introspection"
HOMEPAGE="https://github.com/pavouk/lgi"