dev-lua/luvit imported into main tree wrt #406403

diff --git a/dev-lua/luvit/ChangeLog b/dev-lua/luvit/ChangeLog
deleted file mode 100644 (file)
index 67832ac..0000000
--- a/dev-lua/luvit/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-# ChangeLog for dev-lua/luvit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  05 May 2012; Mike Gilbert <floppym@gentoo.org> luvit-0.3.1-r1.ebuild:
-  Use pkgconfig virtual.
-
-*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>
-  +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>
-  +files/0.2.0-includes.patch, +luvit-0.2.0.ebuild,
-  +files/0.2.0-makefile.patch, +metadata.xml:
-  New Ebuild for bug 406403 thanks to Tommy[D] chithead Enlik and ssuominen
-

diff --git a/dev-lua/luvit/Manifest b/dev-lua/luvit/Manifest
deleted file mode 100644 (file)
index f053964..0000000
--- a/dev-lua/luvit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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.3.1-r1.ebuild 1229 RMD160 597ed861a4ce0608054375dc050c0f193c58fc55 SHA1 4d4668bd1d049c789a27948bcaabbef2deb79d15 SHA256 7cb780b913ece6af5cd2258418cdd94e56a9e5977bb81be1bc194500931faa2f
-MISC ChangeLog 942 RMD160 dbebb8fce652bb6db588ce8dd6ef0b9c656bee10 SHA1 10c48da22031c1c89f021cf23fa1918598ffba6c SHA256 ed5b3a30cc97e3a044ef16614542a2a9bf26db453f3570c15ffc8885ecb7165e
-MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154

diff --git a/dev-lua/luvit/files/0.3.1-r1-makefile.patch b/dev-lua/luvit/files/0.3.1-r1-makefile.patch
deleted file mode 100644 (file)
index 6d41e63..0000000
--- a/dev-lua/luvit/files/0.3.1-r1-makefile.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-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 \
-+      -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/http-parser \
-+      -I${PREFIX}/include/yajl \
-+      $(shell pkg-config --cflags luacrypto)
-+
- 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}
-+${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}/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-r1.ebuild b/dev-lua/luvit/luvit-0.3.1-r1.ebuild
deleted file mode 100644 (file)
index 8135a1e..0000000
--- a/dev-lua/luvit/luvit-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,60 +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/openssl:0
-       >=dev-libs/yajl-2.0.2
-       >=dev-lua/luacrypto-0.3.1
-       net-libs/http-parser
-       =dev-libs/libuv-0.7.6_p20120404
-       sys-libs/zlib"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-src_prepare() {
-       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"
-}
-
-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
-}

diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml
deleted file mode 100644 (file)
index cc3fe24..0000000
--- a/dev-lua/luvit/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer>
-               <email>maintainer-wanted@gentoo.org</email>
-       </maintainer>
-</pkgmetadata>