dev-lua/luvit: version bump

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
index 4c9a093d3d06837034aec90e9ac3d685e741b151..e81d0e0237cd9f9b1bb4692c1e456a5be18fa187 100644 (file)
--- a/dev-lua/luvit/ChangeLog
+++ b/dev-lua/luvit/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*luvit-0.3.1 (14 Apr 2012)
+
+  14 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  +files/0.3.1-makefile.patch, +luvit-0.3.1.ebuild:
+  version bump
+
 *luvit-0.2.0 (31 Mar 2012)
 
   31 Mar 2012; hasufell <julian.ospald@googlemail.com>

diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
index 5f2795b8e782b0bbd04a4a607d5af95dc68228f2..09dd64fa8f53befcc4584e3a3ac52822176016a5 100644 (file)
--- a/dev-lua/luvit/Manifest
+++ b/dev-lua/luvit/Manifest
@@ -1,6 +1,9 @@
 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
+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
-MISC ChangeLog 372 RMD160 2fa1ca77fb8a3ea7aec8a5fa6c8720e859ac6861 SHA1 89640bbbdf55e53a2636e30b7a47922f98001fd0 SHA256 85529ede95a8d0323d8a70ddb03dce4b8e4739ef81d94b7cfc434bda73777f47
+EBUILD luvit-0.3.1.ebuild 1150 RMD160 9f22d25938fc4e980cc60b0c996426df0702cac6 SHA1 fc870a60cd556c85c91ebec58a8a7452ec69e0a5 SHA256 19446daefa53ccba552cbf7d4ab79aa61b8d5965d00919b73917273017d7c8dd
+MISC ChangeLog 523 RMD160 6879cb7473c813624430807144bfb64d0e88a504 SHA1 d668210d6491a9ef75ebc1eeb26169724c5f3387 SHA256 d98daa324938dd79caf063f1ad41a09fd5a94af9f45c19b3bd39669c70e1bb61
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154

