dev-lua/luvit: revbump because deps changed, remove old

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
index e81d0e0237cd9f9b1bb4692c1e456a5be18fa187..5f259c1eb624040beb572e627a1de3024634b0db 100644 (file)
--- a/dev-lua/luvit/ChangeLog
+++ b/dev-lua/luvit/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*luvit-0.3.1-r1 (22 Apr 2012)
+
+  22 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  +files/0.3.1-r1-makefile.patch, -files/0.2.0-includes.patch,
+  -files/0.2.0-makefile.patch, -files/0.3.1-makefile.patch,
+  -luvit-0.2.0.ebuild, -luvit-0.3.1.ebuild, +luvit-0.3.1-r1.ebuild:
+  revbump because deps changed, remove old
+
 *luvit-0.3.1 (14 Apr 2012)
 
   14 Apr 2012; hasufell <julian.ospald@googlemail.com>

diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 09dd64fa8f53befcc4584e3a3ac52822176016a5..f86513b20a5a75a6eba54291e355a2cc2f1a2b31 100644 (file)
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,9 +1,5 @@
-AUX 0.2.0-includes.patch 8769 RMD160 d18f383a083a93944d61e9407dc861742980c222 SHA1 6ec07c7da7acf8303f44dfbaaf12146c0a7e7dc9 SHA256 787378b6617f75f572e916efc6ff7f714c3006026e63c7d5d074783c2c88ab22
-AUX 0.2.0-makefile.patch 8788 RMD160 f9d463dff174321e92514740c58b4c3e2c8c0909 SHA1 3e6a4f1c178055cce901c5cba560950855c898c3 SHA256 3d058f634b06c4815354c1c09a2b56fa3b6963defb5299c927b961e9dac38d52
-AUX 0.3.1-makefile.patch 5949 RMD160 bada227ac6b658cb45fde864e538ec728c552c2e SHA1 7f015a147685486780778c6bc20f6a7271138f2b SHA256 3366b15f3dcbc45870f17566196aeca2a5587188d84c9e21e18dbd8554111889
-DIST luvit-0.2.0.tar.gz 2518781 RMD160 77c1c1e678939b1e4af599454a17a489e810ab24 SHA1 27cb759207d7b034743509d1fa7dfce6032b7f5b SHA256 ce02b8ad6dac979344d82e8685ad7acfc0cf9cb4e54465888df62bb3d4e99c37
+AUX 0.3.1-r1-makefile.patch 5987 RMD160 912006e0dc2ce03d3ff268a48d91198f26a96d12 SHA1 4ffd54808924536b01977a77cb8cb487090af98d SHA256 12eba27cd688c05410e7cd31832e31e01152742083dd93e856fd1af9aa1ecb20
 DIST luvit-0.3.1.tar.gz 7108269 RMD160 de085353c31291671edfb06c9955ead4bd8e5b79 SHA1 7721e413e45189ce59d646453625cbd407263c41 SHA256 849fea95e327859edf15c1e929828c5013cf433f27f85b82622cb6655d931031
-EBUILD luvit-0.2.0.ebuild 1172 RMD160 11d95ff1cd69dc1f8c94094cfb9977f55c94ed1d SHA1 316246508dfcf99af651f416dc3076be12171d59 SHA256 6c62981b262a30763800d89034552c5527b1e63bf183576091dbda7551800c5b
-EBUILD luvit-0.3.1.ebuild 1150 RMD160 9f22d25938fc4e980cc60b0c996426df0702cac6 SHA1 fc870a60cd556c85c91ebec58a8a7452ec69e0a5 SHA256 19446daefa53ccba552cbf7d4ab79aa61b8d5965d00919b73917273017d7c8dd
-MISC ChangeLog 523 RMD160 6879cb7473c813624430807144bfb64d0e88a504 SHA1 d668210d6491a9ef75ebc1eeb26169724c5f3387 SHA256 d98daa324938dd79caf063f1ad41a09fd5a94af9f45c19b3bd39669c70e1bb61
+EBUILD luvit-0.3.1-r1.ebuild 1230 RMD160 bf5233e5a89a833ea27fdd4cf548cd164cea12bf SHA1 eaaa582033eb88780b8a966f2a007008c92de6c4 SHA256 7cfc038ea5523e07fc904f7514d40cbffa53b57a7baf8e821db11026348c9e82
+MISC ChangeLog 844 RMD160 3a4604dfce328e9e5e71d8b4383f36c070e69301 SHA1 bde22b1293a08673270df63d63a63c727ca91498 SHA256 8f8804cc9b7495b1c2591743f6014c087d5625ad79827da6dcc08dd18de93f7e
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154

