[gentoo-commits] proj/lua:master commit in: dev-lang/luajit/

["Vadim A. Misbakh-Soloviov" <mva@mva.name>]

commit:     4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov  1 07:58:14 2017 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> 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
 }