From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3B8631381F3 for ; Mon, 27 May 2013 18:35:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA87AE0B88; Mon, 27 May 2013 18:35:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C688E0B88 for ; Mon, 27 May 2013 18:35:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8D4833DA22 for ; Mon, 27 May 2013 18:35:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 51727E4402 for ; Mon, 27 May 2013 18:35:09 +0000 (UTC) From: "Vadim A. Misbakh-Soloviov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" Message-ID: <1369679694.b7ea6074128d4f88b4f701fb6fd997328819aaab.mva@gentoo> Subject: [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/ X-VCS-Repository: proj/lua X-VCS-Files: dev-lang/luajit/luajit-2.0.1.ebuild dev-lang/luajit/luajit-9999.ebuild X-VCS-Directories: dev-lang/luajit/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: b7ea6074128d4f88b4f701fb6fd997328819aaab X-VCS-Branch: master Date: Mon, 27 May 2013 18:35:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cb0066db-39be-4d74-b981-65fa421e1ae9 X-Archives-Hash: b385cdbf68b65875abc57d90aff13632 commit: b7ea6074128d4f88b4f701fb6fd997328819aaab Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Mon May 27 18:34:54 2013 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Mon May 27 18:34:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b7ea6074 [dev-lang/luajit] rafaelmartins+devmalual inspired fixes Signed-off-by: Vadim A. Misbakh-Soloviov mva.name> --- dev-lang/luajit/luajit-2.0.1.ebuild | 25 ++++++++++++++----------- dev-lang/luajit/luajit-9999.ebuild | 19 +++++++++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild index bc70ec7..76b6748 100644 --- a/dev-lang/luajit/luajit-2.0.1.ebuild +++ b/dev-lang/luajit/luajit-2.0.1.ebuild @@ -6,28 +6,22 @@ EAPI="5" inherit eutils multilib flag-o-matic check-reqs pax-utils -MY_P="LuaJIT-${PV/_/-}" DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" -KEYWORDS="~amd64 ~x86" - LICENSE="MIT" SLOT="2" -IUSE="emacs +optimization +interactive lua52compat" +KEYWORDS="~amd64 ~x86" +IUSE="+optimization lua52compat" DEPEND=" ${CDEPEND} - emacs? ( app-emacs/lua-mode ) " PDEPEND=" - interactive? ( dev-lua/iluajit ) virtual/lua[luajit] " -S="${WORKDIR}/${MY_P}" - # Workaround for CHECKREQS_MEMORY pkg_setup() { :; } @@ -60,6 +54,8 @@ src_prepare(){ # removing strip sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \ || die "failed to remove forced strip" + + # fixing pkg-config file (Lua-replacing compatibility) sed -r \ -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \ -i etc/luajit.pc || die "failed to fix pkgconfig file" @@ -116,6 +112,13 @@ src_install() { newbin "${FILESDIR}/luac.jit" "luac-${P}" } -#pkg_postinst() { -# "${ROOT}"/usr/bin/eselect lua set "${P}" -#} \ No newline at end of file +pkg_postinst() { + if ! has_version dev-lua/iluajit; then + einfo "You'd probably want to install dev-lua/iluajit to"; + ewarn "get fully functional interactive shell for LuaJIT"; + fi + if has_version app-editors/emacs || app-editors/xemacs; then + einfo "You'd probably want to install app-emacs/lua-mode to"; + ewarn "get Lua completion in emacs."; + fi +} \ No newline at end of file diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild index bda8a63..1d66621 100644 --- a/dev-lang/luajit/luajit-9999.ebuild +++ b/dev-lang/luajit/luajit-9999.ebuild @@ -14,14 +14,12 @@ EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git" LICENSE="MIT" SLOT="2" KEYWORDS="" -IUSE="emacs +optimization +interactive lua52compat" +IUSE="+optimization lua52compat" DEPEND=" ${CDEPEND} - emacs? ( app-emacs/lua-mode ) " PDEPEND=" - interactive? ( dev-lua/iluajit ) virtual/lua[luajit] " @@ -57,6 +55,8 @@ src_prepare(){ # removing strip sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \ || die "failed to remove forced strip" + + # fixing pkg-config file (Lua-replacing compatibility) sed -r \ -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \ -i etc/luajit.pc || die "failed to fix pkgconfig file" @@ -111,6 +111,13 @@ src_install() { newbin "${FILESDIR}/luac.jit" "luac-${P}" } -#pkg_postinst() { -# "${ROOT}"/usr/bin/eselect lua set "${P}" -#} +pkg_postinst() { + if ! has_version dev-lua/iluajit; then + einfo "You'd probably want to install dev-lua/iluajit to"; + ewarn "get fully functional interactive shell for LuaJIT"; + fi + if has_version app-editors/emacs || app-editors/xemacs; then + einfo "You'd probably want to install app-emacs/lua-mode to"; + ewarn "get Lua completion in emacs."; + fi +}