diff --git a/dev-lua/luvit/files/0.2.0-includes.patch b/dev-lua/luvit/files/0.2.0-includes.patch
deleted file mode 100644 (file)
index 1214f17..0000000
--- a/dev-lua/luvit/files/0.2.0-includes.patch
+++ /dev/null
@@ -1,343 +0,0 @@
---- luvit-0.2.0/src/lconstants.h       2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/lconstants.h       2012-03-29 16:46:40.000000000 +0200
-@@ -37,8 +37,8 @@
- # include <openssl/ssl.h>
- #endif
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- #include "utils.h"
- 
- LUALIB_API int luaopen_constants(lua_State *L);
---- luvit-0.2.0/src/lenv.h     2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/lenv.h     2012-03-29 16:46:40.000000000 +0200
-@@ -18,8 +18,8 @@
- #ifndef LENV
- #define LENV
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- #include "utils.h"
- 
- LUALIB_API int luaopen_env (lua_State *L);
---- luvit-0.2.0/src/lhttp_parser.h     2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/lhttp_parser.h     2012-03-29 16:46:40.000000000 +0200
-@@ -18,8 +18,8 @@
- #ifndef LHTTP_PARSER
- #define LHTTP_PARSER
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- #include "utils.h"
- 
- LUALIB_API int luaopen_http_parser (lua_State *L);
---- luvit-0.2.0/src/los.h      2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/los.h      2012-03-29 16:46:40.000000000 +0200
-@@ -18,8 +18,8 @@
- #ifndef LOS
- #define LOS
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- 
- LUALIB_API int luaopen_os_binding (lua_State *L);
- 
---- luvit-0.2.0/src/luv.c      2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv.c      2012-03-29 16:46:40.000000000 +0200
-@@ -16,7 +16,7 @@
-  */
- 
- #include "luv.h"
--#include "uv.h"
-+#include <uv.h>
- #include <stdlib.h>
- #include <assert.h>
- #include <string.h>
---- luvit-0.2.0/src/luv_dns.h  2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_dns.h  2012-03-29 16:46:40.000000000 +0200
-@@ -18,10 +18,10 @@
- #ifndef LUV_DNS
- #define LUV_DNS
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
--#include "ares.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
-+#include <ares.h>
- #include "utils.h"
- 
- /* Wrapped functions exposed to lua */
---- luvit-0.2.0/src/luv_fs.h   2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_fs.h   2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_FS
- #define LUV_FS
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- 
- void luv_push_stats_table(lua_State* L, struct stat* s);
---- luvit-0.2.0/src/luv_fs_watcher.h   2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_fs_watcher.h   2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_FS_WATCHER
- #define LUV_FS_WATCHER
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_handle.h"
- 
---- luvit-0.2.0/src/luv.h      2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv.h      2012-03-29 16:46:40.000000000 +0200
-@@ -18,8 +18,8 @@
- #ifndef LUV
- #define LUV
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- #include "utils.h"
- 
- LUALIB_API int luaopen_uv_native (lua_State *L);
---- luvit-0.2.0/src/luv_handle.h       2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_handle.h       2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_HANDLE
- #define LUV_HANDLE
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- 
- typedef struct {
---- luvit-0.2.0/src/luvit_init.c       2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luvit_init.c       2012-03-29 16:46:40.000000000 +0200
-@@ -20,12 +20,12 @@
- #include <stdlib.h>
- #include <limits.h> /* PATH_MAX */
- 
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lualib.h>
-+#include <luajit-2.0/lauxlib.h>
- 
- #include "luvit.h"
--#include "uv.h"
-+#include <uv.h>
- #include "utils.h"
- #include "los.h"
- #include "luv.h"
---- luvit-0.2.0/src/luvit_main.c       2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luvit_main.c       2012-03-29 16:46:40.000000000 +0200
-@@ -20,14 +20,14 @@
- #include <stdlib.h>
- #include <limits.h> /* PATH_MAX */
- 
--#include "lua.h"
--#include "lualib.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lualib.h>
-+#include <luajit-2.0/lauxlib.h>
- 
- #ifndef WIN32
- #include <pthread.h>
- #endif
--#include "uv.h"
-+#include <uv.h>
- 
- #include "luvit.h"
- #include "luv.h"
---- luvit-0.2.0/src/luv_misc.h 2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_misc.h 2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_MISC
- #define LUV_MISC
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- 
- int luv_activate_signal_handler(lua_State* L);
---- luvit-0.2.0/src/luv_pipe.h 2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_pipe.h 2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_PIPE
- #define LUV_PIPE
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_stream.h"
- 
---- luvit-0.2.0/src/luv_process.h      2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_process.h      2012-03-29 16:46:41.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_PROCESS
- #define LUV_PROCESS
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_handle.h"
- 
---- luvit-0.2.0/src/luv_stream.h       2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_stream.h       2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_STREAM
- #define LUV_STREAM
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_handle.h"
- 
---- luvit-0.2.0/src/luv_tcp.h  2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_tcp.h  2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_TCP
- #define LUV_TCP
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_stream.h"
- 
---- luvit-0.2.0/src/luv_timer.h        2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_timer.h        2012-03-29 16:46:40.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_TIMER
- #define LUV_TIMER
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_handle.h"
- 
---- luvit-0.2.0/src/luv_tty.h  2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_tty.h  2012-03-29 16:46:41.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_TTY
- #define LUV_TTY
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_stream.h"
- 
---- luvit-0.2.0/src/luv_udp.h  2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/luv_udp.h  2012-03-29 16:46:41.000000000 +0200
-@@ -18,9 +18,9 @@
- #ifndef LUV_UDP
- #define LUV_UDP
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
- #include "utils.h"
- #include "luv_handle.h"
- 
---- luvit-0.2.0/src/lyajl.c    2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/lyajl.c    2012-03-29 16:46:40.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- #include "lyajl.h"
- #include "utils.h"
--#include "yajl/yajl_parse.h"
--#include "yajl/yajl_gen.h"
--#include "yajl/yajl_version.h"
-+#include <yajl_parse.h>
-+#include <yajl_gen.h>
-+#include <yajl_version.h>
- 
- static void* yjajl_js_null;
- 
---- luvit-0.2.0/src/lyajl.h    2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/lyajl.h    2012-03-29 16:46:41.000000000 +0200
-@@ -18,8 +18,8 @@
- #ifndef LYAJL
- #define LYAJL
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
- #include "utils.h"
- 
- LUALIB_API int luaopen_yajl (lua_State *L);
---- luvit-0.2.0/src/utils.h    2012-02-25 07:02:11.000000000 +0100
-+++ luvit-0.2.0/src/utils.h    2012-03-29 16:46:40.000000000 +0200
-@@ -18,10 +18,10 @@
- #ifndef LUV_UTILS
- #define LUV_UTILS
- 
--#include "lua.h"
--#include "lauxlib.h"
--#include "uv.h"
--#include "ares.h"
-+#include <luajit-2.0/lua.h>
-+#include <luajit-2.0/lauxlib.h>
-+#include <uv.h>
-+#include <ares.h>
- 
- /* C doesn't have booleans on it's own */
- #ifndef FALSE

diff --git a/dev-lua/luvit/files/0.2.0-makefile.patch b/dev-lua/luvit/files/0.2.0-makefile.patch
deleted file mode 100644 (file)
index bc9e721..0000000
--- a/dev-lua/luvit/files/0.2.0-makefile.patch
+++ /dev/null
@@ -1,217 +0,0 @@
---- Makefile.old       2012-02-25 07:02:12.000000000 +0100
-+++ Makefile   2012-03-29 17:58:08.000000000 +0200
-@@ -9,21 +9,23 @@
- HTTP_VERSION=v1.0-61-g4898606
- BUILDDIR=build
- 
--PREFIX?=/usr/local
--BINDIR?=${DESTDIR}${PREFIX}/bin
--INCDIR?=${DESTDIR}${PREFIX}/include/luvit
--LIBDIR?=${DESTDIR}${PREFIX}/lib/luvit
-+# Paths
-+PREFIX?=/usr
-+LIBDIR?=lib
-+BINDIR_LUVIT?=${DESTDIR}${PREFIX}/bin
-+INCDIR_LUVIT?=${DESTDIR}${PREFIX}/include/luvit
-+LIBDIR_LUVIT?=${DESTDIR}${PREFIX}/${LIBDIR}/luvit
- 
- OS_NAME=$(shell uname -s)
- MH_NAME=$(shell uname -m)
- ifeq (${OS_NAME},Darwin)
- ifeq (${MH_NAME},x86_64)
--LDFLAGS=-framework CoreServices -pagezero_size 10000 -image_base 100000000
-+LDFLAGS+=-framework CoreServices -pagezero_size 10000 -image_base 100000000
- else
--LDFLAGS=-framework CoreServices
-+LDFLAGS+=-framework CoreServices
- endif
- else ifeq (${OS_NAME},Linux)
--LDFLAGS=-Wl,-E
-+LDFLAGS+=-Wl,-E
- endif
- # LUAJIT CONFIGURATION #
- #XCFLAGS=-g
-@@ -35,17 +37,28 @@
- export Q=
- MAKEFLAGS+=-e
- 
--LDFLAGS+=-L${BUILDDIR} -lluvit
--LDFLAGS+=${LUADIR}/src/libluajit.a
--LDFLAGS+=${UVDIR}/uv.a
--LDFLAGS+=${YAJLDIR}/yajl.a
--LDFLAGS+=-Wall -lm -ldl -lpthread
-+CC ?= gcc
-+
-+LDFLAGS += \
-+      -L${BUILDDIR} \
-+      -Wall
-+
-+LIBS += \
-+      -lluajit-5.1 \
-+      -luv \
-+      -lyajl \
-+      -lhttp_parser \
-+      -lluvit -lm -ldl -lpthread -lrt
-+
-+INCLUDES += \
-+      -I${PREFIX}/include/libuv \
-+      -I${PREFIX}/include/http-parser \
-+      -I${PREFIX}/include/yajl
- 
- ifeq (${OS_NAME},Linux)
- LDFLAGS+= -lrt
- endif
- 
--
- LUVLIBS=${BUILDDIR}/utils.o          \
-         ${BUILDDIR}/luv_fs.o         \
-         ${BUILDDIR}/luv_dns.o        \
-@@ -67,86 +80,37 @@
-         ${BUILDDIR}/los.o            \
-         ${BUILDDIR}/lhttp_parser.o
- 
--DEPS=${LUADIR}/src/libluajit.a \
--     ${YAJLDIR}/yajl.a         \
--     ${UVDIR}/uv.a             \
--     ${HTTPDIR}/http_parser.o
--
- all: ${BUILDDIR}/luvit
- 
--${LUADIR}/Makefile:
--      git submodule update --init ${LUADIR}
--
--${LUADIR}/src/libluajit.a: ${LUADIR}/Makefile
--      touch -c ${LUADIR}/src/*.h
--      $(MAKE) -C ${LUADIR}
--
--${YAJLDIR}/CMakeLists.txt:
--      git submodule update --init ${YAJLDIR}
--
--${YAJLDIR}/Makefile: deps/Makefile.yajl ${YAJLDIR}/CMakeLists.txt
--      cp deps/Makefile.yajl ${YAJLDIR}/Makefile
--
--${YAJLDIR}/yajl.a: ${YAJLDIR}/Makefile
--      rm -rf ${YAJLDIR}/src/yajl
--      cp -r ${YAJLDIR}/src/api ${YAJLDIR}/src/yajl
--      $(MAKE) -C ${YAJLDIR}
--
--${UVDIR}/Makefile:
--      git submodule update --init ${UVDIR}
--
--${UVDIR}/uv.a: ${UVDIR}/Makefile
--      $(MAKE) -C ${UVDIR} uv.a
--
--${HTTPDIR}/Makefile:
--      git submodule update --init ${HTTPDIR}
--
--${HTTPDIR}/http_parser.o: ${HTTPDIR}/Makefile
--      ${MAKE} -C ${HTTPDIR} http_parser.o
--
--${BUILDDIR}/%.o: src/%.c ${DEPS}
-+${BUILDDIR}/%.o: src/%.c
-       mkdir -p ${BUILDDIR}
--      $(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -c $< -o $@ -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
-+      $(CC) $(CFLAGS) --std=c89 -D_GNU_SOURCE -Wall -Werror -c $< -o $@ ${INCLUDES} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
- 
--${BUILDDIR}/libluvit.a: ${LUVLIBS} ${DEPS}
--      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}
-+${BUILDDIR}/libluvit.a: ${LUVLIBS}
-+      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS}
- 
- ${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o
--      $(CC) -g -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a ${LDFLAGS}
-+      $(CC) $(CFLAGS) ${LDFLAGS} -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a ${LIBS}
- 
- clean:
--      ${MAKE} -C ${LUADIR} clean
--      ${MAKE} -C ${HTTPDIR} clean
--      ${MAKE} -C ${YAJLDIR} clean
--      ${MAKE} -C ${UVDIR} distclean
-       ${MAKE} -C examples/native clean
-       rm -rf build bundle
- 
- install: all
--      mkdir -p ${BINDIR}
--      install ${BUILDDIR}/luvit ${BINDIR}/luvit
--      cp bin/luvit-config.lua ${BINDIR}/luvit-config
--      chmod +x ${BINDIR}/luvit-config
--      mkdir -p ${LIBDIR}
--      cp lib/luvit/*.lua ${LIBDIR}
--      mkdir -p ${INCDIR}/luajit
--      cp ${LUADIR}/src/lua.h ${INCDIR}/luajit/
--      cp ${LUADIR}/src/lauxlib.h ${INCDIR}/luajit/
--      cp ${LUADIR}/src/luaconf.h ${INCDIR}/luajit/
--      cp ${LUADIR}/src/luajit.h ${INCDIR}/luajit/
--      cp ${LUADIR}/src/lualib.h ${INCDIR}/luajit/
--      mkdir -p ${INCDIR}/http_parser
--      cp ${HTTPDIR}/http_parser.h ${INCDIR}/http_parser/
--      mkdir -p ${INCDIR}/uv
--      cp ${UVDIR}/include/uv.h ${INCDIR}/uv/
--      cp src/*.h ${INCDIR}/
--
--
--bundle: build/luvit ${BUILDDIR}/libluvit.a
--      build/luvit tools/bundler.lua
--      $(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_exports.c -o bundle/luvit_exports.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
--      $(CC) --std=c89 -D_GNU_SOURCE -g -Wall -Werror -DBUNDLE -c src/luvit_main.c -o bundle/luvit_main.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
--      $(CC) -g -o bundle/luvit ${BUILDDIR}/libluvit.a `ls bundle/*.o` ${LDFLAGS}
-+      mkdir -p ${BINDIR_LUVIT}
-+      install -Dm755 ${BUILDDIR}/luvit ${BINDIR_LUVIT}/luvit
-+      install -Dm755 bin/luvit-config.lua ${BINDIR_LUVIT}/luvit-config
-+      for i in `ls lib/luvit`; do \
-+              install -Dm644 lib/luvit/$$i ${LIBDIR_LUVIT}/$$i; done
-+      for i in `ls src/*.h`; do \
-+              install -Dm644 $$i ${INCDIR_LUVIT}/$$(basename $$i); done
-+
-+#bundle: build/luvit-1 ${BUILDDIR}/libluvit.a
-+#     build/luvit tools/bundler.lua
-+#     $(CC) --std=c89 -D_GNU_SOURCE -Wall -Werror -DBUNDLE -c src/luvit_exports.c -o bundle/luvit_exports.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
-+#     $(CC) --std=c89 -D_GNU_SOURCE -Wall -Werror -DBUNDLE -c src/luvit_main.c -o bundle/luvit_main.o -I${HTTPDIR} -I${UVDIR}/include -I${LUADIR}/src -I${YAJLDIR}/src/api -I${YAJLDIR}/src -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHTTP_VERSION=\"${HTTP_VERSION}\" -DUV_VERSION=\"${UV_VERSION}\" -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" -DLUVIT_VERSION=\"${VERSION}\" -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
-+#     $(CC) -o bundle/luvit-1 ${BUILDDIR}/libluvit.a `ls bundle/*.o` ${LDFLAGS}
-+
- 
- test: ${BUILDDIR}/luvit
-       cd tests && ../${BUILDDIR}/luvit runner.lua
-@@ -156,26 +120,26 @@
- api.markdown: $(wildcard lib/*.lua)
-       find lib -name "*.lua" | grep -v "luvit.lua" | sort | xargs -l luvit tools/doc-parser.lua > $@
- 
--DIST_DIR?=${HOME}/luvit.io/dist
--DIST_NAME=luvit-${VERSION}
--DIST_FOLDER=${DIST_DIR}/${VERSION}/${DIST_NAME}
--DIST_FILE=${DIST_FOLDER}.tar.gz
--tarball:
--      rm -rf ${DIST_FOLDER} ${DIST_FILE}
--      mkdir -p ${DIST_DIR}
--      git clone . ${DIST_FOLDER}
--      cp deps/gitmodules.local ${DIST_FOLDER}/.gitmodules
--      cd ${DIST_FOLDER} ; git submodule update --init
--      find ${DIST_FOLDER} -name ".git*" | xargs rm -r
--      rm -rf ${DIST_FOLDER}/deps/zlib
--      sed -e 's/^VERSION=.*/VERSION=${VERSION}/' \
-+#DIST_DIR?=${HOME}/luvit.io/dist
-+#DIST_NAME=luvit-${VERSION}
-+#DIST_FOLDER=${DIST_DIR}/${VERSION}/${DIST_NAME}
-+#DIST_FILE=${DIST_FOLDER}.tar.gz
-+#tarball:
-+#     rm -rf ${DIST_FOLDER} ${DIST_FILE}
-+#     mkdir -p ${DIST_DIR}
-+#     git clone . ${DIST_FOLDER}
-+#     cp deps/gitmodules.local ${DIST_FOLDER}/.gitmodules
-+#     cd ${DIST_FOLDER} ; git submodule update --init
-+#     find ${DIST_FOLDER} -name ".git*" | xargs rm -r
-+#     rm -rf ${DIST_FOLDER}/deps/zlib
-+#     sed -e 's/^VERSION=.*/VERSION=${VERSION}/' \
-             -e 's/^LUAJIT_VERSION=.*/LUAJIT_VERSION=${LUAJIT_VERSION}/' \
-             -e 's/^UV_VERSION=.*/UV_VERSION=${UV_VERSION}/' \
-             -e 's/^HTTP_VERSION=.*/HTTP_VERSION=${HTTP_VERSION}/' \
-             -e 's/^YAJL_VERSION=.*/YAJL_VERSION=${YAJL_VERSION}/' < ${DIST_FOLDER}/Makefile > ${DIST_FOLDER}/Makefile.patched
--      mv ${DIST_FOLDER}/Makefile.patched ${DIST_FOLDER}/Makefile
--      tar -czf ${DIST_FILE} -C ${DIST_DIR}/${VERSION} ${DIST_NAME}
--      rm -rf ${DIST_FOLDER}
-+#     mv ${DIST_FOLDER}/Makefile.patched ${DIST_FOLDER}/Makefile
-+#     tar -czf ${DIST_FILE} -C ${DIST_DIR}/${VERSION} ${DIST_NAME}
-+#     rm -rf ${DIST_FOLDER}
- 
- .PHONY: test install all api.markdown bundle tarball
- 

diff --git a/dev-lua/luvit/files/0.3.1-makefile.patch b/dev-lua/luvit/files/0.3.1-r1-makefile.patch
similarity index 98%
rename from dev-lua/luvit/files/0.3.1-makefile.patch
rename to dev-lua/luvit/files/0.3.1-r1-makefile.patch
index f50d10839c10a055bada286893e7faa605b85927..6d41e63596bc82417bcde180e13d7f31f73d09e8 100644 (file)
--- a/dev-lua/luvit/files/0.3.1-makefile.patch
+++ b/dev-lua/luvit/files/0.3.1-r1-makefile.patch
@@ -45,17 +45,17 @@ fix install-rules
 +      -luv \
 +      -lyajl \
 +      -lhttp_parser \
-+      -lluacrypto \
 +      -lluvit -ldl -lpthread \
++      $(shell pkg-config --libs luacrypto) \
 +      $(shell pkg-config --libs-only-l lua) \
 +      $(shell pkg-config --libs-only-l luajit) \
 +      $(shell pkg-config --libs-only-l zlib) \
 +      $(shell pkg-config --libs-only-l openssl)
 +
 +CPPFLAGS += \
-+      -I${PREFIX}/include/libuv \
 +      -I${PREFIX}/include/http-parser \
-+      -I${PREFIX}/include/yajl
++      -I${PREFIX}/include/yajl \
++      $(shell pkg-config --cflags luacrypto)
 +
  CFLAGS+=-Wall -w
  CPPFLAGS+=$(shell pkg-config --cflags openssl)
@@ -160,16 +160,16 @@ fix install-rules
  
 -${BUILDDIR}/libluvit.a: ${CRYPTODIR}/Makefile ${LUVLIBS} ${DEPS}
 -      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}
