From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 289E81396D9 for ; Wed, 1 Nov 2017 07:58:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 342A12BC01D; Wed, 1 Nov 2017 07:58:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1BE02BC01D for ; Wed, 1 Nov 2017 07:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A86B733BF24 for ; Wed, 1 Nov 2017 07:58:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AC4D90E6 for ; Wed, 1 Nov 2017 07:58:23 +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: <1509523094.4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1.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: 4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1 X-VCS-Branch: master Date: Wed, 1 Nov 2017 07:58:23 +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: b855b943-6690-4563-bec3-1393df4adbd0 X-Archives-Hash: 5f3c75e8f23c7f8d0a5619a01f37169a commit: 4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1 Author: Vadim A. Misbakh-Soloviov mva name> AuthorDate: Wed Nov 1 07:58:14 2017 +0000 Commit: Vadim A. Misbakh-Soloviov mva name> CommitDate: Wed Nov 1 07:58:14 2017 +0000 URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=4efaf30a luajit: working on eprefix support dev-lang/luajit/luajit-2.0.9999.ebuild | 6 +++--- dev-lang/luajit/luajit-2.1.9999.ebuild | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild index 9920ab5..cb14064 100644 --- a/dev-lang/luajit/luajit-2.0.9999.ebuild +++ b/dev-lang/luajit/luajit-2.0.9999.ebuild @@ -70,7 +70,7 @@ src_prepare() { -e 's|^(VERSION)=.*|\1=${PV}|' \ -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ -e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ - -e 's|( PREFIX)=.*|\1=/usr|' \ + -e 's|( PREFIX)=.*|\1=${EPREFIX}/usr|' \ -e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ -i Makefile || die "failed to fix prefix in Makefile" @@ -98,7 +98,7 @@ src_prepare() { multilib_src_configure() { sed -r \ - -e "s|^(prefix)=.*|\1=/usr|" \ + -e "s|^(prefix)=.*|\1=${EPREFIX}/usr|" \ -e "s|^(multilib)=.*|\1=$(get_libdir)|" \ -i "etc/${PN}.pc" || die "Failed to slottify" } @@ -125,7 +125,7 @@ multilib_src_compile() { } multilib_src_install() { - emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install + emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install einstalldocs diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index 31b5655..a241d93 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -59,7 +59,7 @@ src_prepare() { -e 's|^(VERSION)=.*|\1=${PV}|' \ -e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \ -e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ - -e 's|( PREFIX)=.*|\1=/usr|' \ + -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \ -e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ -i Makefile || die "failed to fix prefix in Makefile" @@ -80,7 +80,7 @@ src_prepare() { multilib_src_configure() { sed -r \ - -e "s|^(prefix)=.*|\1=/usr|" \ + -e "s|^(prefix)=.*|\1=${EROOT}usr|" \ -e "s|^(multilib)=.*|\1=$(get_libdir)|" \ -i "etc/${PN}.pc" || die "Failed to slottify" } @@ -112,7 +112,7 @@ multilib_src_compile() { } multilib_src_install() { - emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install + emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install einstalldocs @@ -123,10 +123,10 @@ multilib_src_install() { } pkg_postinst() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then + if [[ ! -n $(readlink "${EROOT}"usr/bin/luajit) ]] ; then eselect luajit set luajit-${PV} fi - if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then + if [[ ! -n $(readlink "${EROOT}"usr/bin/lua) ]] ; then eselect lua set jit-${PV} fi }