diff --git a/dev-lua/luvit/files/0.3.1-makefile.patch b/dev-lua/luvit/files/0.3.1-makefile.patch
new file mode 100644 (file)
index 0000000..f50d108
--- /dev/null
+++ b/dev-lua/luvit/files/0.3.1-makefile.patch
@@ -0,0 +1,210 @@
+From: hasufell <julian.ospald@googlemail.com>
+Date: Fri Apr 13 18:57:29 UTC 2012
+Subject: build system
+
+ignore bundled 3rd party sources and assume system libs/headers instead
+fix install-rules
+
+--- Makefile
++++ Makefile
+@@ -13,16 +13,10 @@
+ CRYPTODIR=deps/luacrypto
+ 
+ PREFIX?=/usr/local
+-BINDIR?=${DESTDIR}${PREFIX}/bin
+-INCDIR?=${DESTDIR}${PREFIX}/include/luvit
+-LIBDIR?=${DESTDIR}${PREFIX}/lib/luvit
+-
+-OPENSSL_LIBS=$(shell pkg-config openssl --libs 2> /dev/null)
+-ifeq (${OPENSSL_LIBS},)
+-USE_SYSTEM_SSL?=0
+-else
+-USE_SYSTEM_SSL?=1
+-endif
++LIBDIR?=lib
++BINDIR_LUVIT?=${PREFIX}/bin
++INCDIR_LUVIT?=${PREFIX}/include/luvit
++LIBDIR_LUVIT?=${PREFIX}/${LIBDIR}/luvit
+ 
+ OS_NAME=$(shell uname -s)
+ MH_NAME=$(shell uname -m)
+@@ -45,20 +39,28 @@
+ export Q=
+ MAKEFLAGS+=-e
+ 
++CC ?= gcc
++
+ LDFLAGS+=-L${BUILDDIR}
+-LIBS += ${ZLIBDIR}/libz.a \
+-      ${YAJLDIR}/yajl.a \
+-      ${UVDIR}/uv.a \
+-      ${LUADIR}/src/libluajit.a \
+-      -lluvit -lm -ldl -lpthread
+-ifeq (${USE_SYSTEM_SSL},1)
++LIBS += \
++      -luv \
++      -lyajl \
++      -lhttp_parser \
++      -lluacrypto \
++      -lluvit -ldl -lpthread \
++      $(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
++
+ CFLAGS+=-Wall -w
+ CPPFLAGS+=$(shell pkg-config --cflags openssl)
+ LIBS+=${OPENSSL_LIBS}
+-else
+-CPPFLAGS+=-I${SSLDIR}/openssl/include
+-LIBS+=${SSLDIR}/libopenssl.a
+-endif
+ 
+ ifeq (${OS_NAME},Linux)
+ LIBS+=-lrt
+@@ -86,12 +88,6 @@
+ CPPFLAGS += -DOPENSSL_NO_SEED
+ CPPFLAGS += -DOPENSSL_NO_SOCK
+ 
+-ifeq (${MH_NAME},x86_64)
+-CPPFLAGS += -I${SSLDIR}/openssl-configs/x64
+-else
+-CPPFLAGS += -I${SSLDIR}/openssl-configs/ia32
+-endif
+-
+ LUVLIBS=${BUILDDIR}/utils.o          \
+         ${BUILDDIR}/luv_fs.o         \
+         ${BUILDDIR}/luv_dns.o        \
+@@ -117,87 +113,28 @@
+         ${BUILDDIR}/luv_zlib.o       \
+         ${BUILDDIR}/lhttp_parser.o
+ 
+-DEPS=${LUADIR}/src/libluajit.a \
+-     ${YAJLDIR}/yajl.a         \
+-     ${UVDIR}/uv.a             \
+-     ${ZLIBDIR}/libz.a         \
+-     ${HTTPDIR}/http_parser.o
+-
+-ifeq (${USE_SYSTEM_SSL},0)
+-DEPS+=${SSLDIR}/libopenssl.a
+-endif
+-
+ 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
+-
+-${ZLIBDIR}/zlib.gyp:
+-      git submodule update --init ${ZLIBDIR}
+-
+-${ZLIBDIR}/libz.a: ${ZLIBDIR}/zlib.gyp
+-      cd ${ZLIBDIR} && ${CC} -c *.c && \
+-      $(AR) rvs libz.a *.o
+-
+-${SSLDIR}/Makefile.openssl:
+-      git submodule update --init ${SSLDIR}
+-
+-${SSLDIR}/libopenssl.a: ${SSLDIR}/Makefile.openssl
+-      $(MAKE) -C ${SSLDIR} -f Makefile.openssl
+-
+-${BUILDDIR}/%.o: src/%.c ${DEPS}
++${BUILDDIR}/%.o: src/%.c
+       mkdir -p ${BUILDDIR}
+-      $(CC) ${CPPFLAGS} ${CFLAGS} --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 -I${ZLIBDIR} -I${CRYPTODIR}/src \
++      $(CC) \
++              ${CPPFLAGS} \
++              ${CFLAGS} --std=c89 -D_GNU_SOURCE -g -Wall -Werror \
++              -c $< -o $@ \
+               -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+-              -DUSE_SYSTEM_SSL=${USE_SYSTEM_SSL} \
++              -DUSE_SYSTEM_SSL=1 \
+               -DHTTP_VERSION=\"${HTTP_VERSION}\" \
+               -DUV_VERSION=\"${UV_VERSION}\" \
+               -DYAJL_VERSIONISH=\"${YAJL_VERSION}\" \
+               -DLUVIT_VERSION=\"${VERSION}\" \
+               -DLUAJIT_VERSION=\"${LUAJIT_VERSION}\"
+ 
+-${BUILDDIR}/libluvit.a: ${CRYPTODIR}/Makefile ${LUVLIBS} ${DEPS}
+-      $(AR) rvs ${BUILDDIR}/libluvit.a ${LUVLIBS} ${DEPS}
+-
+-${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 \
+-              ${CRYPTODIR}/src/lcrypto.o ${LIBS}
++              ${LIBS}
+ 
+ clean:
+       ${MAKE} -C ${LUADIR} clean
+@@ -209,21 +146,14 @@
+       rm -rf build bundle
+ 
+ install: all
+-      mkdir -p ${BINDIR}
+-      install ${BUILDDIR}/luvit ${BINDIR}/luvit
+-      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 -r ${UVDIR}/include/* ${INCDIR}/uv/
+-      cp src/*.h ${INCDIR}/
++      install -d ${DESTDIR}${BINDIR_LUVIT}
++      install -m755 ${BUILDDIR}/luvit ${DESTDIR}${BINDIR_LUVIT}/luvit
++      install -d ${DESTDIR}${LIBDIR_LUVIT}
++      for i in `ls lib/luvit`; do \
++              install -Dm644 lib/luvit/$$i ${DESTDIR}${LIBDIR_LUVIT}/$$i; done
++      install -d ${DESTDIR}${INCDIR_LUVIT}/luajit
++      for i in `ls src/*.h`; do \
++              install -Dm644 $$i ${DESTDIR}${INCDIR_LUVIT}/$$(basename $$i); done
+ 
+ bundle: build/luvit ${BUILDDIR}/libluvit.a
+       build/luvit tools/bundler.lua

diff --git a/dev-lua/luvit/luvit-0.3.1.ebuild b/dev-lua/luvit/luvit-0.3.1.ebuild
new file mode 100644 (file)
index 0000000..614f001
--- /dev/null
+++ b/dev-lua/luvit/luvit-0.3.1.ebuild
@@ -0,0 +1,59 @@
+# 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/openssl:0
+       >=dev-libs/yajl-2.0.2
+       dev-lua/luacrypto
+       net-libs/http-parser
+       dev-libs/libuv
+       sys-libs/zlib"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PV}-makefile.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 PREFIX=/usr all
+}
+
+src_install() {
+       emake \
+               PREFIX=/usr \
+               LIBDIR=$(get_libdir) \
+               DESTDIR="${D}" \
+               install
+}