--
++${BUILDDIR}/libluvit.a: ${LUVLIBS}
++      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS}
+ 
 -${CRYPTODIR}/Makefile:
 -      git submodule update --init ${CRYPTODIR}
 -
 -${CRYPTODIR}/src/lcrypto.o: ${CRYPTODIR}/Makefile
 -      ${CC} ${CPPFLAGS} -c -o ${CRYPTODIR}/src/lcrypto.o -I${CRYPTODIR}/src/ \
 -               -I${LUADIR}/src/ ${CRYPTODIR}/src/lcrypto.c
-+${BUILDDIR}/libluvit.a: ${LUVLIBS}
-+      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS}
- 
+-
 -${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o ${CRYPTODIR}/src/lcrypto.o
 +${BUILDDIR}/luvit: ${BUILDDIR}/libluvit.a ${BUILDDIR}/luvit_main.o
        $(CC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -g -o ${BUILDDIR}/luvit ${BUILDDIR}/luvit_main.o ${BUILDDIR}/libluvit.a \

diff --git a/dev-lua/luvit/luvit-0.2.0.ebuild b/dev-lua/luvit/luvit-0.2.0.ebuild
deleted file mode 100644 (file)
index be1cfb0..0000000
--- a/dev-lua/luvit/luvit-0.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Takes node.js' architecture and dependencies and fits it in the Lua language"
-HOMEPAGE="http://luvit.io/"
-SRC_URI="http://${PN}.io/dist/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-LICENSE="Apache-2.0 MIT"
-
-# fails in portage environment
-# succeeds if run manually
-RESTRICT="test"
-
-RDEPEND="dev-lang/luajit:2
-       >=dev-libs/yajl-2.0.2
-       net-libs/http-parser
-       dev-libs/libuv"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-src_prepare() {
-       # fix build system and remove references
-       # to bundled sources
-       epatch "${FILESDIR}"/${PV}-makefile.patch \
-               "${FILESDIR}"/${PV}-includes.patch
-
-       sed \
-               -e "s:^YAJL_VERSION=.*:YAJL_VERSION=$(pkg-config --modversion yajl):" \
-               -e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=$(pkg-config --modversion luajit):" \
-               -i Makefile || die "sed failed"
-}
-
-src_configure() {
-       # skip python build system
-       :
-}
-
-src_compile() {
-       rm -r deps || die
-
-       tc-export CC AR
-
-       emake all
-}
-
-src_install() {
-       emake PREFIX=/usr LIBDIR=$(get_libdir) DESTDIR="${D}" install
-}

diff --git a/dev-lua/luvit/luvit-0.3.1.ebuild b/dev-lua/luvit/luvit-0.3.1-r1.ebuild
similarity index 87%
rename from dev-lua/luvit/luvit-0.3.1.ebuild
rename to dev-lua/luvit/luvit-0.3.1-r1.ebuild
index 614f001f6a229679e80c97feaae8dd88a8092d88..f7e79d07cb7c0f6dc793fc4813fbb994d76ade62 100644 (file)
--- a/dev-lua/luvit/luvit-0.3.1.ebuild
+++ b/dev-lua/luvit/luvit-0.3.1-r1.ebuild
@@ -22,19 +22,20 @@ RESTRICT="test"
 RDEPEND="dev-lang/luajit:2
        dev-libs/openssl:0
        >=dev-libs/yajl-2.0.2
-       dev-lua/luacrypto
+       >=dev-lua/luacrypto-0.3.1
        net-libs/http-parser
-       dev-libs/libuv
+       =dev-libs/libuv-0.7.6_p20120404
        sys-libs/zlib"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PV}-makefile.patch
+       epatch "${FILESDIR}"/${PVR}-makefile.patch
 
        sed \
                -e "s:^YAJL_VERSION=.*:YAJL_VERSION=$(pkg-config --modversion yajl):" \
                -e "s:^LUAJIT_VERSION=.*:LUAJIT_VERSION=$(pkg-config --modversion luajit):" \
+               -e "s:^UV_VERSION=.*:UV_VERSION=0.7.6_p20120404:" \
                -i Makefile || die "sed failed"
 }