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 C1E04138247 for ; Wed, 18 Dec 2013 18:27:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1902EE0AFA; Wed, 18 Dec 2013 18:27:32 +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 8D447E0AFA for ; Wed, 18 Dec 2013 18:27:31 +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 4580133F4ED for ; Wed, 18 Dec 2013 18:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A5AAD11024B for ; Wed, 18 Dec 2013 18:27:27 +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: <1387391238.a0100a92ec7b8cfab371184c0f47cf365df6c660.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.9999.ebuild dev-lang/luajit/luajit-2.1.9999.ebuild X-VCS-Directories: dev-lang/luajit/ X-VCS-Committer: mva X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov X-VCS-Revision: a0100a92ec7b8cfab371184c0f47cf365df6c660 X-VCS-Branch: master Date: Wed, 18 Dec 2013 18:27:27 +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: 5213de96-95d6-4258-948b-dab9c9c7f783 X-Archives-Hash: c51e2ff1e58629c5760aad6660a43921 commit: a0100a92ec7b8cfab371184c0f47cf365df6c660 Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Wed Dec 18 18:27:18 2013 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Wed Dec 18 18:27:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=a0100a92 [dev-lang/luajit] fixed build Signed-off-by: Vadim A. Misbakh-Soloviov mva.name> --- dev-lang/luajit/luajit-2.0.9999.ebuild | 18 ++++-------------- dev-lang/luajit/luajit-2.1.9999.ebuild | 18 ++++-------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild index bd05797..34c3fe6 100644 --- a/dev-lang/luajit/luajit-2.0.9999.ebuild +++ b/dev-lang/luajit/luajit-2.0.9999.ebuild @@ -11,7 +11,7 @@ MY_PV="2.0.1" DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="" -EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git" +EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git" LICENSE="MIT" SLOT="2" @@ -44,20 +44,10 @@ pkg_setup() { src_prepare(){ # fixing prefix and version - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|/lib|/$(get_libdir)|" \ + sed -r \ + -e "s|( PREFIX)=.*|\1=/usr|" \ + -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \ -i Makefile || die "failed to fix prefix in Makefile" - - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|lib/|$(get_libdir)/|" \ - -i src/luaconf.h || die "failed to fix prefix in luaconf.h" - - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|=lib|=$(get_libdir)|" \ - -i etc/luajit.pc || die "failed to fix prefix in pkg-config file" } src_compile() { diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index 33c18d7..83a3cc5 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -11,7 +11,7 @@ MY_PV="2.1.0-alpha" DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="" -EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git" +EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git" EGIT_BRANCH="v2.1" LICENSE="MIT" @@ -44,20 +44,10 @@ pkg_setup() { src_prepare(){ # fixing prefix and version - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|/lib|/$(get_libdir)|" \ + sed -r \ + -e "s|( PREFIX)=.*|\1=/usr|" \ + -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \ -i Makefile || die "failed to fix prefix in Makefile" - - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|lib/|$(get_libdir)/|" \ - -i src/luaconf.h || die "failed to fix prefix in luaconf.h" - - sed \ - -e "s|/usr/local|/usr|" \ - -e "s|=lib|=$(get_libdir)|" \ - -i etc/luajit.pc || die "failed to fix prefix in pkg-config file" } src_compile() {