1 |
commit: 361c448ef32972f43a119fd733ec820754ae3c9b |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Sat Apr 30 06:50:55 2016 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Sat Apr 30 06:50:55 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=361c448e |
7 |
|
8 |
luajit: change src_prep patching according makefile changes |
9 |
|
10 |
dev-lang/luajit/luajit-2.1.9999.ebuild | 31 ++++++------------------------- |
11 |
1 file changed, 6 insertions(+), 25 deletions(-) |
12 |
|
13 |
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild |
14 |
index 68a2986..4a69cf2 100644 |
15 |
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild |
16 |
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild |
17 |
@@ -2,9 +2,9 @@ |
18 |
# Distributed under the terms of the GNU General Public License v2 |
19 |
# $Header: This ebuild is from Lua overlay; Bumped by mva; $ |
20 |
|
21 |
-EAPI="5" |
22 |
+EAPI="6" |
23 |
|
24 |
-inherit base eutils multilib multilib-minimal portability pax-utils toolchain-funcs versionator flag-o-matic check-reqs git-r3 |
25 |
+inherit eutils multilib multilib-minimal portability pax-utils toolchain-funcs versionator flag-o-matic check-reqs git-r3 |
26 |
|
27 |
DESCRIPTION="Just-In-Time Compiler for the Lua programming language" |
28 |
HOMEPAGE="http://luajit.org/" |
29 |
@@ -30,7 +30,7 @@ PDEPEND=" |
30 |
virtual/lua[luajit] |
31 |
" |
32 |
|
33 |
-HTML_DOCS=( "doc/" ) |
34 |
+HTML_DOCS=( "doc/." ) |
35 |
|
36 |
MULTILIB_WRAPPED_HEADERS=( |
37 |
/usr/include/luajit-${SLOT}/luaconf.h |
38 |
@@ -54,45 +54,26 @@ pkg_setup() { |
39 |
|
40 |
src_prepare(){ |
41 |
# fixing prefix and version |
42 |
-# sed -r \ |
43 |
-# -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \ |
44 |
-# -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ |
45 |
-# -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \ |
46 |
-# -e 's|^(INSTALL_PCNAME)=.*|\1=${PN}-$(VERSION).pc|' \ |
47 |
-# -e 's|^(INSTALL_SOSHORT)=.*|\1=lib${PN}-${SLOT}.so|' \ |
48 |
-# -e 's|^(INSTALL_ANAME)=.*|\1=lib${PN}-${SLOT}.a|' \ |
49 |
-# -e 's|^(INSTALL_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ |
50 |
-# -e 's|( PREFIX)=.*|\1=/usr|' \ |
51 |
-# -e '/\$\(SYMLINK\)\ \$\(INSTALL_TNAME\)\ \$\(INSTALL_TSYM\)/d' \ |
52 |
-# -i Makefile || die "failed to fix prefix in Makefile" |
53 |
- |
54 |
sed -r \ |
55 |
-e 's|^(VERSION)=.*|\1=${PV}|' \ |
56 |
- -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \ |
57 |
+ -e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \ |
58 |
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \ |
59 |
-e 's|( PREFIX)=.*|\1=/usr|' \ |
60 |
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \ |
61 |
-i Makefile || die "failed to fix prefix in Makefile" |
62 |
|
63 |
-# sed -r \ |
64 |
-# -e 's|^(libname=.*-)\$\{abiver\}|\1${majver}.${minver}|' \ |
65 |
-# -i "etc/${PN}.pc" || die "Failed to slottify" |
66 |
- |
67 |
-# sed -r \ |
68 |
-# -e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \ |
69 |
-# -i src/Makefile || die "Failed to slottify" |
70 |
- |
71 |
sed -r \ |
72 |
-e 's|^(#define LUA_LJDIR).*|\1 "/'${P}'/"|' \ |
73 |
-i src/luaconf.h || die "Failed to slotify" |
74 |
|
75 |
use debug && ( |
76 |
sed -r \ |
77 |
- -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \ |
78 |
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb -O0/' \ |
79 |
-i src/Makefile || die "Failed to enable debug" |
80 |
) |
81 |
mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1 |
82 |
|
83 |
+ eapply_user |
84 |
multilib_copy_sources |
85 |
} |