| 1 |
commit: 4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
| 3 |
AuthorDate: Wed Nov 1 07:58:14 2017 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Wed Nov 1 07:58:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=4efaf30a |
| 7 |
|
| 8 |
luajit: working on eprefix support |
| 9 |
|
| 10 |
dev-lang/luajit/luajit-2.0.9999.ebuild | 6 +++--- |
| 11 |
dev-lang/luajit/luajit-2.1.9999.ebuild | 10 +++++----- |
| 12 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild |
| 15 |
index 9920ab5..cb14064 100644 |
| 16 |
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild |
| 17 |
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild |
| 18 |
@@ -70,7 +70,7 @@ src_prepare() { |
| 19 |
-e 's|^(VERSION)=.*|\1=${PV}|' \ |
| 20 |
-e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ |
| 21 |
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ |
| 22 |
- -e 's|( PREFIX)=.*|\1=/usr|' \ |
| 23 |
+ -e 's|( PREFIX)=.*|\1=${EPREFIX}/usr|' \ |
| 24 |
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ |
| 25 |
-i Makefile || die "failed to fix prefix in Makefile" |
| 26 |
|
| 27 |
@@ -98,7 +98,7 @@ src_prepare() { |
| 28 |
|
| 29 |
multilib_src_configure() { |
| 30 |
sed -r \ |
| 31 |
- -e "s|^(prefix)=.*|\1=/usr|" \ |
| 32 |
+ -e "s|^(prefix)=.*|\1=${EPREFIX}/usr|" \ |
| 33 |
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \ |
| 34 |
-i "etc/${PN}.pc" || die "Failed to slottify" |
| 35 |
} |
| 36 |
@@ -125,7 +125,7 @@ multilib_src_compile() { |
| 37 |
} |
| 38 |
|
| 39 |
multilib_src_install() { |
| 40 |
- emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install |
| 41 |
+ emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install |
| 42 |
|
| 43 |
einstalldocs |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild |
| 47 |
index 31b5655..a241d93 100644 |
| 48 |
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild |
| 49 |
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild |
| 50 |
@@ -59,7 +59,7 @@ src_prepare() { |
| 51 |
-e 's|^(VERSION)=.*|\1=${PV}|' \ |
| 52 |
-e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \ |
| 53 |
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ |
| 54 |
- -e 's|( PREFIX)=.*|\1=/usr|' \ |
| 55 |
+ -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \ |
| 56 |
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ |
| 57 |
-i Makefile || die "failed to fix prefix in Makefile" |
| 58 |
|
| 59 |
@@ -80,7 +80,7 @@ src_prepare() { |
| 60 |
|
| 61 |
multilib_src_configure() { |
| 62 |
sed -r \ |
| 63 |
- -e "s|^(prefix)=.*|\1=/usr|" \ |
| 64 |
+ -e "s|^(prefix)=.*|\1=${EROOT}usr|" \ |
| 65 |
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \ |
| 66 |
-i "etc/${PN}.pc" || die "Failed to slottify" |
| 67 |
} |
| 68 |
@@ -112,7 +112,7 @@ multilib_src_compile() { |
| 69 |
} |
| 70 |
|
| 71 |
multilib_src_install() { |
| 72 |
- emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install |
| 73 |
+ emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install |
| 74 |
|
| 75 |
einstalldocs |
| 76 |
|
| 77 |
@@ -123,10 +123,10 @@ multilib_src_install() { |
| 78 |
} |
| 79 |
|
| 80 |
pkg_postinst() { |
| 81 |
- if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then |
| 82 |
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/luajit) ]] ; then |
| 83 |
eselect luajit set luajit-${PV} |
| 84 |
fi |
| 85 |
- if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then |
| 86 |
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/lua) ]] ; then |
| 87 |
eselect lua set jit-${PV} |
| 88 |
fi |
| 89 |
} |
Archives