| 1 |
commit: b7ea6074128d4f88b4f701fb6fd997328819aaab |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Mon May 27 18:34:54 2013 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Mon May 27 18:34:54 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b7ea6074 |
| 7 |
|
| 8 |
[dev-lang/luajit] rafaelmartins+devmalual inspired fixes |
| 9 |
|
| 10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
| 11 |
|
| 12 |
--- |
| 13 |
dev-lang/luajit/luajit-2.0.1.ebuild | 25 ++++++++++++++----------- |
| 14 |
dev-lang/luajit/luajit-9999.ebuild | 19 +++++++++++++------ |
| 15 |
2 files changed, 27 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild |
| 18 |
index bc70ec7..76b6748 100644 |
| 19 |
--- a/dev-lang/luajit/luajit-2.0.1.ebuild |
| 20 |
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild |
| 21 |
@@ -6,28 +6,22 @@ EAPI="5" |
| 22 |
|
| 23 |
inherit eutils multilib flag-o-matic check-reqs pax-utils |
| 24 |
|
| 25 |
-MY_P="LuaJIT-${PV/_/-}" |
| 26 |
DESCRIPTION="Just-In-Time Compiler for the Lua programming language" |
| 27 |
HOMEPAGE="http://luajit.org/" |
| 28 |
SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" |
| 29 |
|
| 30 |
-KEYWORDS="~amd64 ~x86" |
| 31 |
- |
| 32 |
LICENSE="MIT" |
| 33 |
SLOT="2" |
| 34 |
-IUSE="emacs +optimization +interactive lua52compat" |
| 35 |
+KEYWORDS="~amd64 ~x86" |
| 36 |
+IUSE="+optimization lua52compat" |
| 37 |
|
| 38 |
DEPEND=" |
| 39 |
${CDEPEND} |
| 40 |
- emacs? ( app-emacs/lua-mode ) |
| 41 |
" |
| 42 |
PDEPEND=" |
| 43 |
- interactive? ( dev-lua/iluajit ) |
| 44 |
virtual/lua[luajit] |
| 45 |
" |
| 46 |
|
| 47 |
-S="${WORKDIR}/${MY_P}" |
| 48 |
- |
| 49 |
# Workaround for CHECKREQS_MEMORY |
| 50 |
pkg_setup() { :; } |
| 51 |
|
| 52 |
@@ -60,6 +54,8 @@ src_prepare(){ |
| 53 |
# removing strip |
| 54 |
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \ |
| 55 |
|| die "failed to remove forced strip" |
| 56 |
+ |
| 57 |
+ # fixing pkg-config file (Lua-replacing compatibility) |
| 58 |
sed -r \ |
| 59 |
-e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \ |
| 60 |
-i etc/luajit.pc || die "failed to fix pkgconfig file" |
| 61 |
@@ -116,6 +112,13 @@ src_install() { |
| 62 |
newbin "${FILESDIR}/luac.jit" "luac-${P}" |
| 63 |
} |
| 64 |
|
| 65 |
-#pkg_postinst() { |
| 66 |
-# "${ROOT}"/usr/bin/eselect lua set "${P}" |
| 67 |
-#} |
| 68 |
\ No newline at end of file |
| 69 |
+pkg_postinst() { |
| 70 |
+ if ! has_version dev-lua/iluajit; then |
| 71 |
+ einfo "You'd probably want to install dev-lua/iluajit to"; |
| 72 |
+ ewarn "get fully functional interactive shell for LuaJIT"; |
| 73 |
+ fi |
| 74 |
+ if has_version app-editors/emacs || app-editors/xemacs; then |
| 75 |
+ einfo "You'd probably want to install app-emacs/lua-mode to"; |
| 76 |
+ ewarn "get Lua completion in emacs."; |
| 77 |
+ fi |
| 78 |
+} |
| 79 |
\ No newline at end of file |
| 80 |
|
| 81 |
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild |
| 82 |
index bda8a63..1d66621 100644 |
| 83 |
--- a/dev-lang/luajit/luajit-9999.ebuild |
| 84 |
+++ b/dev-lang/luajit/luajit-9999.ebuild |
| 85 |
@@ -14,14 +14,12 @@ EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git" |
| 86 |
LICENSE="MIT" |
| 87 |
SLOT="2" |
| 88 |
KEYWORDS="" |
| 89 |
-IUSE="emacs +optimization +interactive lua52compat" |
| 90 |
+IUSE="+optimization lua52compat" |
| 91 |
|
| 92 |
DEPEND=" |
| 93 |
${CDEPEND} |
| 94 |
- emacs? ( app-emacs/lua-mode ) |
| 95 |
" |
| 96 |
PDEPEND=" |
| 97 |
- interactive? ( dev-lua/iluajit ) |
| 98 |
virtual/lua[luajit] |
| 99 |
" |
| 100 |
|
| 101 |
@@ -57,6 +55,8 @@ src_prepare(){ |
| 102 |
# removing strip |
| 103 |
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \ |
| 104 |
|| die "failed to remove forced strip" |
| 105 |
+ |
| 106 |
+ # fixing pkg-config file (Lua-replacing compatibility) |
| 107 |
sed -r \ |
| 108 |
-e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \ |
| 109 |
-i etc/luajit.pc || die "failed to fix pkgconfig file" |
| 110 |
@@ -111,6 +111,13 @@ src_install() { |
| 111 |
newbin "${FILESDIR}/luac.jit" "luac-${P}" |
| 112 |
} |
| 113 |
|
| 114 |
-#pkg_postinst() { |
| 115 |
-# "${ROOT}"/usr/bin/eselect lua set "${P}" |
| 116 |
-#} |
| 117 |
+pkg_postinst() { |
| 118 |
+ if ! has_version dev-lua/iluajit; then |
| 119 |
+ einfo "You'd probably want to install dev-lua/iluajit to"; |
| 120 |
+ ewarn "get fully functional interactive shell for LuaJIT"; |
| 121 |
+ fi |
| 122 |
+ if has_version app-editors/emacs || app-editors/xemacs; then |
| 123 |
+ einfo "You'd probably want to install app-emacs/lua-mode to"; |
| 124 |
+ ewarn "get Lua completion in emacs."; |
| 125 |
+ fi |
| 126 |
+} |
Archives