| 1 |
commit: b2dabff0dfc7438d5fce692ecddeeea4d75098e5 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Thu Aug 2 10:01:04 2012 +0000 |
| 4 |
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Thu Aug 2 10:01:04 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b2dabff0 |
| 7 |
|
| 8 |
switching luasocket to back to Diego Negab's version |
| 9 |
|
| 10 |
--- |
| 11 |
dev-lua/luasocket/luasocket-9999.ebuild | 25 +++++++++++++------------ |
| 12 |
1 files changed, 13 insertions(+), 12 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-lua/luasocket/luasocket-9999.ebuild b/dev-lua/luasocket/luasocket-9999.ebuild |
| 15 |
index d6da71f..7d3bed4 100644 |
| 16 |
--- a/dev-lua/luasocket/luasocket-9999.ebuild |
| 17 |
+++ b/dev-lua/luasocket/luasocket-9999.ebuild |
| 18 |
@@ -4,34 +4,35 @@ |
| 19 |
|
| 20 |
EAPI="4" |
| 21 |
|
| 22 |
-inherit multilib toolchain-funcs flag-o-matic mercurial eutils |
| 23 |
+inherit multilib toolchain-funcs flag-o-matic eutils git-2 |
| 24 |
|
| 25 |
DESCRIPTION="Networking support library for the Lua language." |
| 26 |
HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/" |
| 27 |
-EHG_REPO_URI="http://code.matthewwild.co.uk/luasocket2-hg/" |
| 28 |
+#EHG_REPO_URI="http://code.matthewwild.co.uk/luasocket2-hg/" |
| 29 |
+EGIT_REPO_URI="https://github.com/diegonehab/luasocket git://github.com/diegonehab/luasocket" |
| 30 |
+EGIT_BRANCH="unstable" |
| 31 |
|
| 32 |
LICENSE="MIT" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="" |
| 35 |
-IUSE="debug" |
| 36 |
+IUSE="debug luajit" |
| 37 |
|
| 38 |
RDEPEND="|| ( >=dev-lang/lua-5.1 dev-lang/luajit:2 )" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
dev-util/pkgconfig" |
| 41 |
|
| 42 |
-src_compile() { |
| 43 |
- # We append flags here to avoid editing the config file |
| 44 |
- use debug && append-flags -DLUASOCKET_DEBUG |
| 45 |
- append-flags -fPIC |
| 46 |
+src_configure() { |
| 47 |
+ use debug && export DEBUG="DEBUG" |
| 48 |
+ prefix=/usr |
| 49 |
+ LUAINC_linux=/usr/include |
| 50 |
+ use luajit && LUAINC_linux=/usr/include/luajit-2.0 |
| 51 |
+ LUALIB_linux=/usr/lib |
| 52 |
+} |
| 53 |
|
| 54 |
+src_compile() { |
| 55 |
emake linux \ |
| 56 |
- CFLAGS="${CFLAGS}" \ |
| 57 |
- LDFLAGS="${LDFLAGS} -o" \ |
| 58 |
CC="$(tc-getCC)" \ |
| 59 |
LD="$(tc-getCC) -shared" || die |
| 60 |
-# I'm sorry for dirty LDFLAGS hack with "-o", but it is only way |
| 61 |
-# to fix it ATM.. |
| 62 |
-# //wbr mva. |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
Archives